Improve init script (#209115).

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index 96c9e99245361c3cf284eed8f804f8fae1c46df5..bdc4cde080e337042b86d2dcbbc46540cb459e23 100644 (file)
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tinyproxy
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.9 2007/04/28 16:51:44 swegener Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.10 2008/02/16 07:11:25 mrness Exp $
+
+*tinyproxy-1.6.3-r1 (16 Feb 2008)
+
+  16 Feb 2008; Alin Năstac <mrness@gentoo.org> +files/tinyproxy.initd,
+  -files/tinyproxy.rc, -tinyproxy-1.6.3.ebuild, +tinyproxy-1.6.3-r1.ebuild:
+  Improve init script (#209115).
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> tinyproxy-1.6.3.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)

diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index a198de133ec1edd9fc509d1c26f3da4a8c6183d9..ea106fb4fabfb537f8275212fdf53d6ae95bab34 100644 (file)
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,5 +1,30 @@
-AUX tinyproxy.rc 552 RMD160 e6407fab8e513184e6848322da3822c456d10a79 SHA1 98a00dfb7900df20d3eae1818ea05690174c09a5 SHA256 7f9b9cc95fcadcc64d9b8cb1fcbe88fb529a9b0c03ae41a308ed7dc75564b103
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tinyproxy.initd 1068 RMD160 1a6ad426880ec112c61b85d2fc1816bebdffda9b SHA1 d4107fd238594046c3ef71839acc3a3d728f87c9 SHA256 dfcf5e4edca36408d9cc310dcc8d3fa5fe0e2bf1f9db5d6594b7b483a539f243
+MD5 554da6fc363fbe251f081b342541bef4 files/tinyproxy.initd 1068
+RMD160 1a6ad426880ec112c61b85d2fc1816bebdffda9b files/tinyproxy.initd 1068
+SHA256 dfcf5e4edca36408d9cc310dcc8d3fa5fe0e2bf1f9db5d6594b7b483a539f243 files/tinyproxy.initd 1068
 DIST tinyproxy-1.6.3.tar.gz 467348 RMD160 a5503d03bdfe00fd232c643b518bd6c3e034dc33 SHA1 4f101f2a24d9b917fee03a65d27bdbbfc89f85f7 SHA256 cf4f2005fcd69f10087c598398c1a156d1827b9fb11c769ab6587b7b1ea4a2dc
-EBUILD tinyproxy-1.6.3.ebuild 1306 RMD160 db5ef5206437d376db9ee378b07a81db66277dde SHA1 a96f1c0cada6d14f4ea85ff46cc9fabe67c6b0b5 SHA256 0b0374d37a01323fc0ffc8bf420a5c99af9ab8847f06eaf0f31173f1e7a0f733
-MISC ChangeLog 2791 RMD160 7c5764c899855de61639ad67dee8ef48ee2a4c84 SHA1 9277f4cb5728b4d5978fdc25c8c4316cd1d9b15c SHA256 f2994f8fb1c30414fd23f4a59423ee5d20d2f268a0a2ae3f999e00d0e2839337
+EBUILD tinyproxy-1.6.3-r1.ebuild 1310 RMD160 0ad910aa3ca1a30ab2f50af20408e345533046b0 SHA1 b65ccef8dda53e1b29bdcad4d6747aa2d82fa0d0 SHA256 2da4838d042065d196a76e99dfb8f4f1b60f33672dc1fd6d8c35da3591f6f2b3
+MD5 392aa4282855817275155b7eecbb0745 tinyproxy-1.6.3-r1.ebuild 1310
+RMD160 0ad910aa3ca1a30ab2f50af20408e345533046b0 tinyproxy-1.6.3-r1.ebuild 1310
+SHA256 2da4838d042065d196a76e99dfb8f4f1b60f33672dc1fd6d8c35da3591f6f2b3 tinyproxy-1.6.3-r1.ebuild 1310
+MISC ChangeLog 3007 RMD160 a3aa4de453fdb8a47759f045f22b0b27f3d3a643 SHA1 7ceb507c6393955777fe03e75cd1de4f6cf404b1 SHA256 18015b55fd6ce40aa02389e0945380d57310d8fdab0dced7d98a774edc816fea
+MD5 9dd9c1aa0c8259fe2b9c5de9ebabb641 ChangeLog 3007
+RMD160 a3aa4de453fdb8a47759f045f22b0b27f3d3a643 ChangeLog 3007
+SHA256 18015b55fd6ce40aa02389e0945380d57310d8fdab0dced7d98a774edc816fea ChangeLog 3007
 MISC metadata.xml 226 RMD160 6061c2eb2d342615f481e93c6aaf462027c82dd9 SHA1 50d4c7288dbc354fdd5653b67fae689c8aefc0e8 SHA256 b6ae71e43bb0a81ab9214e02ef7702cdd4cbd37faa204575e83c0ca51f723842
+MD5 9cafc01ae2d4a91da29afd4613e9683f metadata.xml 226
+RMD160 6061c2eb2d342615f481e93c6aaf462027c82dd9 metadata.xml 226
+SHA256 b6ae71e43bb0a81ab9214e02ef7702cdd4cbd37faa204575e83c0ca51f723842 metadata.xml 226
+MD5 1f4ac9a26e128f693392ac594340f765 files/digest-tinyproxy-1.6.3-r1 247
+RMD160 de8055d7b95101c2a583bc1f2cd544c798cbfbfb files/digest-tinyproxy-1.6.3-r1 247
+SHA256 ab493d7e1310d5e57099f0949b1447b6e721adec1ddd48faa3cfb6bc9881a477 files/digest-tinyproxy-1.6.3-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke2jKcACgkQ+fWpoTWIA9H1zQCfbkJPb+D2LCBtCneEBkLWEa1M
+hk4An2+6f/jWZI5FejM9cE8u2lCxaDfD
+=K8mO
+-----END PGP SIGNATURE-----

diff --git a/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3-r1 b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3-r1
new file mode 100644 (file)
index 0000000..3bf72ce
--- /dev/null
+++ b/net-proxy/tinyproxy/files/digest-tinyproxy-1.6.3-r1
@@ -0,0 +1,3 @@
+MD5 bd14d029b12621bcfd7ee71b2f4893da tinyproxy-1.6.3.tar.gz 467348
+RMD160 a5503d03bdfe00fd232c643b518bd6c3e034dc33 tinyproxy-1.6.3.tar.gz 467348
+SHA256 cf4f2005fcd69f10087c598398c1a156d1827b9fb11c769ab6587b7b1ea4a2dc tinyproxy-1.6.3.tar.gz 467348

diff --git a/net-proxy/tinyproxy/files/tinyproxy.initd b/net-proxy/tinyproxy/files/tinyproxy.initd
new file mode 100644 (file)
index 0000000..bee5d04
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy.initd
@@ -0,0 +1,45 @@
+#!/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/tinyproxy/files/tinyproxy.initd,v 1.1 2008/02/16 07:11:25 mrness Exp $
+
+CONFFILE="/etc/tinyproxy/${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/files/tinyproxy.rc b/net-proxy/tinyproxy/files/tinyproxy.rc
deleted file mode 100755 (executable)
index 83aa85c..0000000
--- a/net-proxy/tinyproxy/files/tinyproxy.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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/tinyproxy/files/tinyproxy.rc,v 1.1 2005/04/22 19:15:12 mrness Exp $
-
-depend() {
-       use logger dns
-       need net
-}
-
-start() {
-       ebegin "Starting tinyproxy"
-       /usr/sbin/tinyproxy
-       eend $?
-}
-
-stop() {
-       local pid=0
-       if [ -f /var/run/tinyproxy.pid ] ; then
-               pid=$(</var/run/tinyproxy.pid)
-               rm /var/run/tinyproxy.pid
-       fi
-       ebegin "Stopping tinyproxy"
-       [ ${pid} -ne 0 ] && kill ${pid}
-       eend $?
-}

diff --git a/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild b/net-proxy/tinyproxy/tinyproxy-1.6.3-r1.ebuild
similarity index 88%
rename from net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild
rename to net-proxy/tinyproxy/tinyproxy-1.6.3-r1.ebuild
index cd0f56b52d2df6b8af01d47862946f3ae6b780db..2879c3c7f95b7933ada80c95bbf6b392f1f5826c 100644 (file)
--- a/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild,v 1.9 2007/04/28 16:51:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.3-r1.ebuild,v 1.1 2008/02/16 07:11:25 mrness Exp $
 
 DESCRIPTION="A lightweight HTTP/SSL proxy"
 HOMEPAGE="http://tinyproxy.sourceforge.net/"
@@ -36,7 +36,7 @@ src_install() {
        dodoc AUTHORS ChangeLog NEWS README TODO
        mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html"
 
-       newinitd "${FILESDIR}/tinyproxy.rc" tinyproxy
+       newinitd "${FILESDIR}/tinyproxy.initd" tinyproxy
 }
 
 pkg_postinst() {