Fix bug #117898

Package-Manager: portage-2.1-r1

7 files changed, 19 insertions, 190 deletions

diff --git a/net-libs/libpcap-ringbuffer/Manifest b/net-libs/libpcap-ringbuffer/Manifest
index 8c4b2466e132..3d7915f17c3a 100644
--- a/net-libs/libpcap-ringbuffer/Manifest
+++ b/net-libs/libpcap-ringbuffer/Manifest
@@ -1,8 +1,20 @@
-MD5 86f63db5e73fe57db9fd26ab62ef90f1 ChangeLog 1495
-MD5 3518cc7e500dab348a9a4aee5972d7c8 libpcap-ringbuffer-1.0.20041001.ebuild 1659
+AUX libpcap-ringbuffer-0.9.20060417-makefile.patch 711 RMD160 90458d27e3529aa6fb51c3dc39348aea1109655d SHA1 38cd59965d86abdbd4647b270e64ae1f24104abd SHA256 c5860f51215611a628714285a63b9df8386b3609aaa58d1acc80b959e6002524
+MD5 ec1b37f1f03e8b8f3350ffdc59f0d0df files/libpcap-ringbuffer-0.9.20060417-makefile.patch 711
+RMD160 90458d27e3529aa6fb51c3dc39348aea1109655d files/libpcap-ringbuffer-0.9.20060417-makefile.patch 711
+SHA256 c5860f51215611a628714285a63b9df8386b3609aaa58d1acc80b959e6002524 files/libpcap-ringbuffer-0.9.20060417-makefile.patch 711
+DIST libpcap-0.9.20060417.tar.gz 645916 RMD160 d0617c1b41d203640402aa652eec447638439f8b SHA1 0e4b04161bb72b0689b66015608ada89ff690064 SHA256 9dba82dce7f6918864dc44c580a3f1767ee53e06c1514a5f50d877adbf7675db
+EBUILD libpcap-ringbuffer-0.9.20060417.ebuild 2300 RMD160 46bfe98ff4ce8fd2b3a95fedef35242c48312369 SHA1 8e2d445a2385820d1a9aef0ca178bcd8833b7945 SHA256 5a255174c9acc84c1bf1748fa577c3193a0c2bbcddc5a106e805da8c2876ba73
+MD5 a598594e6c4a78655e92b5f469164cdd libpcap-ringbuffer-0.9.20060417.ebuild 2300
+RMD160 46bfe98ff4ce8fd2b3a95fedef35242c48312369 libpcap-ringbuffer-0.9.20060417.ebuild 2300
+SHA256 5a255174c9acc84c1bf1748fa577c3193a0c2bbcddc5a106e805da8c2876ba73 libpcap-ringbuffer-0.9.20060417.ebuild 2300
+MISC ChangeLog 1915 RMD160 f0d437c19e684e8cbcf6877b1bc4088265b043a3 SHA1 9702f632b5043819e9f7b813a33a59ab5e2c237e SHA256 77cb38bc1012f068e5ab8a93053931077f86f5e2616aeefe129a98267108e45b
+MD5 631eb1216f9c88d162808f35daa5c750 ChangeLog 1915
+RMD160 f0d437c19e684e8cbcf6877b1bc4088265b043a3 ChangeLog 1915
+SHA256 77cb38bc1012f068e5ab8a93053931077f86f5e2616aeefe129a98267108e45b ChangeLog 1915
+MISC metadata.xml 257 RMD160 5f3bcfb829ea86e6a88159bd46c0fc9e704e57cf SHA1 6884cbf7af78d41d3671ef371099be8d3cfd7f76 SHA256 b9d9ab39c8815b625434fc29109f68f8a58f74cede18f594f383a3b0cc5a58a5
 MD5 c14eecc39f9e4d6b37b94f4e81df755d metadata.xml 257
-MD5 b70b78302675b24cc17b4242cc3d4030 libpcap-ringbuffer-1.0.20050129-r2.ebuild 1702
-MD5 a515448deadd95cb78cacf175a0aeba4 files/digest-libpcap-ringbuffer-1.0.20041001 72
-MD5 2801bbe6917277fe63e0115dac7648b5 files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch 728
-MD5 88de1c13f5c2a764d4613cd7070766c6 files/digest-libpcap-ringbuffer-1.0.20050129-r2 72
-MD5 13baa2560936dddce623fc3b2d207aa9 files/libpcap-ringbuffer-1.0.20050129-makefile.patch 2426
+RMD160 5f3bcfb829ea86e6a88159bd46c0fc9e704e57cf metadata.xml 257
+SHA256 b9d9ab39c8815b625434fc29109f68f8a58f74cede18f594f383a3b0cc5a58a5 metadata.xml 257
+MD5 faa08e3ec697b3e06d9ddfad8a72fef1 files/digest-libpcap-ringbuffer-0.9.20060417 262
+RMD160 b33eb39c4917fadeac2803a0e97dd49678f94a86 files/digest-libpcap-ringbuffer-0.9.20060417 262
+SHA256 0978c67d67744d6d7a069b19fb088e6ae0daa06543491ce084ec568a4a90541e files/digest-libpcap-ringbuffer-0.9.20060417 262
diff --git a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20041001 b/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20041001
deleted file mode 100644
index f73c1c6f0d55..000000000000
--- a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20041001
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ad500ae1fd6de56d2b745a7597227ab libpcap-1.0.20041001.tar.gz 601676
diff --git a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r2 b/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r2
deleted file mode 100644
index 77df015e2728..000000000000
--- a/net-libs/libpcap-ringbuffer/files/digest-libpcap-ringbuffer-1.0.20050129-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17f5d0ea2e00d5f54f23966d453a9660 libpcap-1.0.20050129.tar.gz 601748
diff --git a/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch b/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch
deleted file mode 100644
index 1df732515f7e..000000000000
--- a/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.am.orig	2005-06-11 15:49:35.000000000 +1000
-+++ Makefile.am	2005-06-11 15:48:22.000000000 +1000
-@@ -105,11 +105,11 @@
- 	cp pcap-namedb.h $(DESTDIR)$(includedir)
- 	rm -f $(DESTDIR)$(libdir)/libpcap.la
- 	rm -f $(DESTDIR)$(libdir)/libpcap.so*
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so)
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR).$(RREVISION))
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR))
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.7)
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.$(RMINOR).$(RREVISION))
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.$(RMINOR))
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0.7)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).${VAGE) libpcap.so.0)
- 
- # generated source
- 
---- Makefile.in.orig	2005-06-11 15:42:42.000000000 +1000
-+++ Makefile.in	2005-06-11 15:50:23.000000000 +1000
-@@ -514,11 +514,11 @@
- 	cp pcap-namedb.h $(DESTDIR)$(includedir)
- 	rm -f $(DESTDIR)$(libdir)/libpcap.la
- 	rm -f $(DESTDIR)$(libdir)/libpcap.so*
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so)
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR).$(RREVISION))
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.$(RMINOR))
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0.7)
--	(cd $(DESTDIR)$(libdir); ln -s libpcap-0.$(RMINOR).$(RREVISION).so libpcap.so.0)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.$(RMINOR).$(RREVISION))
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.$(RMINOR))
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0.7)
-+	(cd $(DESTDIR)$(libdir); ln -s libpcap.so.$(VCURRENT).$(VREVISION).$(VAGE) libpcap.so.0)
- 
- # generated source
- 
diff --git a/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch b/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch
deleted file mode 100644
index 595a181a14e3..000000000000
--- a/net-libs/libpcap-ringbuffer/files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pcap-ring.c.orig	2005-06-03 18:27:27.000000000 +1000
-+++ pcap-ring.c	2005-06-03 18:27:50.000000000 +1000
-@@ -78,7 +78,7 @@
-     }
- 
-     p->rg.buf = (void*)mmap(NULL, pgs*pg_size,
--                    PROT_READ|PROT_WRITE|PROT_EXEC,
-+                    PROT_READ|PROT_WRITE,
-                     MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
-     if ((long)p->rg.buf == -1L) {
-         perror("mmap");
-@@ -185,7 +185,7 @@
-         return -2;
-     }
- 
--    p->rg.buf = (void*)mmap(0, pgs*pg_size, PROT_READ|PROT_WRITE|PROT_EXEC,
-+    p->rg.buf = (void*)mmap(0, pgs*pg_size, PROT_READ|PROT_WRITE,
-                     MAP_SHARED, p->fd, 0);
-     if ((long)p->rg.buf == -1L) {
-         perror("Error: Could not allocate shared memory");
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild
deleted file mode 100644
index 9dadd987f226..000000000000
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild,v 1.2 2005/01/29 00:38:30 dragonheart Exp $
-
-inherit toolchain-funcs linux-info multilib
-
-MY_P=${PN:0:7}-${PV}
-
-DESCRIPTION="A libpcap version which supports MMAP mode (ringbuffer)  on the linux kernel 2.[46].x"
-HOMEPAGE="http://public.lanl.gov/cpw/"
-SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="ipv6"
-
-DEPEND="virtual/libc
-	!virtual/libpcap"
-
-PROVIDE="virtual/libpcap"
-
-S=${WORKDIR}/${MY_P}
-
-# Used in linux-info to check minium Kernel support
-CONFIG_CHECK="PACKET_MMAP"
-PACKET_MMAP_ERROR="Make sure you have PACKET_MMAP compiled in your kernel to make use of libpcap's ringbuffer feature."
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's:@CFLAGS@:@CFLAGS@ -fPIC:' Makefile.in || die "fPIC patch failed."
-}
-
-src_compile() {
-	cd ${S}
-	econf `use_enable ipv6` || die "bad configure"
-	emake || die "compile problem"
-
-	# no provision for this in the Makefile, so...
-	$(tc-getCC) -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \
-		|| die "couldn't make a shared lib"
-}
-
-src_install() {
-	dodir /usr/include
-	dodir /usr/$(get_libdir)
-	emake DESTDIR=${D} install || die "install problem"
-	dodoc CREDITS CHANGES FILES README* VERSION
-
-	dolib libpcap.so.${PV:0:3}
-
-	doins /usr/$(get_libdir)
-
-	for link in "" .0 .0.7 .0.8
-	do
-		dosym libpcap.so.${PV:0:3} libpcap.so${link}
-	done
-}
-
-pkg_postinst() {
-	einfo "For usage with tcpdump and further details see:"
-	einfo "/usr/share/doc/${PF}/README.ring.gz"
-}
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
deleted file mode 100644
index 4d8aa8a91b7d..000000000000
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild,v 1.2 2005/06/11 13:41:09 dholm Exp $
-
-inherit toolchain-funcs linux-info multilib eutils
-
-MY_P=${PN:0:7}-${PV}
-
-DESCRIPTION="A libpcap version which supports MMAP mode (ringbuffer)  on the linux kernel 2.[46].x"
-HOMEPAGE="http://public.lanl.gov/cpw/"
-SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="ipv6"
-
-DEPEND="virtual/libc
-	!virtual/libpcap"
-
-PROVIDE="virtual/libpcap"
-
-S=${WORKDIR}/${MY_P}
-
-# Used in linux-info to check minium Kernel support
-CONFIG_CHECK="PACKET_MMAP"
-PACKET_MMAP_ERROR="Make sure you have PACKET_MMAP compiled in your kernel to make use of libpcap's ringbuffer feature."
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's:@CFLAGS@:@CFLAGS@ -fPIC:' Makefile.in || die "fPIC patch failed."
-	epatch ${FILESDIR}/${P}-mmap-exec.patch
-	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-src_compile() {
-	cd ${S}
-	econf `use_enable ipv6` --with-pcap=ring || die "bad configure"
-	emake || die "compile problem"
-
-	# no provision for this in the Makefile, so...
-	$(tc-getCC) -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \
-		|| die "couldn't make a shared lib"
-}
-
-src_install() {
-	dodir /usr/include
-	dodir /usr/$(get_libdir)
-	emake DESTDIR=${D} install || die "install problem"
-	dodoc CREDITS CHANGES FILES README* VERSION
-	mv libpcap.so.${PV:0:3} libpcap.so.${PV:0:3}.0
-	dolib libpcap.so.${PV:0:3}.0
-}
-
-pkg_postinst() {
-	einfo "For usage with tcpdump and further details see:"
-	einfo "/usr/share/doc/${PF}/README.ring.gz"
-}