Version bump. Fixed bug #159371 and bug #167769. Thank Jochen Schlick, Olivier Huber, Richard Benjamin Voigt and others mentioned in that bugs.

Package-Manager: portage-2.1.3.4

7 files changed, 160 insertions, 10 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 70ebc6ed81c9..3a03a31b194e 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/ebtables
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.13 2007/07/16 18:21:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.14 2007/08/12 10:11:21 pva Exp $
+
+*ebtables-2.0.8.1 (12 Aug 2007)
+
+  12 Aug 2007; <pva@gentoo.org> +files/ebtables-2.0.8.1-fix-textrel.patch,
+  +files/ebtables-2.0.8.1-scripts-build.patch, metadata.xml,
+  +ebtables-2.0.8.1.ebuild:
+  Version bump. Fixed bug #159371 and bug #167769. Thank Jochen Schlick,
+  Olivier Huber, Richard Benjamin Voigt and others mentioned in that bugs.
 
   16 Jul 2007; <pva@gentoo.org> metadata.xml:
   Grabed from solar.
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 54eb9057d052..092cce750deb 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -6,7 +6,16 @@ AUX ebtables-2.0.6-gcc4.patch 3966 RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6
 MD5 49410b65a0fadade808e745f1e309bb9 files/ebtables-2.0.6-gcc4.patch 3966
 RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6b0 files/ebtables-2.0.6-gcc4.patch 3966
 SHA256 cbb3d36e1e2d511696e4ecd9e63450c7e495a3b629f96c62464046750ffaf411 files/ebtables-2.0.6-gcc4.patch 3966
+AUX ebtables-2.0.8.1-fix-textrel.patch 521 RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 SHA1 f583e95e28c826d70ded4f96192e49205cab33ea SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52
+MD5 24865a3af0d70f1ae8092afb436adda1 files/ebtables-2.0.8.1-fix-textrel.patch 521
+RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 files/ebtables-2.0.8.1-fix-textrel.patch 521
+SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52 files/ebtables-2.0.8.1-fix-textrel.patch 521
+AUX ebtables-2.0.8.1-scripts-build.patch 2628 RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 SHA1 606ac72011dd6d3668706df0adade102e776d9ef SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916
+MD5 8443ec9a3253bae8f2644563e02133d7 files/ebtables-2.0.8.1-scripts-build.patch 2628
+RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 files/ebtables-2.0.8.1-scripts-build.patch 2628
+SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916 files/ebtables-2.0.8.1-scripts-build.patch 2628
 DIST ebtables-v2.0.6.tar.gz 71411 RMD160 832935fbfda5a42382ce0450ac0b1fd964eb1d7a SHA1 6a4e4ea6824440ffc5d052280eb622b5da33a065 SHA256 6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
+DIST ebtables-v2.0.8-1.tar.gz 96681 RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 SHA1 c70f012f274bfc277ee51f98fcffe0bfbbd36725 SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74
 EBUILD ebtables-2.0.6-r1.ebuild 1078 RMD160 c95ca2a0e2c6ac332fa3acb3a17d859504003ce5 SHA1 f585294c1339baf680ec76315818447746d65913 SHA256 d02473154fe73de3151a305c202a52879d1886148150a92c47464a24cca8c4d9
 MD5 f46853e4836f1ca11777856105da44e8 ebtables-2.0.6-r1.ebuild 1078
 RMD160 c95ca2a0e2c6ac332fa3acb3a17d859504003ce5 ebtables-2.0.6-r1.ebuild 1078
@@ -15,17 +24,24 @@ EBUILD ebtables-2.0.6.ebuild 975 RMD160 1c3bd9098cc967739195e7598139f680c9d34c6a
 MD5 9979552c18681dd6edfe1e91f6717609 ebtables-2.0.6.ebuild 975
 RMD160 1c3bd9098cc967739195e7598139f680c9d34c6a ebtables-2.0.6.ebuild 975
 SHA256 ac6e7706a70fb4e103cdd4ae08076f65d1e07718710540f79b2dde2992396709 ebtables-2.0.6.ebuild 975
-MISC ChangeLog 1843 RMD160 753d4bd1c24cc28a181547078b9ce9f2faa27d42 SHA1 2ff268833ad5b863df3a89a37478acb6eef871bd SHA256 c5cdd4d3d899d5e3aff14e59296f290acf51fbe4f228717b023ab32b2735b292
-MD5 13f6c8754095df97cb06f486996864a5 ChangeLog 1843
-RMD160 753d4bd1c24cc28a181547078b9ce9f2faa27d42 ChangeLog 1843
-SHA256 c5cdd4d3d899d5e3aff14e59296f290acf51fbe4f228717b023ab32b2735b292 ChangeLog 1843
-MISC metadata.xml 247 RMD160 9ab021632d7f758e344b1c87e6dabf8c0d3f5038 SHA1 f88765d28a9aaddcaa11b545a66ca1e640efa454 SHA256 280a49393f87cc525776499e43a13b6cfcce14aa6af9b9958bf983435f9b05d5
-MD5 a0493ed4c7c98beb6c0f951a2c762a97 metadata.xml 247
-RMD160 9ab021632d7f758e344b1c87e6dabf8c0d3f5038 metadata.xml 247
-SHA256 280a49393f87cc525776499e43a13b6cfcce14aa6af9b9958bf983435f9b05d5 metadata.xml 247
+EBUILD ebtables-2.0.8.1.ebuild 1404 RMD160 902027e877709667ec8538ca063de29dcaadaa47 SHA1 2fca8baa2a91c05b419bdfa6f0b0ca82bc6071cf SHA256 89eedbdb018df272694be78e4f1e0e8e1e86a2b013eeac5dd152061df82bd72e
+MD5 138728b132ae44a6d98fcd02f086fda8 ebtables-2.0.8.1.ebuild 1404
+RMD160 902027e877709667ec8538ca063de29dcaadaa47 ebtables-2.0.8.1.ebuild 1404
+SHA256 89eedbdb018df272694be78e4f1e0e8e1e86a2b013eeac5dd152061df82bd72e ebtables-2.0.8.1.ebuild 1404
+MISC ChangeLog 2189 RMD160 eeacd0eb86678ef5be2e9abe30c83b62aaa93f8a SHA1 c476c143692662cffa426aaa28596623222622af SHA256 b3ebfdb70f392a9c4b6c92f5faebb632bf4baf77a81b44213a5a9cfea7534ec4
+MD5 e7ef13d8101770952ed930a55e1b9055 ChangeLog 2189
+RMD160 eeacd0eb86678ef5be2e9abe30c83b62aaa93f8a ChangeLog 2189
+SHA256 b3ebfdb70f392a9c4b6c92f5faebb632bf4baf77a81b44213a5a9cfea7534ec4 ChangeLog 2189
+MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
+MD5 26ae4c6a179a2e2cc5c19c56e978861d metadata.xml 251
+RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 metadata.xml 251
+SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504 metadata.xml 251
 MD5 10aca2434836b1c3a10c639838101578 files/digest-ebtables-2.0.6 244
 RMD160 6cdb583c3a517500fe78b5911707723091f90090 files/digest-ebtables-2.0.6 244
 SHA256 24df33cfa531bd07d2591bf5e0b08638abeff981c0186557592e12ac33a1e118 files/digest-ebtables-2.0.6 244
 MD5 10aca2434836b1c3a10c639838101578 files/digest-ebtables-2.0.6-r1 244
 RMD160 6cdb583c3a517500fe78b5911707723091f90090 files/digest-ebtables-2.0.6-r1 244
 SHA256 24df33cfa531bd07d2591bf5e0b08638abeff981c0186557592e12ac33a1e118 files/digest-ebtables-2.0.6-r1 244
+MD5 c81b75dddac491771c6b189a3cb7a593 files/digest-ebtables-2.0.8.1 250
+RMD160 2fec252859b3a19da36ce94a85ddffe2562c79e0 files/digest-ebtables-2.0.8.1 250
+SHA256 cfb0bea2dc82ea6eb4a6f1879d783c62f683350662f4218fa3f592816fbdd630 files/digest-ebtables-2.0.8.1 250
diff --git a/net-firewall/ebtables/ebtables-2.0.8.1.ebuild b/net-firewall/ebtables/ebtables-2.0.8.1.ebuild
new file mode 100644
index 000000000000..264bbb5fb861
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.1.ebuild,v 1.1 2007/08/12 10:11:21 pva Exp $
+
+inherit versionator eutils toolchain-funcs multilib
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P="${PN}-v${MY_PV}"
+
+DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://ebtables.sourceforge.net/"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Kill two rabits: TEXTREL and compilation on amd64. bug #159371.
+	epatch "${FILESDIR}"/${P}-fix-textrel.patch
+
+	# Fix scripts to be built during make, thus paths inside are correct.
+	epatch "${FILESDIR}"/${P}-scripts-build.patch
+
+	sed -i -e "s,MANDIR:=/usr/local/man,MANDIR:=/usr/share/man," \
+		-e "s,BINDIR:=/usr/local/sbin,BINDIR:=/sbin," \
+		-e "s,INITDIR:=/etc/rc.d/init.d,INITDIR:=/usr/share/doc/${PF}," \
+		-e "s,SYSCONFIGDIR:=/etc/sysconfig,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
+		-e "s,LIBDIR:=/usr/lib,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dodoc ChangeLog THANKS
+	make DESTDIR="${D}" install || die
+}
diff --git a/net-firewall/ebtables/files/digest-ebtables-2.0.8.1 b/net-firewall/ebtables/files/digest-ebtables-2.0.8.1
new file mode 100644
index 000000000000..1d64e3bc0cbc
--- /dev/null
+++ b/net-firewall/ebtables/files/digest-ebtables-2.0.8.1
@@ -0,0 +1,3 @@
+MD5 216e5d20fbd0e56dbe7e56b0d07b1909 ebtables-v2.0.8-1.tar.gz 96681
+RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 ebtables-v2.0.8-1.tar.gz 96681
+SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74 ebtables-v2.0.8-1.tar.gz 96681
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
new file mode 100644
index 000000000000..97a5497cabf2
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2007-08-12 13:02:55.000000000 +0400
++++ ./Makefile	2007-08-12 13:03:04.000000000 +0400
+@@ -87,7 +87,7 @@
+ 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -Iinclude/
+ 
+ ebtables.o: ebtables.c include/ebtables_u.h
+-	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
++	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
+ 
+ ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h
+ 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
new file mode 100644
index 000000000000..798eefda4290
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
@@ -0,0 +1,66 @@
+--- ./Makefile.orig	2007-08-12 13:25:23.000000000 +0400
++++ ./Makefile	2007-08-12 13:36:13.000000000 +0400
+@@ -15,15 +15,6 @@
+ SYSCONFIGDIR:=/usr/share/doc/ebtables-2.0.8.1
+ DESTDIR:=
+ 
+-# include DESTDIR param
+-override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME)
+-override MANDIR:=$(DESTDIR)$(MANDIR)
+-override BINDIR:=$(DESTDIR)$(BINDIR)
+-override ETCDIR:=$(DESTDIR)$(ETCDIR)
+-override INITDIR:=$(DESTDIR)$(INITDIR)
+-override SYSCONFIGDIR:=$(DESTDIR)$(SYSCONFIGDIR)
+-
+-
+ CFLAGS:=-Wall -Wunused
+ CFLAGS_SH_LIB:=-fPIC
+ CC:=gcc
+@@ -163,34 +154,34 @@
+ .PHONY: scripts
+ scripts: ebtables-save ebtables.sysv ebtables-config
+ 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
+-	install -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save
++	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
+ 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
+-	install -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables
++	install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
+ 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
+-	install -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
++	install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
+ 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
+ 
+ $(MANDIR)/man8/ebtables.8: ebtables.8
+-	mkdir -p $(@D)
++	mkdir -p $(DESTDIR)$(@D)
+ 	sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
+-	install -m 0644 -o root -g root ebtables.8_ $@
++	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
+ 	rm -f ebtables.8_
+ 
+ $(ETHERTYPESFILE): ethertypes
+-	mkdir -p $(@D)
+-	install -m 0644 -o root -g root $< $@
++	mkdir -p $(DESTDIR)$(@D)
++	install -m 0644 -o root -g root $< $(DESTDIR)$@
+ 
+ .PHONY: exec
+ exec: ebtables ebtables-restore
+-	mkdir -p $(BINDIR)
+-	install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME)
+-	install -m 0755 -o root -g root ebtables-restore $(BINDIR)/ebtables-restore
++	mkdir -p $(DESTDIR)$(BINDIR)
++	install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
++	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
+ 
+ .PHONY: install
+ install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
+-	mkdir -p $(LIBDIR)
+-	install -m 0755 extensions/*.so $(LIBDIR)
+-	install -m 0755 *.so $(LIBDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR)
++	install -m 0755 *.so $(DESTDIR)$(LIBDIR)
+ 
+ .PHONY: clean
+ clean:
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index 38bf1c1ef2d1..2384f2c7e45b 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>base-system</herd>
 <maintainer>
   <email>pva@gentoo.org</email>
   <name>Peter Volkov</name>