Migrate to EAPI 2. Set file permissions on rotating logs (#275919).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 124 insertions, 7 deletions

diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index 3a0793e8884a..59e96b4dbd6a 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/oops
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.21 2008/12/14 14:52:13 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.22 2009/07/12 10:57:25 mrness Exp $
+
+*oops-1.5.24_pre20050503-r4 (12 Jul 2009)
+
+  12 Jul 2009; Alin Năstac <mrness@gentoo.org> +files/rotate-logs.patch,
+  +oops-1.5.24_pre20050503-r4.ebuild:
+  Migrate to EAPI 2. Set file permissions on rotating logs (#275919).
 
 *oops-1.5.24_pre20050503-r3 (14 Dec 2008)
 
diff --git a/net-proxy/oops/Manifest b/net-proxy/oops/Manifest
index e3ec04b1bdc4..f545549f8218 100644
--- a/net-proxy/oops/Manifest
+++ b/net-proxy/oops/Manifest
@@ -8,16 +8,18 @@ AUX oops-1.5.24-pthread-rwlock.patch 1035 RMD160 56f3325959ef144d8487d82792d2bcd
 AUX oops-1.5.24-textrel.patch 803 RMD160 7cc63f2d576e99232392528eb65ed09ea4d0150a SHA1 982151649995f1376d608a783addb04b5ba77489 SHA256 56acbb949120570746c200a97c4a41579366c4a00718baa3af56c7f7d2ea16f3
 AUX oops.cfg 17860 RMD160 fc772f270c505c83680568d166e006236ce36105 SHA1 7995c8d80bbe76a7fce45e20f712d5b3469b02bb SHA256 8e414b7261e5798f16ee97f148b883c75a0618997549fd2f701a820bcc0fbb2f
 AUX oops.initd 515 RMD160 da1f9e004a8173f74a2b2086f5ae5c88e4d3bc62 SHA1 37a0a31a0ff9e87c26901332f1d682e538bfa2b7 SHA256 be8deff3c52531ff1e31f47851672e877854082290e78d1f4c998b787f6c7279
+AUX rotate-logs.patch 456 RMD160 935c411b1edb6d6af0e7b15ad1da5ff3851ab449 SHA1 5cf246668df5156b1e9560ab5be20a21d99c67be SHA256 e35932a32b980ccee22bc070885a4f4c385839dae913a6f9656b0c330633d1f0
 DIST oops-1.5.23.tar.gz 473290 RMD160 295122ff9ce7e045cf7ddda035479056ba9e5881 SHA1 6eb9b77a5e4ef67896f46d5e1452506f2dff34de SHA256 b9ab7c0b5b11de7944f098d6f99158fe1b9c3b9cf82fe7827685c6cec8ccfa04
 DIST oops-1.5.24_pre20050503.patch.gz 101103 RMD160 dffdc6842db8c78d87c26fe180302b56608f1f2e SHA1 9d32934752729359056a9a6913b3db9008330994 SHA256 954e59d046096867a8e818bf47190ab06c8416abb80d151757825a664192aded
 EBUILD oops-1.5.24_pre20050503-r2.ebuild 2644 RMD160 ef01bac50beb4a62e14b1873efeed6b14e90754c SHA1 7c865086b91a01b72cc5ff190555e7761724218c SHA256 d3a313a9b32c1c1809a773080b5acb11316053e0025c23895eb50f5140b9c9de
 EBUILD oops-1.5.24_pre20050503-r3.ebuild 2667 RMD160 b6a07d43c65065b8611708933bccf7717424fcf7 SHA1 95bcacea09421b8cb5d0f963b23c00cdc2be302a SHA256 7b357ba226f24fb15c033542d22882374f05cde4f8b610df8e517382295af9bc
-MISC ChangeLog 5106 RMD160 056831f3be41be486a8b76a9452e7f7671f0f5af SHA1 1670a27a587ff2564b296fcd740aac5464bdf124 SHA256 b293c81983aee85a1d04926862c10e3d8bac01f194152936bd7132228fd13faa
+EBUILD oops-1.5.24_pre20050503-r4.ebuild 2642 RMD160 8fcca52af429174345cdfc142c6b625cda52c2b9 SHA1 b0bc2e4acc1c66726ecabcb6d1be6ce0fd961b6e SHA256 88b096ec64bd797f106d5b57fba8f5422930fa196d03f72b51479cfbb85a0ca7
+MISC ChangeLog 5332 RMD160 9e1cd1a4a68da78053d42e992af1aa8dc071a117 SHA1 de364fa15c775a2d7131baaef9b54fc9b8904804 SHA256 b99ec7b90006118db43c7b0ae6a5a8ca2f0858d34e5ad2117f9ea946645ee0ea
 MISC metadata.xml 241 RMD160 49452806ed5c451d97e1fa0ea2502e0eee3c41d6 SHA1 e9ba513731cedbbad85c4e23eead942b5c34ccc8 SHA256 62971ad1585c672fdea039fe2b299a5655375b23f78d7c2149901e2b29407bd3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklFHa0ACgkQPrHvTlXvhtseUQCcCSmmIHsZLPvlNJAl9DDPos7W
-VykAnjEk+UNSKOxURTA1sgx65PjWB7kS
-=tDR/
+iEYEARECAAYFAkpZwZ8ACgkQ9A5kJBGSrsuLsQCeIQ4fAWbpPlsxcsF5p6LRO9Do
+r1YAn20QCLMAqra5F7tmQ+lZXcOqUP7H
+=DE5J
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/oops/files/rotate-logs.patch b/net-proxy/oops/files/rotate-logs.patch
new file mode 100644
index 000000000000..236aa4b60926
--- /dev/null
+++ b/net-proxy/oops/files/rotate-logs.patch
@@ -0,0 +1,12 @@
+diff -Nru oops-1.5.23.orig/src/rotate_logs.c oops-1.5.23/src/rotate_logs.c
+--- oops-1.5.23.orig/src/rotate_logs.c	2001-08-31 15:30:30.000000000 +0200
++++ oops-1.5.23/src/rotate_logs.c	2009-07-12 12:47:56.000000000 +0200
+@@ -32,7 +32,7 @@
+     if ( !num ) {
+ 	/* if no number of logs configured just reopen file */
+ 	close(fb->fd);
+-	fb->fd = open(name, O_WRONLY|O_APPEND|O_CREAT);
++	fb->fd = open(name, O_WRONLY|O_APPEND|O_CREAT, 0660);
+ 	return;
+ 
+     }
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild
new file mode 100644
index 000000000000..f58a5521f55d
--- /dev/null
+++ b/net-proxy/oops/oops-1.5.24_pre20050503-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 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_pre20050503-r4.ebuild,v 1.1 2009/07/12 10:57:25 mrness Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+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="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	>=sys-libs/db-3"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup oops
+	enewuser oops -1 -1 /var/lib/oops oops
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P/_*}-textrel.patch"
+	epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
+	epatch "${FILESDIR}/modules-as-needed.patch"
+	epatch "${FILESDIR}/implicit-decl.patch"
+	epatch "${FILESDIR}/libpcreposix.patch"
+	epatch "${FILESDIR}/rotate-logs.patch"
+	sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/oops \
+		--enable-oops-user=oops \
+		--sysconfdir=/etc/oops \
+		--sbindir=/usr/sbin \
+		--with-regexp=pcre \
+		--localstatedir=/var/run/oops \
+		--enable-large-files \
+		--with-zlib=-lz \
+		|| die "configure problem"
+
+	sed -i -e '/STRERROR_R/d' src/config.h.in
+	sed -i \
+		-e "s|OOPS_LIBDIR = /usr/$(get_libdir)/oops|OOPS_LIBDIR = ${D}/usr/$(get_libdir)/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|" \
+		src/Makefile
+	sed -i \
+		-e "s|^\(LDFLAGS *= *\)${LDFLAGS}|\1$(raw-ldflags)|" \
+		src/modules/Makefile #modules makefile use ld directly
+}
+
+src_install() {
+	dodir /usr/sbin
+	einstall || die "install problem"
+
+	newinitd "${FILESDIR}/oops.initd" oops
+	diropts -m0750 -o root -g oops
+	dodir /etc/oops
+	insinto /etc/oops
+	doins "${FILESDIR}/oops.cfg"
+
+	diropts -m0755 -o oops -g oops
+	keepdir /var/run/oops
+	diropts -m0770 -o oops -g oops
+	keepdir /var/log/oops
+	keepdir /var/lib/oops/storage
+	keepdir /var/lib/oops/db
+
+	# cleanups
+	rm -rf "${D}/usr/oops"
+	rm -rf "${D}/usr/lib/oops/modules"
+}
+
+pkg_postinst() {
+	#Set proper owner/group if installed from binary package
+	chgrp oops "${ROOT}/etc/oops"
+	chown -R oops:oops "${ROOT}/var/run/oops" "${ROOT}/var/log/oops" "${ROOT}/var/lib/oops"
+}