Accepting request 327847 from home:bmwiedemann:branches:security:netfilter

- fix compilation for factory
  add include-linux-if.patch 0001-fix-compilation-warning.patch

OBS-URL: https://build.opensuse.org/request/show/327847
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=37

0001-fix-compilation-warning.patch

@@ -0,0 +1,25 @@
+From 146f762e1b4be613fad4b045c67974c000742647 Mon Sep 17 00:00:00 2001
+From: Petri Gynther <petri.gynther@gmail.com>
+Date: Sun, 24 Feb 2013 10:56:59 +0100
+Subject: [PATCH 1/9] fix compilation warning
+
+---
+ communication.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/communication.c b/communication.c
+index 62ed667..ba058c0 100644
+--- a/communication.c
++++ b/communication.c
+@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl)
+ 	}
+ close_file:
+ 	fclose(file);
+-	return 0;
++	return ret;
+ }
+ 
+ /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel
+-- 
+2.1.4
+

ebtables.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Aug 29 15:07:16 UTC 2015 - bwiedemann@suse.com
+
+- fix compilation
+  add include-linux-if.patch 0001-fix-compilation-warning.patch
+
 -------------------------------------------------------------------
 Tue Jun 16 11:19:33 UTC 2015 - kstreitova@suse.com
 

ebtables.spec

@@ -30,6 +30,10 @@ Patch0:         %name-v2.0.8-makefile.diff
 Patch1:         %name-v2.0.8-initscript.diff
 # PATCH-FIX-UPSTREAM bnc#934680 kstreitova@suse.com -- audit patch for CC certification
 Patch2:         ebtables-v2.0.10-4-audit.patch
+# PATCH-FIX-UPSTREAM 
+Patch3:         0001-fix-compilation-warning.patch
+# PATCH-FIX-SUSE-ONLY
+Patch4:         include-linux-if.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  linux-glibc-devel >= 2.6.20
 BuildRequires:  sed
@@ -46,10 +50,8 @@ iptables. There are no incompatibility issues.
 %setup -q -n %name-v2.0.10-4
 %patch -P 0 -P 1 -p0
 %patch2 -p1
-
+%patch3 -p1
-%build
+%patch4 -p1
-# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
-export SUSE_ASNEEDED=0
 # delete all kernel headers, but keep ebt_ip6.h and ebt_nflog.h
 mv include/linux/netfilter_bridge/ebt_ip6.{h,h.save}
 mv include/linux/netfilter_bridge/ebt_nflog.{h,h.save}
@@ -59,6 +61,10 @@ rm -f include/linux/netfilter_bridge/*.h
 mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h}
 mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
 mv include/linux/netfilter_bridge/ebt_ulog.{h.save,h}
+
+%build
+# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
+export SUSE_ASNEEDED=0
 make \
     CFLAGS="%optflags" \
     CXXFLAGS="%optflags" \

include-linux-if.patch

@@ -0,0 +1,12 @@
+diff --git a/include/ebtables_u.h b/include/ebtables_u.h
+index 35a5bcc..f120eb8 100644
+--- a/include/ebtables_u.h
++++ b/include/ebtables_u.h
+@@ -24,6 +24,7 @@
+ #ifndef EBTABLES_U_H
+ #define EBTABLES_U_H
+ #include <netinet/in.h>
++#include <linux/if.h>
+ #include <linux/netfilter_bridge/ebtables.h>
+ #include <linux/netfilter/x_tables.h>
+