- fix building with kernel 4.14

- rel 2

diff --git a/kernel-4.14.patch b/kernel-4.14.patch
new file mode 100644 (file)
index 0000000..74aa60a
--- /dev/null
+++ b/kernel-4.14.patch
@@ -0,0 +1,14 @@
+--- xtables-addons-2.13/extensions/xt_DNETMAP.c~       2017-06-29 14:46:37.000000000 +0200
++++ xtables-addons-2.13/extensions/xt_DNETMAP.c        2017-11-16 10:15:47.371793222 +0100
+@@ -377,9 +377,9 @@
+       unsigned int hooknum = par->hooknum;
+ #endif
+ 
+-      NF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING ||
++      WARN_ON(!(hooknum == NF_INET_POST_ROUTING ||
+                    hooknum == NF_INET_LOCAL_OUT ||
+-                   hooknum == NF_INET_PRE_ROUTING);
++                   hooknum == NF_INET_PRE_ROUTING));
+       ct = nf_ct_get(skb, &ctinfo);
+ 
+       jttl = tginfo->flags & XT_DNETMAP_TTL ? tginfo->ttl * HZ : jtimeout;

diff --git a/xtables-addons.spec b/xtables-addons.spec
index e24cafb8002f49a177d9c1840feb7166fe469323..99f420c9e1e74f5800cff0f08a8e2afd1e81be9b 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -21,7 +21,7 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                pname   xtables-addons
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
@@ -32,6 +32,7 @@ License:      GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
 # Source0-md5: be20b0b9c4b001b364431a836e361d33
+Patch0:                kernel-4.14.patch
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -110,6 +111,7 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %configure \