[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluge.install deluged)

[Ionut Biru]

    Date: Wednesday, April 21, 2010 @ 09:45:04
  Author: ibiru
Revision: 78337

upgpkg: deluge 1.2.3-2
check if we have a stalled process, changed the default shell from bin/bash to /bin/false, fixes FS#19193,FS#19191 and FS#19047

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluge.install
  deluge/trunk/deluged

----------------+
 PKGBUILD       |    6 +++---
 deluge-web     |    6 ++++--
 deluge.install |    6 +++++-
 deluged        |    6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-21 12:48:29 UTC (rev 78336)
+++ PKGBUILD	2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/"
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'e187f10be1f4a445ae1bc76693a16e8a'
-         '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a873e1935688df487e2f5ca5dda1176d'
+         '332d23fe0d21ce92b494efd73322856c' '0fdce620e4e6ac0e2205509dc8ce99b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===================================================================
--- deluge-web	2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge-web	2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluge-web.pid ]] && PID=`cat /var/run/deluge-web.pid`
+[[ -f /var/run/deluge-web.pid ]] && PID=$(cat /var/run/deluge-web.pid)
+[[ -d /proc/$PID ]] || PID=
 
 case "$1" in
   start)
     stat_busy "Starting Deluge WebUI"
-    [[ -z $PID ]] && su -l -c "/usr/bin/deluge-web -f" $DELUGE_USER
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
+    sleep 1
     if [ $? -gt 0 ]; then
       stat_fail
     else

Modified: deluge.install
===================================================================
--- deluge.install	2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge.install	2010-04-21 13:45:04 UTC (rev 78337)
@@ -1,6 +1,10 @@
 post_install() {
   getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge >/dev/null 2>&1 || usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/bash deluge
+  if getent passwd deluge > /dev/null 2>&1; then
+      usr/sbin/usermod -c 'Deluge user' -d /srv/deluge -s /bin/false deluge > /dev/null 2>&1
+  else
+      usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
+  fi
   usr/bin/passwd -l deluge &>/dev/null
 
   chown deluge.deluge srv/deluge -R

Modified: deluged
===================================================================
--- deluged	2010-04-21 12:48:29 UTC (rev 78336)
+++ deluged	2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluged.pid ]] && PID=`cat /var/run/deluged.pid`
+[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid)
+[[ -d /proc/$PID ]] || PID=
 
 case "$1" in
   start)
     stat_busy "Starting Deluge Daemon"
-    [[ -z $PID ]] && su -l -c "/usr/bin/deluged" $DELUGE_USER
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
+    sleep 1
     if [ $? -gt 0 ]; then
       stat_fail
     else