version bump; fix bugs #10047, #51247 and #58881

Package-Manager: portage-2.0.51-r15

4 files changed, 109 insertions, 9 deletions

diff --git a/www-proxy/oops/ChangeLog b/www-proxy/oops/ChangeLog
index d614dcc12b19..e0043689b308 100644
--- a/www-proxy/oops/ChangeLog
+++ b/www-proxy/oops/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-proxy/oops
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/oops/ChangeLog,v 1.3 2005/02/16 22:27:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/oops/ChangeLog,v 1.4 2005/02/24 13:21:15 mrness Exp $
+
+*oops-1.5.23 (24 Feb 2005)
+
+  24 Feb 2005; Alin Nastac <mrness@gentoo.org> +oops-1.5.23.ebuild:
+  Version bump. Fix bugs #10047, #51247 and #58881.
 
   17 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml:
   Add metadata.xml
diff --git a/www-proxy/oops/Manifest b/www-proxy/oops/Manifest
index 34ef272830fe..9ecad05ada7e 100644
--- a/www-proxy/oops/Manifest
+++ b/www-proxy/oops/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f3d8865d025ffbe6792efee8a8f28c4 oops-1.5.6.ebuild 2310
-MD5 5ca8283d1f96f4c7891f2374d980c247 oops-1.5.22.ebuild 2666
-MD5 599263cc1fece6fbe8e1347a06c906a6 ChangeLog 1663
+MD5 0e579764551461fc264096e9bcd1a70c ChangeLog 1812
 MD5 3d771b47134c8b4b82cd0bdabe3d5d27 metadata.xml 241
-MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
-MD5 261405b1b49b3bded20e300755773d8b files/digest-oops-1.5.6 62
+MD5 5ca8283d1f96f4c7891f2374d980c247 oops-1.5.22.ebuild 2666
+MD5 1f3d8865d025ffbe6792efee8a8f28c4 oops-1.5.6.ebuild 2310
+MD5 bcfb4839ca23c57e73fd955d45f70677 oops-1.5.23.ebuild 2256
 MD5 a9957cc3d73892c636b0c45ed7b84ee2 files/digest-oops-1.5.22 63
+MD5 261405b1b49b3bded20e300755773d8b files/digest-oops-1.5.6 62
+MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
+MD5 5ecad9ef80ba71f386b700b68e68754e files/digest-oops-1.5.23 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCE8j2jiC39V7gKu0RAnbOAJ0XpsEOi2PTb6p8Dpx3E0VMxTlNewCg0ef1
-OM8cND2melJUNP4f0rftIQo=
-=uwej
+iD8DBQFCHdTdjiC39V7gKu0RAqRGAJ9ZDqQLMS111hTNYvE56sMXXdocYQCgkS1J
+ypsnzHZPmpXx/KIVdYLTsxw=
+=Sm+S
 -----END PGP SIGNATURE-----
diff --git a/www-proxy/oops/files/digest-oops-1.5.23 b/www-proxy/oops/files/digest-oops-1.5.23
new file mode 100644
index 000000000000..fd9e7dcf9fcf
--- /dev/null
+++ b/www-proxy/oops/files/digest-oops-1.5.23
@@ -0,0 +1 @@
+MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
diff --git a/www-proxy/oops/oops-1.5.23.ebuild b/www-proxy/oops/oops-1.5.23.ebuild
new file mode 100644
index 000000000000..91485c577bf9
--- /dev/null
+++ b/www-proxy/oops/oops-1.5.23.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/oops/oops-1.5.23.ebuild,v 1.1 2005/02/24 13:21:15 mrness Exp $
+
+DESCRIPTION="An advanced multithreaded caching web proxy"
+HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
+SRC_URI="http://zipper.paco.net/~igor/oops/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	cp configure configure.orig
+	sed -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure.orig > configure
+	cd ${S}/src/modules
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib/oops \
+		--enable-oops-user=squid \
+		--sysconfdir=/etc/oops \
+		--sbindir=/usr/sbin \
+		--with-regexp=pcre \
+		--localstatedir=/var/run/oops \
+	|| die "configure problem"
+
+	cd src
+	mv config.h.in config.h.in.orig
+	sed <config.h.in.orig >config.h.in \
+		-e '/STRERROR_R/d'
+	mv Makefile Makefile.orig
+	sed <Makefile.orig >Makefile \
+		-e "s|OOPS_LIBDIR = /usr/lib/oops|OOPS_LIBDIR = ${D}/usr/lib/oops|" \
+		-e "s|OOPS_SBINDIR = /usr/sbin|OOPS_SBINDIR = ${D}/usr/sbin|" \
+		-e "s|OOPS_SYSCONFDIR = /etc/oops|OOPS_SYSCONFDIR = ${D}/etc/oops|" \
+		-e "s|OOPS_LOCALSTATEDIR = /var/run/oops|OOPS_LOCALSTATEDIR = ${D}/var/run/oops|" \
+		-e "s|OOPSPATH=/usr/oops|OOPSPATH=${D}/usr/oops|"
+	cd ..
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/sbin
+	chown squid:squid ${D}
+	einstall || die "install problem"
+	#chmod -R g+srw ${D}/etc/oops Remove this if proved to work without it
+
+	insinto /etc/oops
+	doins ${FILESDIR}/oops.cfg
+	cd ${D}
+
+	diropts -m0755 -o squid
+	dodir /var/run/oops
+	diropts -m0770 -o squid
+	dodir /var/log/oops
+	dodir /var/lib/oops
+	dodir /var/lib/oops/storage
+	keepdir /var/lib/oops/storage
+	dodir /var/lib/oops/db
+	keepdir /var/lib/oops/db
+
+	# cleanups
+	rm -rf ${D}/usr/oops
+	rm -rf ${D}/usr/lib/oops/modules
+
+	# config files; if already exist, move them to *.eg
+	cd ${D}/etc/oops
+	local x y
+	for y in . tables ; do
+		for x in ${y}/* ; do
+			if [ -f ${x} ] ; then
+				if [ -f ${ROOT}/etc/oops/${x} ]; then
+					mv ${x} ${x}.eg
+				else
+					cp ${x} ${x}.eg
+				fi
+			fi
+		done
+	done
+}
+