Subject: [alpine-devel] [PATCH] Replace instances of "--chuid" to "--user" in initd scripts

From: Jesse Young <[email-masked]>
Date: Fri, 25 Nov 2011 12:46:26 -0600

Fixes #776

Signed-off-by: Jesse Young <[email-masked]>
---
 main/backuppc/backuppc.initd                |    4 ++--
 main/bitlbee/APKBUILD                       |    4 ++--
 main/bitlbee/bitlbee.initd                  |    2 +-
 main/ez-ipupdate/APKBUILD                   |    4 ++--
 main/ez-ipupdate/ez-ipupdate.initd          |    2 +-
 main/fetchmail/APKBUILD                     |    8 ++++----
 main/fetchmail/fetchmail.initd              |    2 +-
 main/ircservices/APKBUILD                   |    8 ++++----
 main/ircservices/ircservices.initd          |    2 +-
 main/open-vm-tools/APKBUILD                 |    6 +++---
 main/open-vm-tools/open-vm-tools.initd      |    6 +++---
 main/smokeping/APKBUILD                     |    4 ++--
 main/smokeping/smokeping.initd              |    2 +-
 main/subversion/APKBUILD                    |    6 +++---
 main/subversion/svnserve.initd              |    4 ++--
 main/trac/APKBUILD                          |    4 ++--
 main/trac/tracd.initd                       |    2 +-
 main/transmission/APKBUILD                  |    4 ++--
 main/transmission/transmission-daemon.initd |    2 +-
 main/zabbix/APKBUILD                        |   10 +++++-----
 main/zabbix/zabbix-agentd.initd             |    4 ++--
 main/zabbix/zabbix-proxy.initd              |    4 ++--
 main/zabbix/zabbix-server.initd             |    4 ++--
 testing/cherokee/APKBUILD                   |   10 +++++-----
 testing/cherokee/cherokee.initd             |    2 +-
 testing/cluster-glue/ha_logd.initd          |    2 +-
 testing/drizzle/APKBUILD                    |    4 ++--
 testing/drizzle/drizzle.initd               |    2 +-
 testing/prosody/APKBUILD                    |    6 +++---
 testing/prosody/prosody.initd               |    2 +-
 testing/rrdbot/APKBUILD                     |    4 ++--
 testing/rrdbot/rrdbotd.initd                |    2 +-
 32 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/main/backuppc/backuppc.initd b/main/backuppc/backuppc.initd
index eefdc92..850e6ae 100644
--- a/main/backuppc/backuppc.initd
+++ b/main/backuppc/backuppc.initd
@@ -14,7 +14,7 @@ configure () {
 start() {
 	ebegin "Starting $DAEMON"
 	start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
-	  -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
+	  --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
 	eend $?
 }
 
@@ -29,7 +29,7 @@ restart () {
 	start-stop-daemon --stop --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
 	  --retry 30 -x /usr/bin/perl
 	start-stop-daemon --start --pidfile $BACKUPPC_LOGDIR/BackupPC.pid \
-	  -c $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
+	  --user $USER --exec $BACKUPPC_BINDIR/$DAEMON -- -d
 }
 
 reload () {
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index e0b35ba..628e696 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <[email-masked]>
 pkgname=bitlbee
 pkgver=3.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="An IRC to other chat networks gateway"
 url="http://www.bitlbee.org/"
 arch="all"
@@ -53,6 +53,6 @@ otr() {
 }
 
 md5sums="4fe688e3a80efe011743f4c9265c0310  bitlbee-3.0.3.tar.gz
-6b3c70649ececec230d145b62778ad61  bitlbee.initd
+7c3f5a9c5b25b425e87ff38abc44282d  bitlbee.initd
 bf07d39a4b652c63415b411229c5e281  bitlbee.confd
 2d91f7ae46d69560d7f156f282dceaef  bitlbee.post-install"
diff --git a/main/bitlbee/bitlbee.initd b/main/bitlbee/bitlbee.initd
index 92bab34..c6e7ce7 100644
--- a/main/bitlbee/bitlbee.initd
+++ b/main/bitlbee/bitlbee.initd
@@ -14,7 +14,7 @@ start() {
 	ebegin "Starting ${name}"
 		start-stop-daemon --start --quiet \
 			--pidfile /var/run/${name}.pid \
-			--chuid nobody:nobody \
+			--user nobody:nobody \
 			--exec ${daemon} -- ${PORT} ${OPTS}
 	eend $?
 }
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 3529150..2e81bc0 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jeremy Thomerson <[email-masked]>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 arch="all"
@@ -45,5 +45,5 @@ package() {
 
 md5sums="6505c9d18ef6b5ce13fe2a668eb5724b  ez-ipupdate-3.0.10.tar.gz
 e6e06780b1896f2250132cc16cd10710  ez-ipupdate.confd
-6b9ce71b7b6b739794f003b2ebbf66ed  ez-ipupdate.initd
+6a8250dd9c7810c1968f80c90715b747  ez-ipupdate.initd
 1fede0dcb5d9ca108855df0a9d213413  errno.patch"
diff --git a/main/ez-ipupdate/ez-ipupdate.initd b/main/ez-ipupdate/ez-ipupdate.initd
index 4ec6626..89faa9e 100644
--- a/main/ez-ipupdate/ez-ipupdate.initd
+++ b/main/ez-ipupdate/ez-ipupdate.initd
@@ -26,7 +26,7 @@ start() {
         ebegin "Starting ${NAME}"
                 start-stop-daemon --start --quiet \
                         --pidfile /var/run/${NAME}/${NAME}.pid \
-                        --chuid ${DAEMON_USER}:${DAEMON_GROUP} \
+                        --user ${DAEMON_USER}:${DAEMON_GROUP} \
                         --exec ${DAEMON} -- ${OPTS}
         eend $?
 }
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index c784f28..abf340c 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Michael Mason <[email-masked]> 
+# Contributor: Michael Mason <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=fetchmail
 pkgver=6.3.21
-pkgrel=0
+pkgrel=1
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 arch="all"
@@ -37,10 +37,10 @@ fetchmailconf() {
 	pkgdesc="A GUI for generating fetchmail configuration files"
 	install=
 	mkdir -p "$subpkgdir"/usr/bin
-	cd "$pkgdir" 
+	cd "$pkgdir"
 	mv usr/bin/fetchmailconf "$subpkgdir"/usr/bin/
 	mv usr/lib "$subpkgdir"/usr/
 }
 
 md5sums="0ad8eac47e85bd0ae63870daa09992af  fetchmail-6.3.21.tar.bz2
-b27fe01a7c25534d62d175c8ba22fc48  fetchmail.initd"
+20ad22948fd77cf24e2bb288af6fd266  fetchmail.initd"
diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index 73286c4..0857d65 100755
--- a/main/fetchmail/fetchmail.initd
+++ b/main/fetchmail/fetchmail.initd
@@ -20,7 +20,7 @@ start() {
 
         ebegin "Starting fetchmail"
         start-stop-daemon --start --quiet \
-		--chuid fetchmail --exec /usr/bin/fetchmail \
+		--user fetchmail --exec /usr/bin/fetchmail \
 		-- -d ${polling_period:-300} -f /etc/fetchmailrc \
 		--pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
         eend ${?}
diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD
index dce26a4..2e37382 100644
--- a/main/ircservices/APKBUILD
+++ b/main/ircservices/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=ircservices
 pkgver=5.1.24
-pkgrel=0
+pkgrel=1
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
 url="http://www.ircservices.za.net/"
 arch="all"
@@ -55,7 +55,7 @@ package() {
 	# try conform to FHS
 	cd "$pkgdir"
 	install -d etc/ircservices usr/share/ircservices var/log/ircservices
-	
+
 	mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db
 
 	mv var/lib/ircservices/example-ircservices.conf \
@@ -78,10 +78,10 @@ package() {
 
 	chown ircservices:ircservices var/lib/ircservices \
 		var/log/ircservices
-	
+
 	chown root:ircservices etc/ircservices/ircservices.conf \
 		etc/ircservices/modules.conf
 }
 
 md5sums="d4f531537aeed230026cf5560f221ecb  ircservices-5.1.24.tar.gz
-279ea42c5d97b47787b5959c9981fbaa  ircservices.initd"
+6168b69dbce72d5f09f2c7437f1a540d  ircservices.initd"
diff --git a/main/ircservices/ircservices.initd b/main/ircservices/ircservices.initd
index 8c2a11e..2b0e9ff 100644
--- a/main/ircservices/ircservices.initd
+++ b/main/ircservices/ircservices.initd
@@ -12,7 +12,7 @@ depend() {
 start() {
 	ebegin "Starting IRC Services"
 	start-stop-daemon --start --quiet --exec /usr/bin/ircservices \
-		--chuid ircservices \
+		--user ircservices \
 		-- \
 		-dir=/var/lib/ircservices \
 		-log=/var/log/ircservices/ircservices.log \
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index 6e31f2d..866c3d5 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=open-vm-tools
 pkgver=2011.09.23
 _pkgsubver=491607
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
@@ -38,7 +38,7 @@ prepare() {
 		-e 's/__unused3/st_ctim.tv_nsec/g' \
 		lib/file/filePosix.c lib/hgfsServer/hgfsServerLinux.c \
 		|| return 1
-	
+
 	# workaround automake-1.10 issue
 	# http://ramblingfoo.blogspot.com/2007/07/required-file-configrpath-not-found.html
 	touch config/config.rpath
@@ -87,5 +87,5 @@ md5sums="599342eee8d531b35ca1cc948b61868f  open-vm-tools-2011.09.23-491607.tar.g
 840e4d6ff3f53fc22bdedf4d64aabc91  ecvt.patch
 89c7449323ddac4666b73a8467baf95a  iconv-uclibc.patch
 7d02fc25aba5c248f3d98dac238f175b  libm.patch
-c96644aa42d611fae853a3a2095efc47  open-vm-tools.initd
+905ef6a3bac87c9ba2e5d3897ca230e7  open-vm-tools.initd
 7b833102a56009bdfc2fef2fb9ffa297  procmgrposix.patch"
diff --git a/main/open-vm-tools/open-vm-tools.initd b/main/open-vm-tools/open-vm-tools.initd
index e54b84a..45a94a3 100644
--- a/main/open-vm-tools/open-vm-tools.initd
+++ b/main/open-vm-tools/open-vm-tools.initd
@@ -39,15 +39,15 @@ start() {
 		mount -t vmblock none ${MOUNTPOINT}
 		eend $?
 	fi
-	
+
 	ebegin "Starting vmtoolsd"
-	start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
+	start-stop-daemon --user "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
 	eend $?
 }
 
 stop() {
 	local ret
-	
+
 	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
 	then
 		ebegin "Cleaning the contents of ${DND_TMPDIR}"
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index 6190e30..163b72f 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=smokeping
 pkgver=2.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Smokeping network latency monitoring"
 pkgusers="smokeping"
 pkggroups="smokeping"
@@ -129,7 +129,7 @@ package() {
 }
 
 md5sums="f4a5437b71e02f982f08bf318bb9857d  smokeping-2.6.1.tar.gz
-550979e008f49299bf404aceeb81fe61  smokeping.initd
+38fe448bd14ebfb2a22dbd9fc98a59e7  smokeping.initd
 b3f3c968c582adb9e4e0fdcc9c7163e9  0001-fix-sysconfdir-in-etc.patch
 2bdafaade171bfb2241d1e6450fb094a  0002-fix-sysconfdir-in-doc.patch
 1942e4eceecb80b4bbe4cfc95e3e642f  0003-fix-sysconfdir-in-lib.patch
diff --git a/main/smokeping/smokeping.initd b/main/smokeping/smokeping.initd
index 068f33f..5a21fec 100644
--- a/main/smokeping/smokeping.initd
+++ b/main/smokeping/smokeping.initd
@@ -29,7 +29,7 @@ start() {
 	start-stop-daemon --start --name smokeping \
 		--pidfile /var/run/smokeping/smokeping.pid \
 		--exec /usr/bin/smokeping \
-		--chuid smokeping:smokeping
+		--user smokeping:smokeping
 	eend $?
 }
 
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 7e31aa1..ae99429 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=subversion
 pkgver=1.7.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.tigris.org/"
 arch="all"
@@ -38,7 +38,7 @@ build() {
 		--with-swig \
 		--disable-javahl \
 		--disable-static \
-		--without-jdk 
+		--without-jdk
 
 	make external-all || return 1
 	make local-all || return 1
@@ -79,4 +79,4 @@ pl() {
 md5sums="8a4fa74385df85a9702141b6b68b8307  subversion-1.7.1.tar.bz2
 e1127cb722daecb3c89adbaf9eed7adf  subversion-1.7.0-deplibs.patch
 d084a7558053784886bc858b94fa9186  svnserve.confd
-22c274fafb4817e31126f60f9d84039f  svnserve.initd"
+c0327ac3f55c335db799a2269078f986  svnserve.initd"
diff --git a/main/subversion/svnserve.initd b/main/subversion/svnserve.initd
index f539a4e..d76f6f3 100644
--- a/main/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
@@ -17,7 +17,7 @@ start() {
 	cd /
 	start-stop-daemon --start --quiet --background --make-pidfile \
 		--pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-		--chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
+		--user ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
 		--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
 	eend $?
 }
@@ -35,7 +35,7 @@ setup() {
 		eend 1 "$root/repos already exist"
 		return 1
 	fi
-		
+
 	svnadmin create "$root"/repos
 	chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "$root/repos"
 	mkdir -p "$root/conf"
diff --git a/main/trac/APKBUILD b/main/trac/APKBUILD
index c6cf392..b5ce2c6 100644
--- a/main/trac/APKBUILD
+++ b/main/trac/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=trac
 _realname=Trac
 pkgver=0.12.2
-pkgrel=1
+pkgrel=2
 pkgusers="tracd"
 pkggroups="tracd"
 pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
@@ -33,4 +33,4 @@ package() {
 
 md5sums="f70c7676601f2592bcb7871319e62dd7  Trac-0.12.2.tar.gz
 95b1311ca65e1ffcd51a191542f45ba4  tracd.confd
-e53761b1e84c5d68c8e6c4b837e57008  tracd.initd"
+fd3f1cd33a2819c43de82b92a839660d  tracd.initd"
diff --git a/main/trac/tracd.initd b/main/trac/tracd.initd
index 83f8405..fc365e1 100755
--- a/main/trac/tracd.initd
+++ b/main/trac/tracd.initd
@@ -12,7 +12,7 @@ start() {
 	# tracd fails to create pidfile if started as non-root user, thus we are asking
 	# s-s-d to do that. To have correct pid we avoid -d option of tracd and use
 	# --background option of s-s-d.
-	start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
+	start-stop-daemon --start --user ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
                 --pidfile /var/run/tracd.pid --make-pidfile --background \
 		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
 		--exec /usr/bin/python -- /usr/bin/tracd \
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index e71729f..47e1c01 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
 pkgver=2.41
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK BitTorrent client"
 url="http://www.tansmissionbt.com"
 install="$pkgname.pre-install"
@@ -67,5 +67,5 @@ cli() {
 }
 
 md5sums="799b7bb24e236dbbdc86275f89ea9e67  transmission-2.41.tar.bz2
-f65b8ae46f8ac89b35844109b3aa0c18  transmission-daemon.initd
+1ca57137d38c3429295a4699f535a240  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/main/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd
index ecf3bda..4f0acd2 100644
--- a/main/transmission/transmission-daemon.initd
+++ b/main/transmission/transmission-daemon.initd
@@ -8,7 +8,7 @@ depend() {
 start() {
         ebegin "Starting transmission-daemon"
                 start-stop-daemon --start --quiet --background --make-pidfile \
-                --chuid transmission:transmission \
+                --user transmission:transmission \
                 --pidfile /var/run/transmission-daemon.pid \
                 --exec /usr/bin/transmission-daemon -- ${TD_OPTS}
         eend $?
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 53cb4ff..9e0b8e9 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Jeff Bilyk <jbilyk at gmail> 
+# Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=zabbix
 pkgver=1.8.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="www.zabbix.com"
 arch="all"
@@ -158,6 +158,6 @@ md5sums="8e38079640cf50c215f36dfd3125a6d3  zabbix-1.8.8.tar.gz
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 a55a4d0b2e13c97c280006ba4bee0afa  zabbix-dn_skipname.patch
 8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
-e42394e798ab98a8ff4babe68e04633a  zabbix-server.initd
-88374bba8a8fdfabfcfe9be6dd12095f  zabbix-agentd.initd
-32abde1cc00c2eeccddb7e038117d0ab  zabbix-proxy.initd"
+d823c2ab6c2bbdd0ebd3511fac4a83b4  zabbix-server.initd
+1a5c718bcf815fcf659e14fb0b576a1a  zabbix-agentd.initd
+a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd"
diff --git a/main/zabbix/zabbix-agentd.initd b/main/zabbix/zabbix-agentd.initd
index b14b5fe..745b35e 100644
--- a/main/zabbix/zabbix-agentd.initd
+++ b/main/zabbix/zabbix-agentd.initd
@@ -11,12 +11,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --user zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }
diff --git a/main/zabbix/zabbix-proxy.initd b/main/zabbix/zabbix-proxy.initd
index 8ac246e..a8b418a 100644
--- a/main/zabbix/zabbix-proxy.initd
+++ b/main/zabbix/zabbix-proxy.initd
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_proxy
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix proxy"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
+	start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
 	eend $?
 }
diff --git a/main/zabbix/zabbix-server.initd b/main/zabbix/zabbix-server.initd
index a661cd2..5ccd019 100644
--- a/main/zabbix/zabbix-server.initd
+++ b/main/zabbix/zabbix-server.initd
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix:zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --user zabbix --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }
diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index a4ab7f7..ca8330a 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Mika Havela <[email-masked]> 
+# Contributor: Mika Havela <[email-masked]>
 # Maintainer: William Pitcock <[email-masked]>
 pkgname=cherokee
 pkgver=1.2.98
-pkgrel=1
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 url="http://www.cherokee-project.com/"
 arch="all"
@@ -31,9 +31,9 @@ build() {
 
 package() {
 	cd "$_builddir"
-	
+
 	make -j1 DESTDIR="$pkgdir" install || return 1
-	
+
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname || return 1
 	install -m644 -D "$srcdir"/$pkgname.confd \
@@ -41,5 +41,5 @@ package() {
 }
 
 md5sums="21b01e7d45c0e82ecc0c4257a9c27feb  cherokee-1.2.98.tar.gz
-4180dbb6701f928054079aa1e3bd5ebc  cherokee.initd
+8cc44726585fa04a2772a0c3faa6a72d  cherokee.initd
 bd6a840f72c630ce1eaabe058097584f  cherokee.confd"
diff --git a/testing/cherokee/cherokee.initd b/testing/cherokee/cherokee.initd
index 6aed337..5e88e06 100755
--- a/testing/cherokee/cherokee.initd
+++ b/testing/cherokee/cherokee.initd
@@ -15,7 +15,7 @@ start() {
 	ebegin "Starting ${NAME}"
 		start-stop-daemon --start --quiet \
 			--pidfile /var/run/${NAME}.pid \
-			--chuid ${DAEMON_USER}:${DAEMON_GROUP} \
+			--user ${DAEMON_USER}:${DAEMON_GROUP} \
 			--exec ${DAEMON} -- ${OPTS}
 	eend $?
 }
diff --git a/testing/cluster-glue/ha_logd.initd b/testing/cluster-glue/ha_logd.initd
index 3d318e7..13a5bf3 100644
--- a/testing/cluster-glue/ha_logd.initd
+++ b/testing/cluster-glue/ha_logd.initd
@@ -27,7 +27,7 @@ start() {
 		--quiet --start --chdir "${RUNTIMEDIR}" \
 		--pidfile "${PIDFILE}" \
 		--make-pidfile \
-		--exec ${BINARY} ${COMMAND_ARGS} --chuid "${USER}:${GROUP}" \
+		--exec ${BINARY} ${COMMAND_ARGS} --user "${USER}:${GROUP}" \
 		${PARAMS}
 	eend $?
 }
diff --git a/testing/drizzle/APKBUILD b/testing/drizzle/APKBUILD
index e1ebdbf..4ded450 100644
--- a/testing/drizzle/APKBUILD
+++ b/testing/drizzle/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <[email-masked]>
 pkgname=drizzle
 pkgver=2011.03.13
-pkgrel=0
+pkgrel=1
 pkgdesc="A MySQL-derived RDBMS for cloud usage and webapps"
 url="http://launchpad.net/drizzle"
 arch="all"
@@ -63,4 +63,4 @@ plugins() {
 }
 
 md5sums="e152edfec45779c0bd34ece707aa022d  drizzle7-2011.03.13.tar.gz
-000974e04609dbffb3e1e78b268fcc73  drizzle.initd"
+03b05074b95a241c4d07dfd8661baf9f  drizzle.initd"
diff --git a/testing/drizzle/drizzle.initd b/testing/drizzle/drizzle.initd
index 55bdd9b..7428c36 100644
--- a/testing/drizzle/drizzle.initd
+++ b/testing/drizzle/drizzle.initd
@@ -14,7 +14,7 @@ start() {
 	ebegin "Starting ${name}"
 		start-stop-daemon --start --quiet \
 			--pidfile /var/run/${name}.pid \
-			--chuid drizzle:drizzle \
+			--user drizzle:drizzle \
 			--exec ${daemon}
 	eend $?
 }
diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD
index 4672f43..a47078c 100644
--- a/testing/prosody/APKBUILD
+++ b/testing/prosody/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Mika Havela <[email-masked]>
 pkgname=prosody
 pkgver=0.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua based Jabber/XMPP server"
 url="http://prosody.im/"
 arch="all"
@@ -23,7 +23,7 @@ build() {
 		--with-lua=/usr/bin \
 		--with-lua-lib=/usr/lib \
 		--with-lua-include=/usr/include
-	
+
 	make || return 1
 }
 
@@ -41,4 +41,4 @@ package() {
 
 md5sums="6e907bf0d0acf24f1011083020ba6ffb  prosody-0.8.2.tar.gz
 5a415bb85fb1e00a17cb3ad951e3b889  prosody.cfg.lua.patch
-c0e647e872e30f71fa03faab189ae287  prosody.initd"
+9b68b81deb2148a3a6c3b5d2eb9c96b9  prosody.initd"
diff --git a/testing/prosody/prosody.initd b/testing/prosody/prosody.initd
index 2749d09..1a41d4a 100644
--- a/testing/prosody/prosody.initd
+++ b/testing/prosody/prosody.initd
@@ -15,7 +15,7 @@ start() {
 		/usr/bin/prosodyctl start
 #		start-stop-daemon --start --quiet --background \
 #			--make-pidfile --pidfile /var/run/${NAME}/${NAME}.pid \
-#			--chuid ${USER}:${GROUP} \
+#			--user ${USER}:${GROUP} \
 #			--exec ${DAEMON} -- ${OPTS}
 	eend $?
 }
diff --git a/testing/rrdbot/APKBUILD b/testing/rrdbot/APKBUILD
index 426c51e..3acfd2a 100644
--- a/testing/rrdbot/APKBUILD
+++ b/testing/rrdbot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=rrdbot
 pkgver=0.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc="an SNMP polling daemon which writes the polled values to an RRD database"
 url="http://memberwebs.com/stef/software/rrdbot/"
 arch="all"
@@ -43,5 +43,5 @@ package() {
 }
 
 md5sums="8329c8f58136158b25c3179e825c66e6  rrdbot-0.9.6.tar.gz
-e74785806860537d38a5863fc90b324f  rrdbotd.initd
+68d118f9a86c6cf8e718d0f2be210306  rrdbotd.initd
 cbcac88f5b728b1441891947a4babbcb  rrdbotd.confd"
diff --git a/testing/rrdbot/rrdbotd.initd b/testing/rrdbot/rrdbotd.initd
index d0fcdc4..5fae6e8 100644
--- a/testing/rrdbot/rrdbotd.initd
+++ b/testing/rrdbot/rrdbotd.initd
@@ -13,7 +13,7 @@ start() {
 	ebegin "Starting ${name}"
 	start-stop-daemon --start --quiet \
 		--pidfile "$pidfile" \
-		--chuid ${rrdbotd_user:-rrdbotd}:${rrdbotd_group:-rrdbotd} \
+		--user ${rrdbotd_user:-rrdbotd}:${rrdbotd_group:-rrdbotd} \
 		--exec ${daemon} -- ${rrdbotd_opts} -p "$pidfile"
 	eend $?
 }
-- 
1.7.7.4

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Natanael Copa <[email-masked]>
Date: Thu, 1 Dec 2011 14:04:13 +0100

On Fri, 25 Nov 2011 12:46:26 -0600

> Signed-off-by: Jesse Young <[email-masked]>

applied. Sorry for the delay.

Thanks!
-nc

---