Update to v3.0. Drop support for kernel < 4.15

4 files changed, 12 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a7b1ccb3209..3f02c1ab9b48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xtables-addons-dkms
-	pkgdesc = Successor to patch-o-matic(-ng). Contains extensions that were not accepted in the main Xtables. DKMS flavor for kernels >= 3.7.
-	pkgver = 2.14
-	pkgrel = 2
+	pkgdesc = Successor to patch-o-matic(-ng). Contains extensions that were not accepted in the main Xtables. DKMS flavor for kernels >= 4.15.
+	pkgver = 3.0
+	pkgrel = 1
 	url = http://xtables-addons.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -16,11 +16,9 @@ pkgbase = xtables-addons-dkms
 	replaces = xtables-addons-git
 	replaces = xtables-addons-multikernel
 	source = dkms.conf
-	source = kernel-4.15.patch
-	source = https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/xtables-addons-2.14.tar.xz
-	sha256sums = c8989ec1ab0c3aaebf557fd19bc0391173a77fb5e7f8b3afc63d3f6593b3b5af
-	sha256sums = 3cc007d8faa0025e0c2d748b3eb516ad31acbb6781e88efb0b6a7bf0b280db71
-	sha256sums = d215a9a8b8e66aae04b982fa2e1228e8a71e7dfe42320df99e34e5000cbdf152
+	source = https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/xtables-addons-3.0.tar.xz
+	sha256sums = 4183417465250d1f2b78cf347f36f2d52ca089f6b2f489f9ea9de36a736d8fc4
+	sha256sums = 95580b851c79c0bbc484e0d0ea23f53e5c7f439ad73d509e426598565392690d
 
 pkgname = xtables-addons-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 55f1b95df528..9e2404e8d307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Lubomir Krajcovic <lubomir.krajcovic(AT)gmail(DOT)com>
 # Contributor: Vladimir Kutyavin <vlkut(AT)bk(DOT)ru>
 pkgname=xtables-addons-dkms
-pkgver=2.14
-pkgrel=2
-pkgdesc="Successor to patch-o-matic(-ng). Contains extensions that were not accepted in the main Xtables. DKMS flavor for kernels >= 3.7."
+pkgver=3.0
+pkgrel=1
+pkgdesc="Successor to patch-o-matic(-ng). Contains extensions that were not accepted in the main Xtables. DKMS flavor for kernels >= 4.15."
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://xtables-addons.sourceforge.net/"
@@ -16,22 +16,18 @@ makedepends=()
 conflicts=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 replaces=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 source=(dkms.conf
-        kernel-4.15.patch
         https://sourceforge.net/projects/${pkgname%-dkms}/files/Xtables-addons/${pkgname%-dkms}-${pkgver}.tar.xz)
-sha256sums=('c8989ec1ab0c3aaebf557fd19bc0391173a77fb5e7f8b3afc63d3f6593b3b5af'
-            '3cc007d8faa0025e0c2d748b3eb516ad31acbb6781e88efb0b6a7bf0b280db71'
-            'd215a9a8b8e66aae04b982fa2e1228e8a71e7dfe42320df99e34e5000cbdf152')
+sha256sums=('4183417465250d1f2b78cf347f36f2d52ca089f6b2f489f9ea9de36a736d8fc4'
+            '95580b851c79c0bbc484e0d0ea23f53e5c7f439ad73d509e426598565392690d')
 
 prepare() {
 	# go to builddir
 	cd "${srcdir}/xtables-addons-${pkgver}"
-	patch -p1 -i ../kernel-4.15.patch
 	
 	# disable install-exec-hook (avoids useless calling of depmod -a at 'make install' stage)
 	sed -i 's/^install-exec-hook:$/dont-run:/' Makefile.am
 	# disable building of xt_ECHO (it's an example module, and it breaks the build)
 	sed -i 's/^build_ECHO=.*$/build_ECHO=n/' mconfig
-	
 }
 
 build() {
diff --git a/dkms.conf b/dkms.conf
index 0bc1116adb6d..98e007fe4b03 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -7,6 +7,7 @@ BDIR="$dkms_tree/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
 MAKEARGS=" -C $kernel_source_dir M=${BDIR}/extensions XA_ABSTOPSRCDIR=${BDIR} XA_TOPSRCDIR=${BDIR} V=1"
 CLEAN="make ${MAKEARGS} clean"
 MAKE="make ${MAKEARGS} modules ; find ${BDIR} -name '*.ko' -exec mv -v {} ${BDIR} \;"
+BUILD_EXCLUSIVE_KERNEL="^4\.1[5-9]"
 
 AUTOINSTALL="yes"
 
diff --git a/kernel-4.15.patch b/kernel-4.15.patch
deleted file mode 100644
index 72d4bc85cc19..000000000000
--- a/kernel-4.15.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/doc/changelog.txt b/doc/changelog.txt
-index e3f421f..770ac06 100644
---- a/doc/changelog.txt
-+++ b/doc/changelog.txt
-@@ -1,6 +1,8 @@
- 
- HEAD
- ====
-+Enhancements:
-+- support for Linux up to 4.15
- 
- 
- v2.14 (2017-11-22)
-diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
-index d8882ac..354884e 100644
---- a/extensions/compat_xtables.h
-+++ b/extensions/compat_xtables.h
-@@ -93,4 +93,8 @@ static inline struct net *par_net(const struct xt_action_param *par)
- #endif
- }
- 
-+#ifndef NF_CT_ASSERT
-+#	define NF_CT_ASSERT(x)	WARN_ON(!(x))
-+#endif
-+
- #endif /* _XTABLES_COMPAT_H */
-diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
-index 6fbdea4..3f47d9b 100644
---- a/extensions/pknock/xt_pknock.c
-+++ b/extensions/pknock/xt_pknock.c
-@@ -357,11 +357,18 @@ has_logged_during_this_minute(const struct peer *peer)
-  *
-  * @r: rule
-  */
--static void
--peer_gc(unsigned long r)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static void peer_gc(struct timer_list *tl)
-+#else
-+static void peer_gc(unsigned long r)
-+#endif
- {
- 	unsigned int i;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+	struct xt_pknock_rule *rule = from_timer(rule, tl, timer);
-+#else
- 	struct xt_pknock_rule *rule = (struct xt_pknock_rule *)r;
-+#endif
- 	struct peer *peer;
- 	struct list_head *pos, *n;
- 
-@@ -469,9 +476,13 @@ add_rule(struct xt_pknock_mtinfo *info)
- 	if (rule->peer_head == NULL)
- 		goto out;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+	timer_setup(&rule->timer, peer_gc, 0);
-+#else
- 	init_timer(&rule->timer);
- 	rule->timer.function	= peer_gc;
- 	rule->timer.data	= (unsigned long)rule;
-+#endif
- 
- 	rule->status_proc = proc_create_data(info->rule_name, 0, pde,
- 	                    &pknock_proc_ops, rule);