Fix build issue reported in bug #370953 by Bertrand Jacquin. Added -Wno-strict-aliasing to avoid QA warnings (code is Ok).

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

4 files changed, 50 insertions, 4 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 57ce08052726..2856032e82e3 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ebtables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.40 2011/05/19 10:29:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.41 2011/06/22 18:30:24 pva Exp $
+
+  22 Jun 2011; Peter Volkov <pva@gentoo.org> ebtables-2.0.9.2-r2.ebuild,
+  +files/ebtables-v2.0.9-2-compilation.patch:
+  Fix build issue reported in bug #370953 by Bertrand Jacquin. Added
+  -Wno-strict-aliasing to avoid QA warnings (code is Ok).
 
 *ebtables-2.0.9.2-r2 (19 May 2011)
 
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 435aefb8665f..5cdce46be586 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,10 +1,11 @@
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
 AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 RMD160 62f324507577cdcb9390b42fc87dd7f8017bf4e7 SHA1 7a68888f6ac2d2ee55105a957bcdec263992e266 SHA256 56905064c63c582240da2bc21d03ba66fc28716089ba743396fa67e9ea78b7ca
 AUX ebtables-v2.0.9-2-LDFLAGS.diff 2349 RMD160 db15610f89a004adff95cca96b3f0b59c1c79b9a SHA1 0bc0d680a60ce79439573efa78fda696153a8f6a SHA256 55a236e2d10d2ef1dd699d94c6079acd9ae6447b9a462feb3071cdbd7611231b
+AUX ebtables-v2.0.9-2-compilation.patch 1495 RMD160 942d184f2b819d0f5a13b6823822dbaf7384eeee SHA1 e421bd06de811b08d7890346ba55b6133d440947 SHA256 8f0a3e8dc3035fa875a11bebe3f697019f6979225f8779ba58ab73cfcfd871c4
 AUX ebtables.confd-r1 288 RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b SHA1 89b16bf882290bfc31c890948245552da5b26b4d SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58
 AUX ebtables.initd-r1 2071 RMD160 bbc77bbb64a2f73c97647d45e7707ee74da8573e SHA1 72e6b79826d47f7312947e5f2366e9130f690607 SHA256 cef208f784b24abcc7af313355d103ee1c78ade42fb1cee3936b209c012d7a80
 DIST ebtables-v2.0.9-2.tar.gz 101529 RMD160 7dff076ab14dbc2c9e64813c745f1513498fdaa8 SHA1 93b684cf788592f976a12a5f71c3aa9d185a309c SHA256 98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3
 EBUILD ebtables-2.0.9.2-r1.ebuild 1959 RMD160 6ddab669bc1cb64490475bdc5544ce46ccb63e31 SHA1 7f90002f76ac87ff30dea2631aec686ea3b713dd SHA256 e4ec3bda2c6eec70ec889667a98f0bf272bc6a91a2152188e21ee447b509f221
-EBUILD ebtables-2.0.9.2-r2.ebuild 1939 RMD160 224bd6095bc38b35dbca4ca030cd26d5deab774d SHA1 8fc0b8fb0de4847be3d5dd76ecc435986bf286ea SHA256 ab87fa014764dff8df9702edcb5e078cf2cff361a80154b8c4f8405c163a3909
-MISC ChangeLog 6939 RMD160 1230252cdd9e9fa6e0b9c3761cb0a85ddf550933 SHA1 cdacc5d731d06e74af0a09b8e8a33a7e73d0c25e SHA256 131b6a3f08e339122af4c2cea93a70ed753ebcd6f30c0eb2ef1faefcffb9f2a7
+EBUILD ebtables-2.0.9.2-r2.ebuild 2170 RMD160 460a5618124c0920fc057a407b19c72cd79ea7c1 SHA1 3c023a86810294eef3f2e7dff988913e5d0312c3 SHA256 ddd1998b6a45b97ddeece7b9ebb4e6252d77e99a246f5e847b8237eea4d193b3
+MISC ChangeLog 7186 RMD160 c47710425aa462cf2270838603c3f34988f014a0 SHA1 792ac5c5bae98a7908d68dc40f23472a66faa3e7 SHA256 9290ff9443ef791169cb1a61259481f5c6243fe4b77676d1484e560505dbfe9d
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
index 97aad4c6f6ab..dc07c939668d 100644
--- a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/05/19 10:29:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild,v 1.2 2011/06/22 18:30:24 pva Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${PN}-v2.0.9-2-compilation.patch" #370953
 
 	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
 		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
@@ -44,6 +45,10 @@ src_compile() {
 	# This package uses _init functions to initialise extensions. With
 	# --as-needed this will not work.
 	append-ldflags $(no-as-needed)
+	# This package correctly aliases pointers, but gcc is unable to know that:
+	# unsigned char ip[4];
+	# if (*((uint32_t*)ip) == 0) {
+	append-cflags -Wno-strict-aliasing
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-2-compilation.patch b/net-firewall/ebtables/files/ebtables-v2.0.9-2-compilation.patch
new file mode 100644
index 000000000000..38970d2904b6
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-2-compilation.patch
@@ -0,0 +1,35 @@
+http://ebtables.cvs.sourceforge.net/viewvc/ebtables/ebtables2/userspace/ebtables2/Makefile?r1=1.62&r2=1.63
+
+--- Makefile	2010/03/18 08:58:44	1.62
++++ Makefile	2011/06/19 11:35:21	1.63
+@@ -82,11 +82,10 @@
+ ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h
+ 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
+ 
+-.PHONY: libebtc
+-libebtc: $(OBJECTS2)
++libebtc.so: $(OBJECTS2)
+ 	$(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
+ 
+-ebtables: $(OBJECTS) ebtables-standalone.o libebtc
++ebtables: $(OBJECTS) ebtables-standalone.o libebtc.so
+ 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ 	-Wl,-rpath,$(LIBDIR)
+ 
+@@ -96,14 +95,14 @@
+ ebtablesd.o: ebtablesd.c include/ebtables_u.h
+ 	$(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@  -I$(KERNEL_INCLUDES)
+ 
+-ebtablesd: $(OBJECTS) ebtablesd.o libebtc
++ebtablesd: $(OBJECTS) ebtablesd.o libebtc.so
+ 	$(CC) $(CFLAGS) -o $@ ebtablesd.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ 	-Wl,-rpath,$(LIBDIR)
+ 
+ ebtables-restore.o: ebtables-restore.c include/ebtables_u.h
+ 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
+ 
+-ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
++ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc.so
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ 	-Wl,-rpath,$(LIBDIR)
+