From 4a6f4b925083fbf5669e5a075c82717825419555 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 27 Sep 2015 18:40:06 +0200 Subject: [PATCH] - up to 2.8 --- linux-4.1.patch | 54 --------------------------------------------- xtables-addons.spec | 6 ++--- 2 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 linux-4.1.patch diff --git a/linux-4.1.patch b/linux-4.1.patch deleted file mode 100644 index 77cf1d2..0000000 --- a/linux-4.1.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/extensions/xt_TARPIT.c 2014-09-29 03:33:13.000000000 -0500 -+++ b/extensions/xt_TARPIT.c 2015-06-29 11:38:26.582851153 -0500 -@@ -250,7 +250,11 @@ - - #ifdef CONFIG_BRIDGE_NETFILTER - if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL && -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) - nskb->nf_bridge->mask & BRNF_BRIDGED)) -+#else -+ nskb->nf_bridge->physoutdev)) -+#endif - #else - if (hook != NF_INET_FORWARD) - #endif -@@ -279,7 +279,12 @@ - - nf_ct_attach(nskb, oldskb); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) - NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb, NULL, - skb_dst(nskb)->dev, dst_output); -+#else -+ NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, NULL, nskb, NULL, -+ skb_dst(nskb)->dev, dst_output_sk); -+#endif - return; - -@@ -394,7 +394,12 @@ - - nf_ct_attach(nskb, oldskb); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) - NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb, NULL, - skb_dst(nskb)->dev, dst_output); -+#else -+ NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, NULL, nskb, NULL, -+ skb_dst(nskb)->dev, dst_output_sk); -+#endif - return; - ---- a/extensions/xt_DELUDE.c 2014-09-29 03:33:13.000000000 -0500 -+++ b/extensions/xt_DELUDE.c 2015-06-29 10:10:00.622867945 -0500 -@@ -107,7 +107,11 @@ - addr_type = RTN_UNSPEC; - #ifdef CONFIG_BRIDGE_NETFILTER - if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL && -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) - nskb->nf_bridge->mask & BRNF_BRIDGED)) -+#else -+ nskb->nf_bridge->physoutdev)) -+#endif - #else - if (hook != NF_INET_FORWARD) - #endif diff --git a/xtables-addons.spec b/xtables-addons.spec index e9061ca..7ef038b 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -26,13 +26,12 @@ exit 1 Summary: Additional extensions for xtables packet filtering system Summary(pl.UTF-8): Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 2.6 +Version: 2.8 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Networking/Admin Source0: http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz -# Source0-md5: 087835ba7e564481b6fd398692268340 -Patch0: linux-4.1.patch +# Source0-md5: 246ec2f1f75c32c6e04ae9ae75b578c9 URL: http://xtables-addons.sourceforge.net/ BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1:1.11 @@ -111,7 +110,6 @@ done\ %prep %setup -q -n %{pname}-%{version} -%patch0 -p1 %build %configure \ -- 2.43.0