Remove old version. Version bump. Fix init script (#231005).

Package-Manager: portage-2.1.4.4

8 files changed, 42 insertions, 70 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 5727e6af4b49..93bd826b7f75 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/ziproxy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.17 2008/03/16 23:36:30 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.18 2008/07/08 19:07:08 mrness Exp $
+
+*ziproxy-2.5.2 (08 Jul 2008)
+
+  08 Jul 2008; Alin Năstac <mrness@gentoo.org> -files/ziproxy-2.4.confd,
+  -files/ziproxy-2.4.initd, -files/ziproxy-2.5.confd,
+  -files/ziproxy-2.5.initd, +files/ziproxy.confd, +files/ziproxy.initd,
+  -ziproxy-2.4.3.ebuild, ziproxy-2.5.1.ebuild, +ziproxy-2.5.2.ebuild:
+  Remove old version. Version bump. Fix init script (#231005).
 
   16 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org>
   -files/ziproxy-2.3.0.diff, -files/ziproxy-2.3.confd,
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index f497f0907230..36df27bc39b7 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,10 +1,18 @@
-AUX ziproxy-2.4.confd 642 RMD160 6b2c310ae58824753e9f951b225c8b508f776104 SHA1 23b75d0fc65b98e6aba28e2fb0ac4c2375edb62d SHA256 854b0e8211c05f85b1da1158bfc765f8dde30b35a9a31843db94cea47a927f14
-AUX ziproxy-2.4.initd 723 RMD160 95b44bd12bbe99ac37b097fd3a1b1ce8dc0a0653 SHA1 e7208a73c2900980fa7ecc30ee94b55ea619a128 SHA256 bbf2f9480319348494bb5586793bd09455d594622d36de90e2a1681f2732999e
-AUX ziproxy-2.5.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
-AUX ziproxy-2.5.initd 723 RMD160 2dfe9c4e3ac292df612c36c3913af317656d3382 SHA1 48927817d6dd30a3be95ca5d98f438c93c7f7eae SHA256 7d2dfac5728ebe3a3f53d5ace4ceeda9a15b8f774adbaad9a8b77ad4ccfb3984
-DIST ziproxy-2.4.3.tar.bz2 177422 RMD160 0f72b3e97181aef8406117068996ba04e03d2b90 SHA1 8fe578179b3b65003d671b435d8adb5d9dac2d54 SHA256 784cf1bc95190383af698719f505716f6bc66f8548011ac80460364d59231cfc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
+AUX ziproxy.initd 712 RMD160 0bbe38bcf3ebf15d65a09b4cb0903bb62c07ffaf SHA1 f8ec247947d855290eed593cb0605eeb73f3480c SHA256 b17d673d02eca6b1c327fa4078de6e0be0ce04b8c37e3113d32c673ce715e930
 DIST ziproxy-2.5.1.tar.bz2 211312 RMD160 5287d99738c0977fae0ba770bcd2b3788103e22d SHA1 edc3f4470b326351ff5dd7fe95af1308af2742e9 SHA256 0f4052e94911207aa1be293dcdddc82a0d11bbcf2a9473e4684ffdb356bca611
-EBUILD ziproxy-2.4.3.ebuild 2024 RMD160 05c2566318ad22c8473928be3f6b07476a10c975 SHA1 f8b945df557cec3d83caa0e4241c639fc972409e SHA256 3a2c247a70252018300558fe303d6411fb9213418e5571034f71a3fe7a226d1b
-EBUILD ziproxy-2.5.1.ebuild 1962 RMD160 e9337349a2a6dba513fe846b43dababef210f58d SHA1 555ff5bf96e7909ead667b1b96b3387d43a2b967 SHA256 4e90f07f92c4e2a5a61b818ba7af6275166d219f63ed0cedeefdd3bc54d6325d
-MISC ChangeLog 3076 RMD160 0911dcbcb36069761b146fe129f36a521628a811 SHA1 dea50a3a6b5f1dca3bdf7cc3493c3b02139b2122 SHA256 1b01455bb4cf27eb512377834fd8ef2028136ea6d48abe88b9401eba7f6f9510
+DIST ziproxy-2.5.2.tar.bz2 243994 RMD160 e72330d58e9b7c0120c44f4697b04d83f1fccf66 SHA1 86bf957ce77397b5047cd1eaa2783e82f3746302 SHA256 6651c41713ea7044804d4c8cccdbf22a5b0eda79d499938be4b67a335f606853
+EBUILD ziproxy-2.5.1.ebuild 1942 RMD160 85d3f373e7df687486d203babe331f70fd2f9b34 SHA1 65a646de6b1dfa0ee0fa0f14b4806f67aab58364 SHA256 d895d3864ad1f2638ecb59efbbf401700615714b11c4e716f40117b952f2dcc0
+EBUILD ziproxy-2.5.2.ebuild 1942 RMD160 156e99392f754a2f0dc5ca23cbc727b0605e8c03 SHA1 dd5f15e4205340af029eac39b0131ba27a0f5996 SHA256 496b531e71d9ff5409dc67c19e9054c21c91bcdfb4a37c7cadf02d6bf1d931e7
+MISC ChangeLog 3438 RMD160 c1033e49acb3f7a5ad833a7aa4d1df5054ac773e SHA1 988654ec6c460646efb2894cd736397a3d61dd37 SHA256 a815743e5a50a7ba1e53fdbd7679c1842471c41551e1550ad78a5aee78727097
 MISC metadata.xml 513 RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b SHA1 586129e96f59e881bc2297180771b2dd9e664ff0 SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhzuucACgkQPrHvTlXvhtt/YACeMZyWqhUV9G03CWGuWmtnHjW/
+0jsAoI5DQzB3iHYU6pg4Pv1X+7GO9ogQ
+=vHlK
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/files/ziproxy-2.4.confd b/net-proxy/ziproxy/files/ziproxy-2.4.confd
deleted file mode 100644
index 793b8c666739..000000000000
--- a/net-proxy/ziproxy/files/ziproxy-2.4.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# configuraton file for /etc/init.d/ziproxy
-#
-# you can symlink /etc/init.d/ziproxy to a different name
-# and then copy this config to a new file with the same name
-# as the symlinked init-script to run multiple instances of
-# ziproxy. You have to change the location for CONFIG then
-# of course... ;-)
-
-# Full path to ziproxy.conf file (instead of default one).
-#
-#CONFIG="/etc/ziproxy.conf"
-
-# Limit incoming connections only from the specified address(es).
-# This option has the same meaning, but higher precedence as
-# "OnlyFrom=" option in configuration file. Uncomment it
-# if you want to set it.
-#
-#ONLYFROM="<IP.address or hostname>"
diff --git a/net-proxy/ziproxy/files/ziproxy-2.4.initd b/net-proxy/ziproxy/files/ziproxy-2.4.initd
deleted file mode 100644
index 7d9cd0371ad2..000000000000
--- a/net-proxy/ziproxy/files/ziproxy-2.4.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy-2.4.initd,v 1.1 2007/11/18 02:08:16 sbriesen Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	local OPT="-d"
-	ebegin "Starting ${myservice}"
-
-	[ -n "${CONFIG}"   ] && OPT="${OPT} -c ${CONFIG}"
-	[ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
-
-	start-stop-daemon --quiet --start --pidfile /var/run/${myservice}.pid \
-		--chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${myservice}.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ziproxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/${myservice}.pid
-	eend $?
-}
diff --git a/net-proxy/ziproxy/files/ziproxy-2.5.confd b/net-proxy/ziproxy/files/ziproxy.confd
index 9a4a12137c6a..9a4a12137c6a 100644
--- a/net-proxy/ziproxy/files/ziproxy-2.5.confd
+++ b/net-proxy/ziproxy/files/ziproxy.confd
diff --git a/net-proxy/ziproxy/files/ziproxy-2.5.initd b/net-proxy/ziproxy/files/ziproxy.initd
index fd3424d7f09a..a4b04a831de5 100644
--- a/net-proxy/ziproxy/files/ziproxy-2.5.initd
+++ b/net-proxy/ziproxy/files/ziproxy.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy-2.5.initd,v 1.1 2008/03/16 23:34:41 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/files/ziproxy.initd,v 1.4 2008/07/08 19:07:09 mrness Exp $
 
 depend() {
 	need net
@@ -9,18 +9,18 @@ depend() {
 
 start() {
 	local OPT="-d"
-	ebegin "Starting ${myservice}"
+	ebegin "Starting ${SVCNAME}"
 
 	[ -n "${CONFIG}"   ] && OPT="${OPT} -c ${CONFIG}"
 	[ -n "${ONLYFROM}" ] && OPT="${OPT} -f ${ONLYFROM}"
 
-	start-stop-daemon --quiet --start --pidfile /var/run/${myservice}.pid \
-		--chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${myservice}.pid
+	start-stop-daemon --quiet --start --pidfile /var/run/${SVCNAME}.pid \
+		--chuid ziproxy:ziproxy --exec /usr/sbin/ziproxy -- ${OPT} > /var/run/${SVCNAME}.pid
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping ziproxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/${myservice}.pid
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
 	eend $?
 }
diff --git a/net-proxy/ziproxy/ziproxy-2.5.1.ebuild b/net-proxy/ziproxy/ziproxy-2.5.1.ebuild
index 439909e5f7c1..184bde14d8fe 100644
--- a/net-proxy/ziproxy/ziproxy-2.5.1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.1.ebuild,v 1.1 2008/03/16 23:34:41 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.1.ebuild,v 1.2 2008/07/08 19:07:08 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -59,8 +59,8 @@ src_install() {
 	newbin stats.awk ${PN}_stats.awk
 	dobin src/tools/ziproxy_genhtml_stats.sh
 
-	newinitd "${FILESDIR}/${PN}-${PV%.*}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-${PV%.*}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	dodoc ChangeLog CREDITS README README.tools
 	use jpeg2k && dodoc JPEG2000.txt
diff --git a/net-proxy/ziproxy/ziproxy-2.4.3.ebuild b/net-proxy/ziproxy/ziproxy-2.5.2.ebuild
index 29dc10e20b82..f354c95a27db 100644
--- a/net-proxy/ziproxy/ziproxy-2.4.3.ebuild
+++ b/net-proxy/ziproxy/ziproxy-2.5.2.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/ziproxy/ziproxy-2.4.3.ebuild,v 1.1 2007/12/30 13:17:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.5.2.ebuild,v 1.1 2008/07/08 19:07:08 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -34,8 +34,8 @@ src_unpack() {
 	cd "${S}"
 
 	# fix sample config file
-	sed -i -e "s:/usr/local/ziproxy/\(ziproxy.passwd\):/etc/\1:g" \
-		-e "s:/var/ziproxy/:/var/lib/ziproxy/:g" etc/ziproxy.conf
+	sed -i -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \
+		etc/ziproxy/ziproxy.conf
 
 	# fix sample xinetd config
 	sed -i -e "s:/usr/bin/:/usr/sbin/:g" \
@@ -44,7 +44,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--enable-shared-confuse --with-cfgfile=/etc/ziproxy.conf" # --enable-testprogs
+	local myconf="--with-cfgfile=/etc/ziproxy/ziproxy.conf"  # --enable-testprogs
 	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
 	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"
@@ -59,14 +59,14 @@ src_install() {
 	newbin stats.awk ${PN}_stats.awk
 	dobin src/tools/ziproxy_genhtml_stats.sh
 
-	newinitd "${FILESDIR}/${PN}-${PV%.*}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-${PV%.*}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	dodoc ChangeLog CREDITS README README.tools
 	use jpeg2k && dodoc JPEG2000.txt
 
 	insinto /etc
-	doins etc/ziproxy.conf
+	doins -r etc/ziproxy
 
 	insinto /var/lib/ziproxy/error
 	doins var/ziproxy/error/*.html