version bumped to the latest pre-release; fixes security bug #91303; add the init script

(Portage version: 2.0.51.19)

5 files changed, 145 insertions, 11 deletions

diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index 547af4352b1c..4a963d9def36 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/oops
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.2 2005/04/23 13:07:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.3 2005/05/03 22:33:25 mrness Exp $
+
+*oops-1.5.24_pre20050403 (03 May 2005)
+
+  03 May 2005; Alin Nastac <mrness@gentoo.org> +files/oops.initd,
+  +oops-1.5.24_pre20050403.ebuild:
+  Version bumped to current 1.5.24 pre-release. This version fixes security
+  bug #91303 and have an init script.
 
   22 Apr 2005; Alin Nastac <mrness@gentoo.org> :
   Rename category & herd www-proxy to net-proxy
diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest
index 0b1407c1b8ee..dbbb0eb71d53 100644
--- a/net-proxy/oops/Manifest
+++ b/net-proxy/oops/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 1a98812472cefea385fb7511b6738dbe oops-1.5.24_pre20050403.ebuild 2541
 MD5 87da90790696d24405dc065e8436c5ea ChangeLog 2269
 MD5 0bba18e763cee72e6af83a6bc6e1db87 metadata.xml 241
 MD5 a758be28bcc143af4341e9cc7bf12db8 oops-1.5.23.ebuild 2328
 MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
+MD5 fd0e4c5f9a7d97a3feccfcb741102dbb files/digest-oops-1.5.24_pre20050403 140
 MD5 5ecad9ef80ba71f386b700b68e68754e files/digest-oops-1.5.23 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCakivI1lqEGTUzyQRAkAsAKCPaVlCnsgKtiOJL9HKKJyF1mkIvgCgkOR1
-YEJ7Emue+wBMautqMmnx0Bo=
-=1ZeQ
------END PGP SIGNATURE-----
+MD5 a4898bffd3706ebe9964c2ae4e25aada files/oops.initd 519
diff --git a/net-proxy/oops/files/digest-oops-1.5.24_pre20050403 b/net-proxy/oops/files/digest-oops-1.5.24_pre20050403
new file mode 100644
index 000000000000..dd3afa9ce884
--- /dev/null
+++ b/net-proxy/oops/files/digest-oops-1.5.24_pre20050403
@@ -0,0 +1,2 @@
+MD5 bfa19752af517bb5a6cd746acf61064c oops-1.5.23.tar.gz 473290
+MD5 8fbd0e763338eba31949d2a20217707a oops-1.5.24_pre20050403.patch.gz 101103
diff --git a/net-proxy/oops/files/oops.initd b/net-proxy/oops/files/oops.initd
new file mode 100644
index 000000000000..6671bd754a57
--- /dev/null
+++ b/net-proxy/oops/files/oops.initd
@@ -0,0 +1,27 @@
+#!/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/oops/files/oops.initd,v 1.1 2005/05/03 22:33:25 mrness Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting oops"
+	/usr/sbin/oopsctl start &> /dev/null
+	eend $?
+}
+
+status() {
+	if service_started "${myservice}"; then
+		/usr/sbin/oopsctl stat
+	fi
+	return 0
+}
+
+stop() {
+	ebegin "Stopping oops"
+	/usr/sbin/oopsctl stop &> /dev/null
+	eend $?
+}
diff --git a/net-proxy/oops/oops-1.5.24_pre20050403.ebuild b/net-proxy/oops/oops-1.5.24_pre20050403.ebuild
new file mode 100644
index 000000000000..9d6d89844d52
--- /dev/null
+++ b/net-proxy/oops/oops-1.5.24_pre20050403.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050403.ebuild,v 1.1 2005/05/03 22:33:25 mrness Exp $
+
+inherit eutils
+
+MY_P="${PN}-1.5.23"
+
+DESCRIPTION="An advanced multithreaded caching web proxy"
+HOMEPAGE="http://zipper.paco.net/~igor/oops.eng/"
+SRC_URI="http://zipper.paco.net/~igor/oops/${MY_P}.tar.gz
+	mirror://gentoo/${P}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc"
+IUSE="mysql postgres"
+
+RDEPEND="virtual/libc
+	dev-libs/libpcre
+	>=sys-libs/db-3
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${WORKDIR}/${P}.patch
+	sed -i -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure
+	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
+}
+
+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 \
+		--enable-large-files \
+	|| 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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/oops.initd ${PN}
+	insinto /etc/oops
+	doins ${FILESDIR}/oops.cfg
+
+	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
+}
+