version bump.

Package-Manager: portage-2.1.3.11

7 files changed, 185 insertions, 5 deletions

diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 56510beaa85e..87440498aac1 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/ziproxy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.10 2007/06/17 16:22:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.11 2007/10/05 23:08:23 sbriesen Exp $
+
+*ziproxy-2.3.0 (05 Oct 2007)
+
+  05 Oct 2007; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/ziproxy-2.3.0.diff, +files/ziproxy-2.3.confd,
+  +files/ziproxy-2.3.initd, +ziproxy-2.3.0.ebuild:
+  version bump.
 
   17 Jun 2007; Alin Năstac <mrness@gentoo.org> -files/ziproxy-2.1.confd,
   -files/ziproxy-2.1.initd, -ziproxy-2.1.1.ebuild:
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 8db4b10a2864..979e930c6618 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -6,15 +6,32 @@ AUX ziproxy-2.2.initd 723 RMD160 ca3f6c069d1f4ca38de7b9c1345327f0d3369f92 SHA1 e
 MD5 14794641fee7dd992c3194e8b97afbe6 files/ziproxy-2.2.initd 723
 RMD160 ca3f6c069d1f4ca38de7b9c1345327f0d3369f92 files/ziproxy-2.2.initd 723
 SHA256 e5fd4c20e7c50aaa76369500107e85c2dc8cb7d9693e341b74eb760fcfd5004b files/ziproxy-2.2.initd 723
+AUX ziproxy-2.3.0.diff 764 RMD160 65f87344a1d11b9139ae699752d2e35b73619e45 SHA1 d743fea3209b4037d17b914a029eb9b52a2e677c SHA256 ab6d452fa6b5e2c89ba4aed45800a56efa54813a714a889251d0fd3330f1e1bc
+MD5 91178f0662729489f9c165a7eecbc51e files/ziproxy-2.3.0.diff 764
+RMD160 65f87344a1d11b9139ae699752d2e35b73619e45 files/ziproxy-2.3.0.diff 764
+SHA256 ab6d452fa6b5e2c89ba4aed45800a56efa54813a714a889251d0fd3330f1e1bc files/ziproxy-2.3.0.diff 764
+AUX ziproxy-2.3.confd 642 RMD160 6b2c310ae58824753e9f951b225c8b508f776104 SHA1 23b75d0fc65b98e6aba28e2fb0ac4c2375edb62d SHA256 854b0e8211c05f85b1da1158bfc765f8dde30b35a9a31843db94cea47a927f14
+MD5 ce7e5a5668c4bdbd2da22d9b28228336 files/ziproxy-2.3.confd 642
+RMD160 6b2c310ae58824753e9f951b225c8b508f776104 files/ziproxy-2.3.confd 642
+SHA256 854b0e8211c05f85b1da1158bfc765f8dde30b35a9a31843db94cea47a927f14 files/ziproxy-2.3.confd 642
+AUX ziproxy-2.3.initd 723 RMD160 68a9bc6e6a938d7d6181edc3b95a3289d75fc6f1 SHA1 241bd77898065beb13814878ce8df7a768988dc1 SHA256 726c038cceb88e0483cbe8af94eef89b25f3f54cdef86efba82b289bc792e963
+MD5 0706e09705c9cb7689c9933191480896 files/ziproxy-2.3.initd 723
+RMD160 68a9bc6e6a938d7d6181edc3b95a3289d75fc6f1 files/ziproxy-2.3.initd 723
+SHA256 726c038cceb88e0483cbe8af94eef89b25f3f54cdef86efba82b289bc792e963 files/ziproxy-2.3.initd 723
 DIST ziproxy-2.2.2.tar.bz2 145733 RMD160 10442335f5cf64e8205c93a707dd3e9ab233b6b6 SHA1 7efd9d83fb3fff5e2de3f3853889cb2d75ac3b56 SHA256 6fbf4134e84311d4590f907b37b5ae2ee0af5dc5d8fc6457edf4129635dc7bb9
+DIST ziproxy-2.3.0.tar.bz2 152058 RMD160 934598381ea78c6fed9e6ca696e04eda285622b5 SHA1 01ecd97ef08101c31b4e5bb59445f5a7eead92d4 SHA256 e69e179304498e0c4dcaf19dd2b4dd3be76ad9a09c68fe58c4004780a8598894
 EBUILD ziproxy-2.2.2.ebuild 2023 RMD160 3a9ef7a0911ba4aa9317ab632faf45d7c6c6ea4b SHA1 a44fdcfc6127347aa0803c7b0545d996b5203173 SHA256 12be91523b36c86d930553ca0d6686d6c8831fc09c1df9cd4679acd6a02893ec
 MD5 52d155d56c02f89b03b5962f3302b202 ziproxy-2.2.2.ebuild 2023
 RMD160 3a9ef7a0911ba4aa9317ab632faf45d7c6c6ea4b ziproxy-2.2.2.ebuild 2023
 SHA256 12be91523b36c86d930553ca0d6686d6c8831fc09c1df9cd4679acd6a02893ec ziproxy-2.2.2.ebuild 2023
-MISC ChangeLog 1891 RMD160 6e9b4bffde7294da7c096337e7f3c08de8a25006 SHA1 86e98b5bc914af58dff4a17cc7f8ab4b3f1a6f7b SHA256 439a3b87c911981678dec60a519bdd943bfd1772d8e7161d3ab1906d5bdc3fe7
-MD5 d00d45d81f7dcbdb4a24dd19cefce77e ChangeLog 1891
-RMD160 6e9b4bffde7294da7c096337e7f3c08de8a25006 ChangeLog 1891
-SHA256 439a3b87c911981678dec60a519bdd943bfd1772d8e7161d3ab1906d5bdc3fe7 ChangeLog 1891
+EBUILD ziproxy-2.3.0.ebuild 2084 RMD160 3687e8673f72913ed0a1ed241c741335e3858418 SHA1 774bc682ba16770a9fa20f634f122894886a8d54 SHA256 8f85de280cfc69e2d5132702c959a2cba28f241e86928a3b23b4ff9f490d6975
+MD5 012963b4eab1eeb072cbdae89296c1fd ziproxy-2.3.0.ebuild 2084
+RMD160 3687e8673f72913ed0a1ed241c741335e3858418 ziproxy-2.3.0.ebuild 2084
+SHA256 8f85de280cfc69e2d5132702c959a2cba28f241e86928a3b23b4ff9f490d6975 ziproxy-2.3.0.ebuild 2084
+MISC ChangeLog 2101 RMD160 6bb2d35ed096df42339388e20aa31477d688db29 SHA1 24ceac2445d787f2f706471ded8724cb6eff8a5b SHA256 f3e6603049f7d46e015f3f9e5899c5272887cd02d7d949b2949b8e92b9225c96
+MD5 704ffb4af5db0cfa91cd3c0e0930c421 ChangeLog 2101
+RMD160 6bb2d35ed096df42339388e20aa31477d688db29 ChangeLog 2101
+SHA256 f3e6603049f7d46e015f3f9e5899c5272887cd02d7d949b2949b8e92b9225c96 ChangeLog 2101
 MISC metadata.xml 513 RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b SHA1 586129e96f59e881bc2297180771b2dd9e664ff0 SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc
 MD5 13eac033f7cb4d69bd27489ab828449a metadata.xml 513
 RMD160 b107d66a1ba20b230598d2602f851dfbb8ba455b metadata.xml 513
@@ -22,3 +39,6 @@ SHA256 07e6b452bd4451e9bdc7269eb44d61efe0945afbcd9757ce7ae707021e0335bc metadata
 MD5 1fe50695d1de6579854e5d1bd463cf05 files/digest-ziproxy-2.2.2 244
 RMD160 ee7d1fd06f94febfc2758610f25b5f55e1806772 files/digest-ziproxy-2.2.2 244
 SHA256 7e0ef2f897378bc108c8b465f6ae6e28f2f341227b60b4a9d7dd51b44b4e8c4f files/digest-ziproxy-2.2.2 244
+MD5 ff78890051d239798d38bf3e5cbe57c1 files/digest-ziproxy-2.3.0 244
+RMD160 a1bcb8f1f057fcc0120c76ceb166cac06616ba3c files/digest-ziproxy-2.3.0 244
+SHA256 2509bc36ad18d2ecef6bdd943c1453530fc1ac2f862ae0fd83afc4f6e59bcf19 files/digest-ziproxy-2.3.0 244
diff --git a/net-proxy/ziproxy/files/digest-ziproxy-2.3.0 b/net-proxy/ziproxy/files/digest-ziproxy-2.3.0
new file mode 100644
index 000000000000..6a5280e35209
--- /dev/null
+++ b/net-proxy/ziproxy/files/digest-ziproxy-2.3.0
@@ -0,0 +1,3 @@
+MD5 2733c117e819c5000d898456388922ba ziproxy-2.3.0.tar.bz2 152058
+RMD160 934598381ea78c6fed9e6ca696e04eda285622b5 ziproxy-2.3.0.tar.bz2 152058
+SHA256 e69e179304498e0c4dcaf19dd2b4dd3be76ad9a09c68fe58c4004780a8598894 ziproxy-2.3.0.tar.bz2 152058
diff --git a/net-proxy/ziproxy/files/ziproxy-2.3.0.diff b/net-proxy/ziproxy/files/ziproxy-2.3.0.diff
new file mode 100644
index 000000000000..42c636b33854
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.3.0.diff
@@ -0,0 +1,22 @@
+diff -Naur ziproxy-2.3.0.orig/src/log.c ziproxy-2.3.0/src/log.c
+--- ziproxy-2.3.0.orig/src/log.c	2006-05-17 05:25:18.000000000 +0200
++++ ziproxy-2.3.0/src/log.c	2007-10-06 00:04:06.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include <stdarg.h>
+ #include <time.h>
+ #include <sys/time.h>
++#include <string.h>
+ #include "cfgfile.h"
+ #include "http.h"
+ 
+diff -Naur ziproxy-2.3.0.orig/src/tools/ziproxylogtool.c ziproxy-2.3.0/src/tools/ziproxylogtool.c
+--- ziproxy-2.3.0.orig/src/tools/ziproxylogtool.c	2007-05-09 03:34:34.000000000 +0200
++++ ziproxy-2.3.0/src/tools/ziproxylogtool.c	2007-10-06 00:03:30.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ #define LINE_BUFFER 4096
+ #define HOSTNAME_BUFFER 256
diff --git a/net-proxy/ziproxy/files/ziproxy-2.3.confd b/net-proxy/ziproxy/files/ziproxy-2.3.confd
new file mode 100644
index 000000000000..793b8c666739
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.3.confd
@@ -0,0 +1,18 @@
+# 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.3.initd b/net-proxy/ziproxy/files/ziproxy-2.3.initd
new file mode 100644
index 000000000000..122fe9eafd5d
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-2.3.initd
@@ -0,0 +1,26 @@
+#!/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.3.initd,v 1.1 2007/10/05 23:08:24 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/ziproxy-2.3.0.ebuild b/net-proxy/ziproxy/ziproxy-2.3.0.ebuild
new file mode 100644
index 000000000000..99d4d78612b6
--- /dev/null
+++ b/net-proxy/ziproxy/ziproxy-2.3.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.3.0.ebuild,v 1.1 2007/10/05 23:08:23 sbriesen Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils
+
+DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
+HOMEPAGE="http://ziproxy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="jpeg2k xinetd"
+
+DEPEND="dev-libs/confuse
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/jpeg
+	sys-libs/zlib
+	jpeg2k? ( media-libs/jasper )
+	xinetd? ( virtual/inetd )"
+
+pkg_setup() {
+	enewgroup ziproxy
+	enewuser ziproxy -1 -1 -1 ziproxy
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix some compile warnings
+	epatch "${FILESDIR}/${P}.diff"
+
+	# 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
+
+	# fix sample xinetd config
+	sed -i -e "s:/usr/bin/:/usr/sbin/:g" \
+		-e "s:\(.*port.*\):\1\n\ttype\t\t\t= UNLISTED:g" \
+		-e "s:root:ziproxy:g" etc/xinetd.d/ziproxy
+}
+
+src_compile() {
+	local myconf="--enable-shared-confuse --with-cfgfile=/etc/ziproxy.conf" # --enable-testprogs
+	use jpeg2k && myconf="${myconf} --with-jasper"  # use_with doesn't work
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodir /usr/sbin
+	mv -f "${D}usr/bin/ziproxy" "${D}usr/sbin/ziproxy"
+
+	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}
+
+	dodoc ChangeLog CREDITS README README.tools
+	use jpeg2k && dodoc JPEG2000.txt
+
+	insinto /etc
+	doins etc/ziproxy.conf
+
+	insinto /var/lib/ziproxy/error
+	doins var/ziproxy/error/*.html
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins etc/xinetd.d/ziproxy
+	fi
+
+	diropts -m0750 -o ziproxy -g ziproxy
+	keepdir /var/log/ziproxy
+}