RESYNC EXTRA:

synced extra-testing -> extra repo

Signed-off-by: James Meyer <james.meyer@operamail.com>

5 files changed, 83 insertions, 13 deletions

diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index a3791fc..40af42a 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,33 +3,39 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=1.42
+pkgver=2.04
 pkgrel=1
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-depends=('curl')
+depends=('curl' 'libevent')
 makedepends=('intltool')
 replaces=('transmission')
 backup=('etc/conf.d/transmissiond')
 install=transmission-cli.install
 source=(http://mirrors.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-        transmissiond
+        run.transmissiond
+        transmission-cli.install
+        transmission.include
         transmissiond.conf)
-md5sums=('c083bdcb01426466e80ee339bccd9351'
-         'e2326d412e25b4449ff663a5d4015e1a'
-         '7b019a710493ec4f8b54a1f528e1981d')
 
 build() {
   cd "$srcdir/transmission-$pkgver"
 
-  ./configure --prefix=/usr --disable-gtk --disable-wx || return 1
+  ./configure --prefix=/usr --disable-gtk || return 1
   make || return 1
   make DESTDIR="$pkgdir" install || return 1
 
-  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" || return 1
+  mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1
+  mkdir -p -m777 "$pkgdir/myth/transmission" || return 1
+  install -D -m755 "$srcdir/run.transmissiond" "$pkgdir/etc/sv/transmissiond/run" || return 1
   install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1
-
+  install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
+md5sums=('84fe15eb7e000fdc369def513299358b'
+         'b91534aaf2e403331c611c615ab2c03d'
+         'ff22c13dbd52565f9e88b1de22514eb9'
+         'b5a49ea375333cd0fee40f70dbac4c2e'
+         'd05567c7a4f9df9f28602d1356d5c05c')
diff --git a/abs/extra/community/transmission-cli/run.transmissiond b/abs/extra/community/transmission-cli/run.transmissiond
new file mode 100755
index 0000000..714c946
--- /dev/null
+++ b/abs/extra/community/transmission-cli/run.transmissiond
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/transmissiond
+
+CONFIGDIR=/home/$TRANS_USER/.config/transmission-daemon
+PID=`pidof -o %PPID /usr/bin/transmission-daemon`
+# Update the block lists - try to keep the bad guys out.
+          cd ${CONFIGDIR}/blocklists
+          if [ $? -eq 0 ]; then
+             find . -mtime +4 -type f -name level1 -exec rm {} \;
+             if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then
+                # update blocklist
+               # echo "updating blocklist, ~4MB"
+                wget -q -O level1.gz http://download.m0k.org/transmission/files/level1.gz
+                if [ -f level1.gz ]; then
+                  gunzip level1.gz
+                  if [ $? -eq 0 ]; then
+                    chmod go+r level1
+                  else
+                    rm -f level1*
+                  fi
+                fi
+             fi
+             cd - 2>&1 >/dev/null
+          fi
+    stat_runit "Starting Transmission Daemon"
+    [ -z "$PID" ] && exec su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null
diff --git a/abs/extra/community/transmission-cli/transmission-cli.install b/abs/extra/community/transmission-cli/transmission-cli.install
index cb6bf60..088ecc6 100644
--- a/abs/extra/community/transmission-cli/transmission-cli.install
+++ b/abs/extra/community/transmission-cli/transmission-cli.install
@@ -1,9 +1,28 @@
 post_install() {
+  /bin/echo 'include "/etc/transmission/transmission.include"' >> /etc/lighttpd/conf.include
+  killall -HUP lighttpd  
+
+  add_service.sh transmissiond
+
   cat << _EOF
 
-  If you want to run the Transmission daemon at boot,
-  add transmissiond to the DAEMONS array in /etc/rc.conf.
-  You have to set the user in /etc/conf.d/transmissiond.
+  You can edit the user and options in /etc/conf.d/transmissiond.
+
+  To access the web interface:
+  http://localhost/transmission
+
+  Configuration file editing information can be found at:
+  http://trac.transmissionbt.com/wiki/ConfigFiles
 
 _EOF
+
+}
+
+pre_upgrade() {
+  rm -f /usr/share/man/man1/transmission*
+
+}
+
+pre_remove() {
+  remove_service.sh transmissiond
 }
diff --git a/abs/extra/community/transmission-cli/transmission.include b/abs/extra/community/transmission-cli/transmission.include
new file mode 100644
index 0000000..5cbf399
--- /dev/null
+++ b/abs/extra/community/transmission-cli/transmission.include
@@ -0,0 +1,15 @@
+#Redirect from /transmission to /transmission/web
+url.rewrite-once += ( "^/transmission[/]?$" => "/transmission/web" )
+$HTTP["url"] =~ "^/transmission/" {
+  #Serve static files from /usr/share/transmission
+  server.document-root = "/usr/share/"
+  #Forward RPC requests to the Transmission daemon
+  proxy.server = (
+    "/transmission/rpc" => (
+      (
+        "host" => "127.0.0.1",
+        "port" => 9091
+      )
+    )
+  )
+}
diff --git a/abs/extra/community/transmission-cli/transmissiond.conf b/abs/extra/community/transmission-cli/transmissiond.conf
index 8f1275b..d642c01 100644
--- a/abs/extra/community/transmission-cli/transmissiond.conf
+++ b/abs/extra/community/transmission-cli/transmissiond.conf
@@ -1 +1,2 @@
-TRANS_USER=""
+TRANS_USER="mythtv"
+TRANS_OPTS="-f -ep -w /myth/transmission"