pool/linux-glibc-devel
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 644358 from home:jirislaby:branches:Base:System

Browse Source 
- fix netfilter builds with 4.19
  * add netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch

OBS-URL: https://build.opensuse.org/request/show/644358
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=134
This commit is contained in:
Dirk Mueller 2018-10-24 18:18:06 +00:00 committed by Git OBS Bridge
parent 7ea4d014d4
commit 83e8212566
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-glibc-devel.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 24 14:51:55 UTC 2018 - Jiri Slaby <jslaby@suse.cz>
- 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

4
linux-glibc-devel.spec
View File

@ -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

46
netfilter-bridge-define-INT_MIN-INT_MAX-in-userspace.patch Normal file
View File

@ -0,0 +1,46 @@
From: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
Cc: Máté Eckl <ecklm94@gmail.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
---
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 <linux/if_vlan.h>
#include <linux/if_pppox.h>
+#include <limits.h> /* for INT_MIN, INT_MAX */
+
/* Bridge Hooks */
/* After promisc drops, checksum checks. */
#define NF_BR_PRE_ROUTING 0
--
2.19.1