Set PIDFILE and CONFFILE init script parameters to values based on service name (#199031).

Package-Manager: portage-2.1.3.16

3 files changed, 28 insertions, 17 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index a2cfad4a8004..9d504e77f957 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.26 2007/11/04 08:20:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.27 2007/11/14 05:14:55 mrness Exp $
+
+  14 Nov 2007; Alin Năstac <mrness@gentoo.org> files/privoxy.initd:
+  Set PIDFILE and CONFFILE init script parameters to values based on service
+  name (#199031).
 
   04 Nov 2007; Alin Năstac <mrness@gentoo.org> privoxy-3.0.6.ebuild:
   Remove useless pkg_preinst function.
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index be8ee0c7a961..fef2c0766a92 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -5,10 +5,10 @@ AUX privoxy-3.0.6-implicit-decl.patch 391 RMD160 e3273410a60598f3df9e35a844a2e2a
 MD5 ce362ff76055d9f4244f10b01f96cd2e files/privoxy-3.0.6-implicit-decl.patch 391
 RMD160 e3273410a60598f3df9e35a844a2e2aa3cc16760 files/privoxy-3.0.6-implicit-decl.patch 391
 SHA256 e2c228118aa5debd505c54699d22025336a280d0e4cd4239cf457b3aa592fbea files/privoxy-3.0.6-implicit-decl.patch 391
-AUX privoxy.initd 581 RMD160 efd70ec873f628bf5de8852d6cd82d2ea4190938 SHA1 eef9349a596011fcdb381184faf61c73f1ab3dfb SHA256 c5b41e8e067df6a34d67704a17185c15a4c155dd4b1bf2cfe1aa939bcc97a61a
-MD5 d4c1eb95abff06816f51840d8f98abb9 files/privoxy.initd 581
-RMD160 efd70ec873f628bf5de8852d6cd82d2ea4190938 files/privoxy.initd 581
-SHA256 c5b41e8e067df6a34d67704a17185c15a4c155dd4b1bf2cfe1aa939bcc97a61a files/privoxy.initd 581
+AUX privoxy.initd 745 RMD160 42a6a3399293098eaa6d00d8aa5974ecaa66ae89 SHA1 edcc340c1751d3f3193b138cc2ce1cacf49b4b89 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9
+MD5 030be12bb56e87daed2a86c56181c0f6 files/privoxy.initd 745
+RMD160 42a6a3399293098eaa6d00d8aa5974ecaa66ae89 files/privoxy.initd 745
+SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9 files/privoxy.initd 745
 AUX privoxy.logrotate 191 RMD160 0619507db8b0ad5bdd3d0a390807e52da4afca3f SHA1 78e91faf72b5541cb98467b99f5be1d93fff014c SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e
 MD5 f2b6a652dbfbc65e5b89024a8ea3da7e files/privoxy.logrotate 191
 RMD160 0619507db8b0ad5bdd3d0a390807e52da4afca3f files/privoxy.logrotate 191
@@ -18,10 +18,10 @@ EBUILD privoxy-3.0.6.ebuild 2015 RMD160 a7cbe2594ad12c03d46ea09af8a18148eedde679
 MD5 36c619ae5c3b7cf6379c97ce93789d7a privoxy-3.0.6.ebuild 2015
 RMD160 a7cbe2594ad12c03d46ea09af8a18148eedde679 privoxy-3.0.6.ebuild 2015
 SHA256 835c3d5706e69f3a55970966364937356a8cf7cd3951c4bd11a71df3e2aae7cd privoxy-3.0.6.ebuild 2015
-MISC ChangeLog 8418 RMD160 cec539e111c2fe8893a07c22f0ad03694ce42b39 SHA1 b599f037e0713b4fca86cd65d749a11c4b3f0a42 SHA256 65476ae51797e60c4fa6c0e8538b83cd49a65fc2ece1bae7fa1dba815cee662a
-MD5 6a1d987ec25e3a1a58a1160d795a7275 ChangeLog 8418
-RMD160 cec539e111c2fe8893a07c22f0ad03694ce42b39 ChangeLog 8418
-SHA256 65476ae51797e60c4fa6c0e8538b83cd49a65fc2ece1bae7fa1dba815cee662a ChangeLog 8418
+MISC ChangeLog 8583 RMD160 74fa44ed72227b9b1cc5759097a0bc4a7535c93b SHA1 d48743403fdc3c1c318fe7f691d0e18383ad70e5 SHA256 6514bd52342f8fc53c9ad6d82942b42faaaea54068de950c514134dd2ed16743
+MD5 d0e9a1321ace8510108a5c10b9365664 ChangeLog 8583
+RMD160 74fa44ed72227b9b1cc5759097a0bc4a7535c93b ChangeLog 8583
+SHA256 6514bd52342f8fc53c9ad6d82942b42faaaea54068de950c514134dd2ed16743 ChangeLog 8583
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
 MD5 a31f52e5785898edac47ca00310413e2 metadata.xml 291
 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b metadata.xml 291
@@ -32,7 +32,7 @@ SHA256 03090ded4e9c8d64974a571589d572916d16c7e0436ec50f2df3d4f7b5d6a5fb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLYDpVSA5X31g7/gRAoxAAJ9xKensHbSWRP/pI0QQz171+hy9eQCeOw0K
-FItp8OxAxjF6QBX/OMpzDuk=
-=1Pux
+iD4DBQFHOoRYVSA5X31g7/gRAuUEAJYifFK8kjg19zlzqxB3q01HFwj2AKCFBjnu
+o8UWRA1/F0yN8MXH955FPw==
+=khpJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy.initd b/net-proxy/privoxy/files/privoxy.initd
index 279a1f1abbbb..84d6186d981d 100644
--- a/net-proxy/privoxy/files/privoxy.initd
+++ b/net-proxy/privoxy/files/privoxy.initd
@@ -1,22 +1,29 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy.initd,v 1.1 2007/06/17 07:06:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy.initd,v 1.2 2007/11/14 05:14:56 mrness Exp $
+
+CONFFILE=/etc/${SVCNAME}/config
+PIDFILE=/var/run/${SVCNAME}.pid
 
 depend() {
 	need net
 }
 
 start() {
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "Configuration file ${CONFFILE} not found!"
+		return 1
+	fi
+
 	ebegin "Starting privoxy"
-	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- \
-		--pidfile /var/run/privoxy.pid \
-		--user privoxy.privoxy  /etc/privoxy/config 2>/dev/null
+	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy --pidfile "${PIDFILE}" \
+		-- --pidfile "${PIDFILE}" --user privoxy.privoxy "${CONFFILE}" #2>/dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping privoxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/privoxy.pid
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
 	eend $?
 }