diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index e578f7f..9be533e 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 24 14:51:55 UTC 2018 - Jiri Slaby + +- fix netfilter builds with 4.19 + * add netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch + ------------------------------------------------------------------- Mon Oct 22 09:18:57 UTC 2018 - schwab@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 80703bd..17a5291 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -25,6 +25,7 @@ Group: Development/Libraries/C and C++ URL: http://www.kernel.org/ Source: %{name}-%{version}.tar.xz Source1: install_all.sh +Patch0: netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch BuildRequires: fdupes BuildRequires: xz # rpm-build requires gettext-tools; ignore this, in order to shorten cycles (we have no translations) @@ -46,6 +47,7 @@ packages, instead. %prep %setup -q -n linux-glibc-devel-%{version} +%autopatch -p1 %build cat > version.h <<\BOGUS diff --git a/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch b/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch new file mode 100644 index 0000000..fc00995 --- /dev/null +++ b/netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch @@ -0,0 +1,46 @@ +From: Jiri Slaby +Date: Wed, 24 Oct 2018 12:36:28 +0200 +Subject: netfilter: bridge: define INT_MIN & INT_MAX in userspace +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Patch-mainline: submitted on 2018/10/24 +References: 4.19 fixes + +With 4.19, programs like ebtables fail to build when they include +"linux/netfilter_bridge.h". It is caused by commit 94276fa8a2a4 which +added a use of INT_MIN and INT_MAX to the header: +: In file included from /usr/include/linux/netfilter_bridge/ebtables.h:18, +: from include/ebtables_u.h:28, +: from communication.c:23: +: /usr/include/linux/netfilter_bridge.h:30:20: error: 'INT_MIN' undeclared here (not in a function) +: NF_BR_PRI_FIRST = INT_MIN, +: ^~~~~~~ + +Define these constants by including "limits.h" when !__KERNEL__ (the +same way as for other netfilter_* headers). + +Fixes: 94276fa8a2a4 ("netfilter: bridge: Expose nf_tables bridge hook priorities through uapi") +Signed-off-by: Jiri Slaby +Cc: Máté Eckl +Cc: Pablo Neira Ayuso +--- + include/uapi/linux/netfilter_bridge.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h +index 156ccd089df1..1610fdbab98d 100644 +--- a/usr/include/linux/netfilter_bridge.h ++++ b/usr/include/linux/netfilter_bridge.h +@@ -11,6 +11,8 @@ + #include + #include + ++#include /* for INT_MIN, INT_MAX */ ++ + /* Bridge Hooks */ + /* After promisc drops, checksum checks. */ + #define NF_BR_PRE_ROUTING 0 +-- +2.19.1 +