Replace instances of "--chuid" to "--user" in initd scripts

Fixes #776

Signed-off-by: Jesse Young <jlyo@jlyo.org>

9 files changed, 17 insertions, 17 deletions

diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index a4ab7f7d45..ca8330a026 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Mika Havela <mika.havela@gmail.com> 
+# Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 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 6aed337b6f..5e88e069c3 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 3d318e7ae5..13a5bf321a 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 e1ebdbf71b..4ded450725 100644
--- a/testing/drizzle/APKBUILD
+++ b/testing/drizzle/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 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 55bdd9bf21..7428c360e1 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 4672f435ba..a47078ce39 100644
--- a/testing/prosody/APKBUILD
+++ b/testing/prosody/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 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 2749d09cf7..1a41d4a9e2 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 426c51e230..3acfd2ae55 100644
--- a/testing/rrdbot/APKBUILD
+++ b/testing/rrdbot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 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 d0fcdc4a6d..5fae6e8dda 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 $?
 }