Date: Monday, October 15, 2012 @ 18:50:32 Author: heftig Revision: 168780
archrelease: copy trunk to staging-any Added: deluge/repos/staging-any/ deluge/repos/staging-any/PKGBUILD (from rev 168779, deluge/trunk/PKGBUILD) deluge/repos/staging-any/deluge-web (from rev 168779, deluge/trunk/deluge-web) deluge/repos/staging-any/deluge-web.service (from rev 168779, deluge/trunk/deluge-web.service) deluge/repos/staging-any/deluge.install (from rev 168779, deluge/trunk/deluge.install) deluge/repos/staging-any/deluge.tmpfiles.conf (from rev 168779, deluge/trunk/deluge.tmpfiles.conf) deluge/repos/staging-any/deluged (from rev 168779, deluge/trunk/deluged) deluge/repos/staging-any/deluged.conf (from rev 168779, deluge/trunk/deluged.conf) deluge/repos/staging-any/deluged.service (from rev 168779, deluge/trunk/deluged.service) ----------------------+ PKGBUILD | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ deluge-web | 45 +++++++++++++++++++++++++++++++++++++++ deluge-web.service | 11 +++++++++ deluge.install | 28 ++++++++++++++++++++++++ deluge.tmpfiles.conf | 1 deluged | 43 +++++++++++++++++++++++++++++++++++++ deluged.conf | 2 + deluged.service | 13 +++++++++++ 8 files changed, 199 insertions(+) Copied: deluge/repos/staging-any/PKGBUILD (from rev 168779, deluge/trunk/PKGBUILD) =================================================================== --- staging-any/PKGBUILD (rev 0) +++ staging-any/PKGBUILD 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Hugo Doria <h...@archlinux.org> + +pkgname=deluge +pkgver=1.3.5 +pkgrel=2 +pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model" +arch=('any') +url="http://deluge-torrent.org/" +license=('GPL3') +depends=(python2-xdg 'libtorrent-rasterbar>=0.15.0' twisted python2-pyopenssl + xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme + python2-distribute) +makedepends=(intltool pygtk librsvg python2-mako) +optdepends=('python2-notify: libnotify notifications' + 'pygtk: needed for gtk ui' + 'librsvg: needed for gtk ui' + 'python2-mako: needed for web ui') +backup=(etc/conf.d/deluged) +install=deluge.install +source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.bz2 + deluge.tmpfiles.conf deluged deluge-web deluged.service deluge-web.service deluged.conf) +md5sums=('f17ef6686f33e12694b44976e5ed7721' + 'c50385d32a2db0ef3f46b8caadb0e988' + '443690c730263b76a465dc413f695a86' + '37538a1b049b177e9ea1014331e29689' + '6b831c889f365f58317dc4b78c167a62' + 'b3fff6601a5971bba89fa9a85dcf9ce8' + '71d556cf7ce3bb59391797827347e80c') + +build() { + cd $pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $pkgname-$pkgver + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + install -Dm644 deluge/data/pixmaps/deluge.svg "$pkgdir/usr/share/pixmaps/deluge.svg" + + _dir="$pkgdir/usr/lib/python2.7/site-packages/deluge/ui" + sed -i '1s/python$/&2/' "$_dir"/{Win32IconImagePlugin.py,web/gen_gettext.py} + + cd .. + install -Dm644 deluge.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/deluge.conf" + install -D deluged "$pkgdir/etc/rc.d/deluged" + install -D deluge-web "$pkgdir/etc/rc.d/deluge-web" + install -Dm644 deluged.service "$pkgdir/usr/lib/systemd/system/deluged.service" + install -Dm644 deluge-web.service "$pkgdir/usr/lib/systemd/system/deluge-web.service" + install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged" + + install -d "$pkgdir/srv" + install -d -m 664 -o 125 -g 125 "$pkgdir/srv/deluge" +} Copied: deluge/repos/staging-any/deluge-web (from rev 168779, deluge/trunk/deluge-web) =================================================================== --- staging-any/deluge-web (rev 0) +++ staging-any/deluge-web 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/deluged + +PIDFILE=/run/deluge/deluge-web.pid +WEB_OPTIONS="-f $WEB_OPTIONS" + +[[ -f $PIDFILE ]] && PID=$(<$PIDFILE) +[[ -z $PID ]] || kill -0 $PID || PID= + +case "$1" in + start) + stat_busy "Starting Deluge WebUI" + [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web $WEB_OPTIONS >/dev/null" deluge + if [ $? -gt 0 ]; then + stat_fail + else + sleep 1 + echo $(pgrep -u deluge deluge-web) > $PIDFILE + add_daemon deluge-web + stat_done + fi + ;; + stop) + stat_busy "Stopping Deluge WebUI" + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm $PIDFILE + rm_daemon deluge-web + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Copied: deluge/repos/staging-any/deluge-web.service (from rev 168779, deluge/trunk/deluge-web.service) =================================================================== --- staging-any/deluge-web.service (rev 0) +++ staging-any/deluge-web.service 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,11 @@ +[Unit] +Description=Deluge WebUI +After=deluged.service + +[Service] +User=deluge +EnvironmentFile=/etc/conf.d/deluged +ExecStart=/usr/bin/deluge-web $WEB_OPTIONS + +[Install] +WantedBy=multi-user.target Copied: deluge/repos/staging-any/deluge.install (from rev 168779, deluge/trunk/deluge.install) =================================================================== --- staging-any/deluge.install (rev 0) +++ staging-any/deluge.install 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,28 @@ +post_install() { + getent group deluge &>/dev/null || groupadd -g 125 deluge + if ! getent passwd deluge &>/dev/null; then + useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge + passwd -l deluge &>/dev/null + fi + + post_upgrade + +cat <<EOF +>>> The optional headless daemon started using deluged.service uses the "deluge" user. + Its default download directory is /srv/deluge. +EOF +} + +post_upgrade() { + systemd-tmpfiles --create deluge.conf + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + getent passwd deluge &>/dev/null && userdel deluge + getent group deluge &>/dev/null && groupdel deluge + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} Copied: deluge/repos/staging-any/deluge.tmpfiles.conf (from rev 168779, deluge/trunk/deluge.tmpfiles.conf) =================================================================== --- staging-any/deluge.tmpfiles.conf (rev 0) +++ staging-any/deluge.tmpfiles.conf 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1 @@ +d /run/deluge 0755 deluge deluge - Copied: deluge/repos/staging-any/deluged (from rev 168779, deluge/trunk/deluged) =================================================================== --- staging-any/deluged (rev 0) +++ staging-any/deluged 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/deluged + +PIDFILE=/run/deluge/deluged.pid +OPTIONS="-P $PIDFILE $OPTIONS" + +[[ -f $PIDFILE ]] && PID=$(<$PIDFILE) +[[ -z $PID ]] || kill -0 $PID &>/dev/null || PID= + +case "$1" in + start) + stat_busy "Starting Deluge Daemon" + [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged $OPTIONS >/dev/null" deluge + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon deluged + stat_done + fi + ;; + stop) + stat_busy "Stopping Deluge Daemon" + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $PIDFILE + rm_daemon deluged + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Copied: deluge/repos/staging-any/deluged.conf (from rev 168779, deluge/trunk/deluged.conf) =================================================================== --- staging-any/deluged.conf (rev 0) +++ staging-any/deluged.conf 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,2 @@ +OPTIONS="" +WEB_OPTIONS="" Copied: deluge/repos/staging-any/deluged.service (from rev 168779, deluge/trunk/deluged.service) =================================================================== --- staging-any/deluged.service (rev 0) +++ staging-any/deluged.service 2012-10-15 22:50:32 UTC (rev 168780) @@ -0,0 +1,13 @@ +[Unit] +Description=Deluge Daemon + +[Service] +User=deluge +EnvironmentFile=/etc/conf.d/deluged +ExecStart=/usr/bin/deluged -P /run/deluge/deluged.pid $OPTIONS +Type=forking +PIDFile=/run/deluge/deluged.pid +UMask=0002 + +[Install] +WantedBy=multi-user.target