Version bump, fixes 'invalid size 8 != 4', bug #273693 reported by Joakim Tjernlund.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 82 insertions, 14 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index a449f90de779..3ad5b3c1f742 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.27 2009/01/04 15:38:26 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.28 2009/06/22 15:06:36 pva Exp $
+
+*ebtables-2.0.9.1 (22 Jun 2009)
+
+  22 Jun 2009; Peter Volkov <pva@gentoo.org>
+  +files/ebtables-v2.0.9-1-LDFLAGS.diff, +ebtables-2.0.9.1.ebuild:
+  Version bump, fixes 'invalid size 8 != 4', bug #273693 reported by Joakim
+  Tjernlund.
 
   04 Jan 2009; Markus Meier <maekke@gentoo.org> ebtables-2.0.8.2-r2.ebuild:
   amd64/x86 stable, bug #252658
diff --git a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
index c7b60ad7709c..2ba613ad61f5 100644
--- a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2.ebuild,v 1.5 2008/05/11 11:04:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.1.ebuild,v 1.1 2009/06/22 15:06:36 pva Exp $
 
-inherit versionator eutils toolchain-funcs multilib
+inherit versionator eutils toolchain-funcs multilib flag-o-matic
 
 MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN}-v${MY_PV}"
+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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,24 +23,30 @@ src_unpack() {
 	cd "${S}"
 
 	# Enchance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}"/${PN}-2.0.8.1-ebt-save.diff
+	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
+	epatch "${FILESDIR}/${PN}-v2.0.9-1-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
+	sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile
+	sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	# This package uses _init functions to initialise extensions. With
+	# --as-needed this will not work.
+	append-ldflags -Wl,--no-as-needed
+	emake || die "emake failed"
 }
 
 src_install() {
-	dodoc ChangeLog THANKS
 	make DESTDIR="${D}" install || die
+	dodoc ChangeLog THANKS || die
 	keepdir /var/lib/ebtables/
-
-	newinitd "${FILESDIR}"/ebtables.initd ebtables
-	newconfd "${FILESDIR}"/ebtables.confd ebtables
+	newinitd "${FILESDIR}"/ebtables.initd ebtables || die
+	newconfd "${FILESDIR}"/ebtables.confd ebtables || die
 }
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
new file mode 100644
index 000000000000..1e42fe58a046
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
@@ -0,0 +1,54 @@
+=== modified file 'Makefile'
+--- Makefile	2009-06-22 14:41:37 +0000
++++ Makefile	2009-06-22 14:52:59 +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)
+-	$(LD) -shared -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	2009-06-22 14:41:37 +0000
++++ extensions/Makefile	2009-06-22 14:55:36 +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 $< $@
+