xtables-addons-dkms: Updated to support kernels >~3.17, disabled xt_ECHO (example module, breaks build)

4 files changed, 42 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0780f52dabc8..7b7e99984dda 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.6
-	pkgrel = 1
+	pkgver = 2.7
+	pkgrel = 4
 	url = http://xtables-addons.sourceforge.net/
 	install = xtables-addons-dkms.install
 	arch = i686
@@ -23,10 +23,10 @@ pkgbase = xtables-addons-dkms
 	replaces = xtables-addons-multikernel
 	source = dkms.conf
 	source = make.sh
-	source = http://download.sourceforge.net/project/xtables-addons/Xtables-addons/2.6/xtables-addons-2.6.tar.xz
-	sha512sums = bb5e7eff3e402dc0561d917d67af540fb405b2a404dd16a3d553610c7197c4741a583007a97d0ca380b727dc45a818c29ec34996581e1e14dfe1657ee2d17d7a
-	sha512sums = d1e917ac3c15ea8a533686781f6989ef648786f7a6666d06739c96d37debdc44bd2449c332db6e30af0f655540d1df49d4f5b702da4731aa7d550204ac908333
-	sha512sums = e493c7a6e6512f8240d211b4ba5bb9ed705fcef604dca4b2ade717dd45046464087250b4057d9b66c94de92e090c0269e47e2cf665362bfe620b3a942d83d10d
+	source = http://download.sourceforge.net/project/xtables-addons/Xtables-addons/xtables-addons-2.7.tar.xz
+	sha512sums = 428fea77c2df17778f6773ffbfcd9c57f91ce466eda2bdece2822ab2402541e4bff41888f4118e9e8da25f44967e978a2b378d07148f0f7edd672f99777dbd2b
+	sha512sums = b6ebf96d02f919522861205cd17d3a75e5890f7e50cb258689ffca8b4036e77a6e018893fe3ba2ad8ffcee13b6335080b46970486a49983ce0764e8d6fef4a02
+	sha512sums = 69c371b8bb5e464a4514dd432027be88a0ad5ab343bbe8c1f3cc2150f86e5a811de7a5d8fee2688499e5e49ac1dc275520eeae9afeeb51ec1cfaacc57892954a
 
 pkgname = xtables-addons-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 58f04d746fdc..db087106bc56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Lubomir Krajcovic <lubomir.krajcovic(AT)gmail(DOT)com>
 # Contributor: Vladimir Kutyavin <vlkut(AT)bk(DOT)ru>
 pkgname=xtables-addons-dkms
-pkgver=2.6
-pkgrel=1
+pkgver=2.7
+pkgrel=4
 pkgdesc="Successor to patch-o-matic(-ng). Contains extensions that were not accepted in the main Xtables. DKMS flavor for kernels >= 3.7."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,25 +14,31 @@ conflicts=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 replaces=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 source=(dkms.conf
         make.sh
-        http://download.sourceforge.net/project/xtables-addons/Xtables-addons/$pkgver/xtables-addons-$pkgver.tar.xz)
-sha512sums=('bb5e7eff3e402dc0561d917d67af540fb405b2a404dd16a3d553610c7197c4741a583007a97d0ca380b727dc45a818c29ec34996581e1e14dfe1657ee2d17d7a'
-            'd1e917ac3c15ea8a533686781f6989ef648786f7a6666d06739c96d37debdc44bd2449c332db6e30af0f655540d1df49d4f5b702da4731aa7d550204ac908333'
-            'e493c7a6e6512f8240d211b4ba5bb9ed705fcef604dca4b2ade717dd45046464087250b4057d9b66c94de92e090c0269e47e2cf665362bfe620b3a942d83d10d')
+        http://download.sourceforge.net/project/xtables-addons/Xtables-addons/xtables-addons-$pkgver.tar.xz)
+sha512sums=('428fea77c2df17778f6773ffbfcd9c57f91ce466eda2bdece2822ab2402541e4bff41888f4118e9e8da25f44967e978a2b378d07148f0f7edd672f99777dbd2b'
+            'b6ebf96d02f919522861205cd17d3a75e5890f7e50cb258689ffca8b4036e77a6e018893fe3ba2ad8ffcee13b6335080b46970486a49983ce0764e8d6fef4a02'
+            '69c371b8bb5e464a4514dd432027be88a0ad5ab343bbe8c1f3cc2150f86e5a811de7a5d8fee2688499e5e49ac1dc275520eeae9afeeb51ec1cfaacc57892954a')
 install=$pkgname.install
 
 package() {
 	# go to builddir
 	cd "${srcdir}/xtables-addons-${pkgver}"
+	
 	# 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
+	
 	# prepare dkms build tree
-	dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}-${pkgrel}/"
-	mkdir -p "${dkmsDst}"
-	cp -R . "${dkmsDst}"
+	dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}-${pkgrel}"
+	mkdir -p "${dkmsDst}/"
+	cp -R . "${dkmsDst}/"
+	
 	# prepare dkms config
-	cp "${srcdir}/make.sh" "${dkmsDst}"
-	cp "${srcdir}/dkms.conf" "${dkmsDst}"
-	sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${dkmsDst}dkms.conf"
+	cp "${srcdir}/make.sh" "${dkmsDst}/"
+	cp "${srcdir}/dkms.conf" "${dkmsDst}/"
+	sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${dkmsDst}/dkms.conf"
+	
 	# build userspace parts
 	./autogen.sh
 	./configure \
diff --git a/dkms.conf b/dkms.conf
index 2f324ae04bcd..723da31a6873 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -37,58 +37,59 @@ BUILT_MODULE_NAME[7]="xt_DNETMAP"
 BUILT_MODULE_LOCATION[7]="extensions"
 DEST_MODULE_LOCATION[7]="/extramodules"
 
-BUILT_MODULE_NAME[8]="xt_ECHO"
+BUILT_MODULE_NAME[8]="xt_fuzzy"
 BUILT_MODULE_LOCATION[8]="extensions"
 DEST_MODULE_LOCATION[8]="/extramodules"
 
-BUILT_MODULE_NAME[9]="xt_fuzzy"
+BUILT_MODULE_NAME[9]="xt_geoip"
 BUILT_MODULE_LOCATION[9]="extensions"
 DEST_MODULE_LOCATION[9]="/extramodules"
 
-BUILT_MODULE_NAME[10]="xt_geoip"
+BUILT_MODULE_NAME[10]="xt_iface"
 BUILT_MODULE_LOCATION[10]="extensions"
 DEST_MODULE_LOCATION[10]="/extramodules"
 
-BUILT_MODULE_NAME[11]="xt_iface"
+BUILT_MODULE_NAME[11]="xt_IPMARK"
 BUILT_MODULE_LOCATION[11]="extensions"
 DEST_MODULE_LOCATION[11]="/extramodules"
 
-BUILT_MODULE_NAME[12]="xt_IPMARK"
+BUILT_MODULE_NAME[12]="xt_ipp2p"
 BUILT_MODULE_LOCATION[12]="extensions"
 DEST_MODULE_LOCATION[12]="/extramodules"
 
-BUILT_MODULE_NAME[13]="xt_ipp2p"
+BUILT_MODULE_NAME[13]="xt_ipv4options"
 BUILT_MODULE_LOCATION[13]="extensions"
 DEST_MODULE_LOCATION[13]="/extramodules"
 
-BUILT_MODULE_NAME[14]="xt_ipv4options"
+BUILT_MODULE_NAME[14]="xt_length2"
 BUILT_MODULE_LOCATION[14]="extensions"
 DEST_MODULE_LOCATION[14]="/extramodules"
 
-BUILT_MODULE_NAME[15]="xt_length2"
+BUILT_MODULE_NAME[15]="xt_LOGMARK"
 BUILT_MODULE_LOCATION[15]="extensions"
 DEST_MODULE_LOCATION[15]="/extramodules"
 
-BUILT_MODULE_NAME[16]="xt_LOGMARK"
+BUILT_MODULE_NAME[16]="xt_lscan"
 BUILT_MODULE_LOCATION[16]="extensions"
 DEST_MODULE_LOCATION[16]="/extramodules"
 
-BUILT_MODULE_NAME[17]="xt_lscan"
+BUILT_MODULE_NAME[17]="xt_psd"
 BUILT_MODULE_LOCATION[17]="extensions"
 DEST_MODULE_LOCATION[17]="/extramodules"
 
-BUILT_MODULE_NAME[18]="xt_psd"
+BUILT_MODULE_NAME[18]="xt_quota2"
 BUILT_MODULE_LOCATION[18]="extensions"
 DEST_MODULE_LOCATION[18]="/extramodules"
 
-BUILT_MODULE_NAME[19]="xt_quota2"
+BUILT_MODULE_NAME[19]="xt_SYSRQ"
 BUILT_MODULE_LOCATION[19]="extensions"
 DEST_MODULE_LOCATION[19]="/extramodules"
 
-BUILT_MODULE_NAME[20]="xt_SYSRQ"
+BUILT_MODULE_NAME[20]="xt_TARPIT"
 BUILT_MODULE_LOCATION[20]="extensions"
 DEST_MODULE_LOCATION[20]="/extramodules"
 
-BUILT_MODULE_NAME[21]="xt_TARPIT"
-BUILT_MODULE_LOCATION[21]="extensions"
-DEST_MODULE_LOCATION[21]="/extramodules"
+# don't build xt_ECHO (example module, breaks build)
+#BUILT_MODULE_NAME[21]="xt_ECHO"
+#BUILT_MODULE_LOCATION[21]="extensions"
+#DEST_MODULE_LOCATION[21]="/extramodules"
diff --git a/make.sh b/make.sh
index 81c050baf09b..bbcce12e2577 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ case "$1" in
 		./configure --with-kbuild="${kheaders}"
 		res=$?
 		[ $res -ne 0 ] && exit $res
-		make
+		make V=1
 		exit $?
 		;;
 	*)