summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-06-22 15:06:37 +0000
committerPeter Volkov <pva@gentoo.org>2009-06-22 15:06:37 +0000
commitb04ef16c6cb6a25375c6c89c214d5dfaffc0fd82 (patch)
tree3242ceb2c6a85ccc9a22cb262baf92dcf7294e68 /net-firewall/ebtables
parentStable for HPPA too. (diff)
downloadhistorical-b04ef16c6cb6a25375c6c89c214d5dfaffc0fd82.tar.gz
historical-b04ef16c6cb6a25375c6c89c214d5dfaffc0fd82.tar.bz2
historical-b04ef16c6cb6a25375c6c89c214d5dfaffc0fd82.zip
Version bump, fixes 'invalid size 8 != 4', bug #273693 reported by Joakim Tjernlund.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'net-firewall/ebtables')
-rw-r--r--net-firewall/ebtables/ChangeLog11
-rw-r--r--net-firewall/ebtables/Manifest16
-rw-r--r--net-firewall/ebtables/ebtables-2.0.9.1.ebuild (renamed from net-firewall/ebtables/ebtables-2.0.8.2.ebuild)31
-rw-r--r--net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff54
4 files changed, 86 insertions, 26 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/Manifest b/net-firewall/ebtables/Manifest
index 155f06b13935..cd541d5b535d 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,20 +1,12 @@
------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.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
DIST ebtables-v2.0.8-2.tar.gz 97065 RMD160 b53fca7e2f34dd23ecb11af3804fa10c1702e815 SHA1 3e9331a55e02f0930047b7198501f380ebf6c2d9 SHA256 dd78c0dfa0dbeb128952dec9e916be948bf561dcb8ba3149ea7ce0166a2caf9b
+DIST ebtables-v2.0.9-1.tar.gz 101781 RMD160 9ec134cbb21be5eb085ad7f405c26363d29d38f9 SHA1 b0b011edb5872f266b9bbb127fe292d1e745dbc3 SHA256 8aefbc4480b1f6b6766fdb26779cd9eb9609278ad294b7585e533270e039bdc6
EBUILD ebtables-2.0.8.2-r2.ebuild 1689 RMD160 c0a74f6bfd0697d87518c7f1147ca599c2338362 SHA1 75275f99bfeb602a3def8d995d2fa42e4c3a8439 SHA256 8741ad6434a2143fc48434ab340c8b103089ce07c26a332ccc71234007bebd29
-EBUILD ebtables-2.0.8.2.ebuild 1340 RMD160 7c32a3d06192af8134f7833de8163ac917dfd414 SHA1 ba925b114ce41b26321b9a1b7a0853c786ceb8ab SHA256 54dbad60050fefc9e1c3a22aebdc4bbd52d3cb079dd8986381b534d6984790d9
-MISC ChangeLog 4626 RMD160 717a6b7700712315cb6c200508dd61696fd00bbf SHA1 89be15cb48c3b313ae1aebb5a61026bae1400b84 SHA256 4b3da710f8fe17061a12fd20d311ed4f2bb783ff96b6c9c0fdcf6a00475cafd6
+EBUILD ebtables-2.0.9.1.ebuild 1706 RMD160 47dd4b11a87b7fff40cca54f73e4401706463d6f SHA1 463fe25391460aad730c866d77e1cd56abb7923a SHA256 17dcb52be4e749f532f61822b479a6243995d42b2d5aa7b30d5b4cbf2415f22f
+MISC ChangeLog 4858 RMD160 f3f57945e5256b12d84859f2bc3ac67e4463a171 SHA1 f86cc6a8cf7cfd30c33f17c0486ee049de9ca8d0 SHA256 0770c0e1905939dda787f0fefb97da5053ad740e6e47cb3db7d03f19a12d58e2
MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklg1/kACgkQkKaRLQcq0GIfAgCfVxbMAr4D9bbyH++Z5q03Grbl
-b7sAnRz7xeEAZ/l5XLGLEfEDfv8d+Twl
-=osE6
------END PGP SIGNATURE-----
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 $< $@
+