Use a static initd script instead of a dynamically changed one (bug #358123).

Package-Manager: portage-2.2.0_alpha26/cvs/Linux i686

4 files changed, 55 insertions, 10 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index cfba9d72e484..2116daa7c7d1 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/tinyproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.24 2011/03/10 17:27:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.25 2011/03/11 16:25:07 jer Exp $
+
+  11 Mar 2011; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.2.ebuild,
+  +files/tinyproxy-1.8.2.initd:
+  Use a static initd script instead of a dynamically changed one (bug #358123).
 
   10 Mar 2011; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.2.ebuild:
   The test suite needs fortune to be installed, by Myckel Habets (bug #358113).
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index b3a9cc7a2ffb..14916b4f484c 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,5 +1,6 @@
 AUX tinyproxy-1.8.1-ldflags.patch 306 RMD160 2e2e98c81a394b463fd3f65e50dc7995f70b3ccd SHA1 1076675e26cc7627dfdf135abd82e57caa9baf83 SHA256 ab1377eb43902c44c44f29f82968f45852e33cd11345b20a24145e57492c1388
 AUX tinyproxy-1.8.1-minimal.patch 109 RMD160 db0c4621e518d42dbe1bff787d9eed37515e93a7 SHA1 2a58388bc3cf46ba9b0067d97092378ea68b3898 SHA256 c2ee0a0cd073f00b7ea37eff078f84eb790bf7bb478e79fad5b1731aaec8f5dc
+AUX tinyproxy-1.8.2.initd 1061 RMD160 70cd2f6693a3f3e71c11be69b7664a777d25d824 SHA1 7ed43f518c1314aea64792a396cf60aa5c617158 SHA256 0dfef44ab70710f75ce50d265a145afb3a88ca129776154eab93f17e8e56ca32
 AUX tinyproxy-no-via.patch 913 RMD160 ae7f91a08e19c91738376befea3621c0c6ec3834 SHA1 cc20489e56084e216f44020865a56656c736918e SHA256 36f9cbed487d05b83fcf4a944b4d56039af1506f2f7a3e38fbb91775bb26bb4d
 AUX tinyproxy.initd 1068 RMD160 1a6ad426880ec112c61b85d2fc1816bebdffda9b SHA1 d4107fd238594046c3ef71839acc3a3d728f87c9 SHA256 dfcf5e4edca36408d9cc310dcc8d3fa5fe0e2bf1f9db5d6594b7b483a539f243
 DIST tinyproxy-1.6.3.tar.gz 467348 RMD160 a5503d03bdfe00fd232c643b518bd6c3e034dc33 SHA1 4f101f2a24d9b917fee03a65d27bdbbfc89f85f7 SHA256 cf4f2005fcd69f10087c598398c1a156d1827b9fb11c769ab6587b7b1ea4a2dc
@@ -9,6 +10,6 @@ DIST tinyproxy-1.8.2.tar.bz2 202931 RMD160 465776851a285e33fe75d1dcc54e5055fe7c3
 EBUILD tinyproxy-1.6.3-r1.ebuild 1310 RMD160 0ad910aa3ca1a30ab2f50af20408e345533046b0 SHA1 b65ccef8dda53e1b29bdcad4d6747aa2d82fa0d0 SHA256 2da4838d042065d196a76e99dfb8f4f1b60f33672dc1fd6d8c35da3591f6f2b3
 EBUILD tinyproxy-1.6.4.ebuild 1316 RMD160 386f61b41c487d5299dfee91ca4d4c2b069ac430 SHA1 d21007905aa8a9795aacf7a96ba3f7dbae2805c0 SHA256 d30e3cf0bbe9af70b92112346b2a88813709baf292292e054cfc47e52908af8b
 EBUILD tinyproxy-1.6.5.ebuild 1415 RMD160 ee8f9c854161dc4d79561e883d4d8149160d71e9 SHA1 6357621902b1486441f3d3d043c4418b9c566ae5 SHA256 73bd704ab0ce30e6c7e89aed3075409d3043c0e9b4d4013399cdaa650cdcd4a7
-EBUILD tinyproxy-1.8.2.ebuild 2059 RMD160 a2284a4195745c0af3f0aae64241662b511a7092 SHA1 458007c270b4d0e7082dc65e01814067ee67c729 SHA256 759452fca080c016640f2c1e76238488c9ae50624c93c7dc1d458e819062a21e
-MISC ChangeLog 5296 RMD160 884f4deca9ddad1b6f8ab5cc0cdf268ae11c54d8 SHA1 80b1b5aa46591408d6aed8df5dc12178bc8f4398 SHA256 1e4eb663ed14ee2418bcda765e6bdc3ac584060252ba3a588779a16141943da8
+EBUILD tinyproxy-1.8.2.ebuild 1934 RMD160 55924635485624a4345d01ae49a8efe339d46bc1 SHA1 ae6cd9790c67786be41159d891e0a29980b192bd SHA256 93bf09f8f81e09cdf839cac14859784513dfcc8a4f7807189bd36b8029aca31d
+MISC ChangeLog 5480 RMD160 d8951f90f5d8557497f9e42ac5400f7fa3b789e3 SHA1 6c7681e0a3a85483b57b65194e21ddc3f3ad702f SHA256 c6ae41faa9688d2c036c5b08397f898a4ed7ebed94b6f32c9b2732d4455874a4
 MISC metadata.xml 630 RMD160 76250d5d991441a1f924f5d30ef5dd3cc067ae2c SHA1 d4ae46a69e557cecc5cc6a718c3dfbd66d83afe2 SHA256 125f298a828e96a7d8be4387304188efe17746aa78b5baf5b6c0f60fbdedf616
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd
new file mode 100644
index 000000000000..96c658d20769
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd,v 1.1 2011/03/11 16:25:07 jer Exp $
+
+CONFFILE="/etc/${SVCNAME}.conf"
+
+depend() {
+	use logger dns
+	need net
+}
+
+checkconfig() {
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "Configuration file ${CONFFILE} not found!"
+		return 1
+	fi
+
+	PIDFILE=$(sed -n -e 's/^[[:space:]]*PidFile[[:space:]]\+"\(.*\)"[[:space:]]*$/\1/p' "${CONFFILE}")
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting tinyproxy"
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --start --pidfile "${PIDFILE}" --startas /usr/sbin/tinyproxy -- -c "${CONFFILE}"
+	else
+		start-stop-daemon --start --exec /usr/sbin/tinyproxy -- -c "${CONFFILE}"
+	fi
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping tinyproxy"
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --stop --pidfile "${PIDFILE}"
+	else
+		start-stop-daemon --stop --exec /usr/sbin/tinyproxy
+	fi
+	eend $?
+}
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild
index 20c427819817..006ef1ef8532 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild,v 1.4 2011/03/10 17:27:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.2.ebuild,v 1.5 2011/03/11 16:25:07 jer Exp $
 
 EAPI="2"
 
@@ -31,11 +31,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
 	use minimal && epatch "${FILESDIR}/${PN}-1.8.1-minimal.patch"
 	sed -i etc/${PN}.conf.in -e "s|nobody|${PN}|g" || die "sed failed"
-	sed \
-		-e "/CONFFILE/s:${PN}/::g" \
-		"${FILESDIR}/${PN}.initd" \
-		> "${WORKDIR}"/${PN}.initd \
-		|| die "sed failed"
 	eautoreconf
 }
 
@@ -72,7 +67,7 @@ src_install() {
 	keepdir /var/log/${PN}
 	keepdir /var/run/${PN}
 
-	newinitd "${WORKDIR}"/tinyproxy.initd tinyproxy
+	newinitd "${FILESDIR}"/${P}.initd tinyproxy
 }
 
 pkg_postinst() {