cleanup, moved paramerte -c to -u in start-stop-daemon

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 13 insertions, 121 deletions

diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog
index b8eecfe2baf5..497b813df465 100644
--- a/www-misc/xxv/ChangeLog
+++ b/www-misc/xxv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/xxv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.18 2012/02/07 10:37:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.19 2012/03/14 19:57:04 hd_brummy Exp $
+
+  14 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -files/xxv.utf8-v4,
+  files/xxv.utf8-v5:
+  cleanup, moved paramerte -c to -u in start-stop-daemon
 
   07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -xxv-1.4.ebuild,
   -xxv-1.5.ebuild, -xxv-1.6.ebuild, xxv-1.6.1.ebuild:
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 7c92ea6fda8f..df293b2b579e 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA1
 
 AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86 SHA1 712257f3d7a98da402f3c67bbd41b6bb132ff0a3 SHA256 ac8db7fb3d75be90dc33fdf427265dcd14355e572500140718fce2c731166822
-AUX xxv.utf8-v4 2402 RMD160 0383b510616c4606fc75ee614524ccd04bb5d724 SHA1 76054d84354fde02982c114d03cafd9838a9fd26 SHA256 e5d22a0640a84332f6c5fad74650174f56ffbc900a60d0be48165fe4164bec84
-AUX xxv.utf8-v5 2113 RMD160 3dae7d1af8330d1886795c22c0f4658a8ab9aca5 SHA1 db69c5519239eb6243bd16b7966647c748baff53 SHA256 05d9f66e2bfc50231e393e861e63eb8cbec0b2c234796ae517db0dbfa08eada0
+AUX xxv.utf8-v5 2113 RMD160 3b786053bc6b5278be1e1fc0d72e5049abc69ceb SHA1 110eab432e0a6e0229e711d25f938c6abf37a1f1 SHA256 4542c1eb54e6f3c72351305bd9fef394de941134d1d8d323fdbb58079fb79670
 AUX xxvd-1.0.cfg 2257 RMD160 2f0ed9987f6a85fa4bc1a7ae68b31251f4e72b00 SHA1 f82efba3aefb1216067767e52236e119da6d65dc SHA256 a49c7c402e8c9990f84e8b3ae5207559f9dd9262075b5ab0606058ff08061016
 AUX xxvd-logrotate 478 RMD160 5945c1c40750b594dce1bec7ba8cf9cc7aa43ea0 SHA1 450c4e18023716851a86a1afc8a8ce749a9e3513 SHA256 0b16eda74181e54f0beb5a3de92d2e12288270bc891e378d61a076274e53f11a
 DIST xxv-1.6.1.tgz 992065 RMD160 72da3a277aed8ca662faff881647b41264f2f833 SHA1 aaed0fb0158d67c56a0d2028877e3530f2a789b5 SHA256 14288f7fb4c16c536e0c861b4f213bc1a7bf19e036b6d37777989acaa9b82643
 EBUILD xxv-1.6.1.ebuild 4754 RMD160 8f4ddcb34bdad5de4e8ceec12be3486ef38b5f5c SHA1 2380040260a14522a56d687f16ef26065766d5c7 SHA256 1f366e0146c331094f6f5b8cd80b6092a4a1ca427cd80c543ba6133795e3393c
-MISC ChangeLog 5935 RMD160 6c598fe8c3a27ab2c3c4f6efdb427a759e5911f4 SHA1 8c2d4e6f477b9a2a0bf71fe628a1d3c19df30c3f SHA256 33fa4f33d71995160cd7f78fb920871ddaa49956b0949e58f9b177ab30392a59
+MISC ChangeLog 6089 RMD160 aed4de28eb727f13026a7a562ce4c25515ea737b SHA1 377c4905280c2803a7af2aa0fb87ce0e402764de SHA256 3521baaaf1bf3b7accf93083284da9a9eaceac7fc57c87c89ea1f4c158beeed7
 MISC metadata.xml 585 RMD160 b0b357c93ae3621b4987dc08aa17035aba6db141 SHA1 a6980f5834e35f06e420b21ee475d5585b98a739 SHA256 e7d51f153d3ab51a13a168000d0cbf2253e9db4ab2580a98049079c8a45e3af1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPMP7ndn07HTTCgIoRAk0lAKCjFtVeX2mZKBEAI26WptwysvlarQCgimQS
-T/9ultAljkC6ollWpDD46Ik=
-=zdJZ
+iD8DBQFPYPoidn07HTTCgIoRAlTbAKCCvKB4GtDTrMlGK6nsZvoNUw4rKwCeN2B/
+Nd/QB7sFspsABBIjbNGwVxE=
+=jiDP
 -----END PGP SIGNATURE-----
diff --git a/www-misc/xxv/files/xxv.utf8-v4 b/www-misc/xxv/files/xxv.utf8-v4
deleted file mode 100644
index c1f3d0b8ead3..000000000000
--- a/www-misc/xxv/files/xxv.utf8-v4
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $
-
-RUNAS_USER="vdr"
-
-# Set Verbose Level 0 -> 5 
-VERBOSE="1"
-
-depend() {
-	need vdr
-}
-
-# some fixed Path
-CONFIGFILE="/etc/xxv/xxvd.cfg"
-PIDFILE="/var/run/xxv/xxvd.pid"
-XXV_BIN="/usr/bin/xxvd"
-LOGFILE="/var/log/xxv/xxvd.log"
-
-xxv_logger() {
-	printf "\tXXV running as user: ${RUNAS_USER}\n" >> "${LOGFILE}"
-	printf "\tVerbose Level: ${VERBOSE}\n" >> "${LOGFILE}"
-	printf "\tYou can change this in xxv init script\n\n" >> "${LOGFILE}"
-}
-
-check_vdradmin() {
-
-	# Check at first, is VDR-Admin running
-	# Stopping, while running on same ports
-	if [ -n "`netstat -anp | grep vdradmin | grep 8080`" ] ; then
-		echo
-		eerror "VDR-Admin will Stop at first now"
-		eerror "vdradmin and xxv can not run on the same port"
-		echo
-		/etc/init.d/vdradmin stop
-	fi
-}
-
-xxv_kill_pid() {
-
-	# After unclear stop, xxvd.pid will not removed, fixed with next line
-	if [ ! -x /etc/init.d/root ]; then
-		if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then
-			rm ${PIDFILE}
-			killall xxvd 2> /dev/null
-		fi
-	fi
-
-}
-
-xxv_kill_initfile() {
-
-	# After unclear stop, init file in /var/lib/init.d/started/ still not removed
-	
-	if [ ! -x /etc/init.d/root ]; then
-		if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then
-			rm /var/lib/init.d/started/xxv
-			/etc/init.d/xxv zap
-			killall xxvd 2> /dev/null
-		fi
-	fi
-
-}
-
-set_utf8_charset() {
-	local capfile=/usr/share/vdr/capabilities.sh
-	[ -e "${capfile}" ] && . ${capfile}
-	if [ "${CAP_UTF8}" = "1" -o "${VDR_CAN_HANDLE_UTF8}" = "yes" ]; then
-		# do not clean out utf8
-		XXV_UTF8="-utf8"
-		printf "\txxv starting with utf-8 support\n" >> "${LOGFILE}"
-	fi
-}
-	
-start() {
-	check_vdradmin
-	xxv_logger	
-	set_utf8_charset
-
-	ebegin "Start xxv"
-	echo
-	einfo "xxv running as user: ${RUNAS_USER}"
-	einfo "Verbose Level: ${VERBOSE}"
-	
-	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -c ${RUNAS_USER} --exec ${XXV_BIN} -- \
-	${XXV_UTF8} -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
-	eend $?
-}
-
-
-stop() {
-
-	ebegin "Stopping xxvd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-
-		xxv_kill_pid
-		xxv_kill_initfile
-
-	eend $?
-}
-
-restart() {
-
-	xxv_kill_pid
-	xxv_kill_initfile
-
-
-	svc_stop
-	svc_start
-}
diff --git a/www-misc/xxv/files/xxv.utf8-v5 b/www-misc/xxv/files/xxv.utf8-v5
index 603543f568db..d7d4a9258f2c 100644
--- a/www-misc/xxv/files/xxv.utf8-v5
+++ b/www-misc/xxv/files/xxv.utf8-v5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v5,v 1.1 2009/08/16 18:27:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v5,v 1.2 2012/03/14 19:57:04 hd_brummy Exp $
 
 RUNAS_USER="vdr"
 
@@ -74,7 +74,7 @@ start() {
 	einfo "xxv running as user: ${RUNAS_USER}"
 	einfo "Verbose Level: ${VERBOSE}"
 	
-	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -c ${RUNAS_USER} --exec ${XXV_BIN} -- \
+	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -u ${RUNAS_USER} --exec ${XXV_BIN} -- \
 	-configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
 	eend $?
 }