Version bump, #309479 thank hitachi for report.

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

4 files changed, 131 insertions, 13 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 55519e0cd3e6..14437518a51c 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.34 2009/12/06 22:47:01 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.35 2010/03/16 07:49:08 pva Exp $
+
+*ebtables-2.0.9.2 (16 Mar 2010)
+
+  16 Mar 2010; Peter Volkov <pva@gentoo.org> +ebtables-2.0.9.2.ebuild,
+  +files/ebtables-v2.0.9-2-LDFLAGS.diff:
+  Version bump, #309479 thank hitachi for report.
 
   06 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   ebtables-2.0.9.1-r1.ebuild:
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 8e673bc25558..e1413fb817bf 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
 AUX ebtables-v2.0.8-2-LDFLAGS.diff 1874 RMD160 9cb9c0b96a14a4cfc441dc4d02d1b169448ec1c2 SHA1 c0a955c56d553b45c024178ccd227666389800b7 SHA256 8279df45acdd0c089aa47295e6718ac9208298f269c0f066421f9d2be8c4b937
 AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 RMD160 62f324507577cdcb9390b42fc87dd7f8017bf4e7 SHA1 7a68888f6ac2d2ee55105a957bcdec263992e266 SHA256 56905064c63c582240da2bc21d03ba66fc28716089ba743396fa67e9ea78b7ca
 AUX ebtables-v2.0.9-1-LDFLAGS.diff 1874 RMD160 e7c0fc175b1d44fbc4c91f50377b8e3fb74e54f2 SHA1 e8cddfd6ee81b13f0ccb3d3cb7cfc003eee0bd29 SHA256 988bf04df31a3696e12d8c8d856610291038c383956857ee3b239108213e8212
+AUX ebtables-v2.0.9-2-LDFLAGS.diff 1877 RMD160 fbe4771271a4b95cab0867a89e4dd7444ca2eeb8 SHA1 9500c735a7184c728f68602a438f833ba2916277 SHA256 083c2da165854376a49122f33dd5cd4e2dba1bb4c4a29141f6675d8a42b23dae
 AUX ebtables.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
 AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
 DIST ebtables-v2.0.9-1.tar.gz 101781 RMD160 9ec134cbb21be5eb085ad7f405c26363d29d38f9 SHA1 b0b011edb5872f266b9bbb127fe292d1e745dbc3 SHA256 8aefbc4480b1f6b6766fdb26779cd9eb9609278ad294b7585e533270e039bdc6
+DIST ebtables-v2.0.9-2.tar.gz 101529 RMD160 7dff076ab14dbc2c9e64813c745f1513498fdaa8 SHA1 93b684cf788592f976a12a5f71c3aa9d185a309c SHA256 98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3
 EBUILD ebtables-2.0.9.1-r1.ebuild 2000 RMD160 3e150a35ffe727f6695e59a96be13165987da19a SHA1 391427ed49a6bbd9090196629ef93b0108fc5185 SHA256 9da82fcced6e9b3ad769fe7c321775ec26c1806d8b6882a24879071f2ff91f11
 EBUILD ebtables-2.0.9.1.ebuild 1703 RMD160 7bd7b57d7b2117cbf5f44a0f5aea57f1db713ca0 SHA1 3e16ccc4dff504aa8e8683989ee5fb7d238ec878 SHA256 25807c88a348854d3b58ba1e0e99ae2ace4f6d4b85ea05f1573864aea2b9ae52
-MISC ChangeLog 5698 RMD160 2b7339538cb1de2d7a96b3e3c31d9ae5bb469ee1 SHA1 3a1352c143c35ab1f2008ae03af650acd2816916 SHA256 c00635eada56ca38f590aa7b3910109a814559edba3ff5185231f2f62d8c4d2e
+EBUILD ebtables-2.0.9.2.ebuild 1950 RMD160 00ab06c4531c3aa875bbc9b555a98d62c06f506e SHA1 584b4631e5db26720212bf001fdef976d266978a SHA256 8ebb637de0fe50c4b9b131d2b04ee27e2981497e3fd00fe9ce99c2805719e294
+MISC ChangeLog 5888 RMD160 26ac00ed84f14867eb095a07117338623d3e4145 SHA1 4fd61122f62787ddf8d03d725126ba969dfe1467 SHA256 851e7fb5ed2b05b8fa99fea9ef93c4b5b21fb0aa293d3728ccea970b5d059746
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkscNEgACgkQAiZjviIA2XhMjgCeJffgMwWTJarfRBa8DBvSsZay
-1IQAnijoaT5cLuiYDSkl3eGy36yKpDa6
-=cU+u
------END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2.ebuild
new file mode 100644
index 000000000000..1f1ae2bf3c67
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.9.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2.ebuild,v 1.1 2010/03/16 07:49:08 pva Exp $
+
+EAPI="2"
+
+inherit versionator eutils toolchain-funcs multilib flag-o-matic
+
+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."
+HOMEPAGE="http://ebtables.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+LICENSE="GPL-2"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use static; then
+		ewarn "You've chosen static build which is useful for embedded devices."
+		ewarn "It has no init script. Make sure that's really what you want."
+	fi
+}
+
+src_prepare() {
+	# Enhance ebtables-save to take table names as parameters bug #189315
+	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
+	epatch "${FILESDIR}/${PN}-v2.0.9-2-LDFLAGS.diff"
+	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
+
+	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
+		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
+		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
+		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
+		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
+}
+
+src_compile() {
+	# This package uses _init functions to initialise extensions. With
+	# --as-needed this will not work.
+	append-ldflags $(no-as-needed)
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		$(use static && echo static) \
+		|| die "emake failed"
+}
+
+src_install() {
+	if ! use static; then
+		make DESTDIR="${D}" install || die
+		keepdir /var/lib/ebtables/
+		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
+		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
+	else
+		into /
+		newsbin static ebtables || die
+	fi
+	dodoc ChangeLog THANKS || die
+}
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
new file mode 100644
index 000000000000..ab5d9aafe575
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
@@ -0,0 +1,54 @@
+=== modified file 'Makefile'
+--- Makefile	2010-03-16 07:37:01 +0000
++++ Makefile	2010-03-16 07:39:15 +0000
+@@ -18,7 +18,6 @@
+ CFLAGS:=-Wall -Wunused
+ CFLAGS_SH_LIB:=-fPIC
+ CC:=gcc
+-LD:=ld
+ 
+ ifeq ($(shell uname -m),sparc64)
+ CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
+@@ -85,10 +84,10 @@
+ 
+ .PHONY: libebtc
+ libebtc: $(OBJECTS2)
+-	$(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
+ 
+ ebtables: $(OBJECTS) ebtables-standalone.o libebtc
+-	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
++	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ 	-Wl,-rpath,$(LIBDIR)
+ 
+ ebtablesu: ebtablesu.c
+@@ -105,7 +104,7 @@
+ 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
+ 
+ ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
+-	$(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ 	-Wl,-rpath,$(LIBDIR)
+ 
+ .PHONY: daemon
+
+=== modified file 'extensions/Makefile'
+--- extensions/Makefile	2010-03-16 07:37:01 +0000
++++ extensions/Makefile	2010-03-16 07:37:43 +0000
+@@ -11,13 +11,13 @@
+ EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
+ 
+ extensions/ebt_%.so: extensions/ebt_%.o
+-	$(CC) -shared -o $@ -lc $< -nostartfiles
++	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
+ 
+ extensions/libebt_%.so: extensions/ebt_%.so
+ 	mv $< $@
+ 
+ extensions/ebtable_%.so: extensions/ebtable_%.o
+-	$(CC) -shared -o $@ -lc $< -nostartfiles
++	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
+ 
+ extensions/libebtable_%.so: extensions/ebtable_%.so
+ 	mv $< $@
+