[prev in list] [next in list] [prev in thread] [next in thread] 

List:       opensuse-commit
Subject:    commit ebtables for openSUSE:Factory
From:       root () hilbert ! suse ! de (h_root)
Date:       2015-08-31 20:59:35
Message-ID: 20150831205935.21520AE037 () hilbert ! suse ! de
[Download RAW message or body]

Hello community,

here is the log from the commit of package ebtables for openSUSE:Factory checked in \
at 2015-08-31 22:59:33 \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing \
/work/SRC/openSUSE:Factory/ebtables (Old)  and      \
/work/SRC/openSUSE:Factory/.ebtables.new (New) \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ebtables"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes	2015-06-23 \
                12:00:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes	2015-08-31 \
22:59:34.000000000 +0200 @@ -1,0 +2,6 @@
+Sat Aug 29 15:07:16 UTC 2015 - bwiedemann@suse.com
+
+- fix compilation
+  add include-linux-if.patch 0001-fix-compilation-warning.patch
+
+-------------------------------------------------------------------

New:
----
  0001-fix-compilation-warning.patch
  include-linux-if.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ebtables.spec ++++++
--- /var/tmp/diff_new_pack.A92uIX/_old	2015-08-31 22:59:35.000000000 +0200
+++ /var/tmp/diff_new_pack.A92uIX/_new	2015-08-31 22:59:35.000000000 +0200
@@ -30,6 +30,10 @@
 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 @@
 %setup -q -n %name-v2.0.10-4
 %patch -P 0 -P 1 -p0
 %patch2 -p1
-
-%build
-# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
-export SUSE_ASNEEDED=0
+%patch3 -p1
+%patch4 -p1
 # 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 @@
 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" \

++++++ 0001-fix-compilation-warning.patch ++++++
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

++++++ include-linux-if.patch ++++++
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>
 


[prev in list] [next in list] [prev in thread] [next in thread]