Updated to version 2.11

Fixed .gitignore, dropped .install file, updated dkms.conf and deps

5 files changed, 127 insertions, 168 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89f49d85af0f..5f72b547efee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
+# Generated by mksrcinfo v8
+# Thu Dec 29 12:44:35 UTC 2016
 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.8
+	pkgver = 2.11
 	pkgrel = 1
 	url = http://xtables-addons.sourceforge.net/
-	install = xtables-addons-dkms.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = iptables>=1.4.5
 	depends = dkms
-	depends = gcc
-	depends = make
-	depends = automake
-	depends = autoconf
-	depends = pkg-config
 	optdepends = perl-text-csv-xs: required for building GeoIP database
+	optdepends = unzip: required for building GeoIP database
 	conflicts = xtables-addons
 	conflicts = xtables-addons-git
 	conflicts = xtables-addons-multikernel
@@ -22,11 +18,9 @@ pkgbase = xtables-addons-dkms
 	replaces = xtables-addons-git
 	replaces = xtables-addons-multikernel
 	source = dkms.conf
-	source = make.sh
-	source = http://download.sourceforge.net/project/xtables-addons/Xtables-addons/xtables-addons-2.8.tar.xz
-	sha512sums = 428fea77c2df17778f6773ffbfcd9c57f91ce466eda2bdece2822ab2402541e4bff41888f4118e9e8da25f44967e978a2b378d07148f0f7edd672f99777dbd2b
-	sha512sums = b6ebf96d02f919522861205cd17d3a75e5890f7e50cb258689ffca8b4036e77a6e018893fe3ba2ad8ffcee13b6335080b46970486a49983ce0764e8d6fef4a02
-	sha512sums = 337a0f9f8e1236a14977b1f60f82e9f6ea4b3d1134fb4ff29cdb7edfca54501639760e8f855ac803e259660a9a5afd7366770543e2f077346cb5dda8ef80462e
+	source = https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/2.11/xtables-addons-2.11.tar.xz
+	sha256sums = 58a1ae063d61dcff8b5d68d19a828045af4b26810b471cad1461b610ac53900a
+	sha256sums = f14f8953a9d3a70157a82883886ff6ec866c61dbea1585edb421478107279921
 
 pkgname = xtables-addons-dkms
 
diff --git a/.gitignore b/.gitignore
index 426110f5cafa..b8ef329e69d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,6 @@
-*.tar
-*.tar.*
-*.jar
-*.exe
-*.msi
-*.zip
-*.tgz
-*.tbz
-*.log
-*.log.*
-*.sig
+!.gitignore
 
-pkg/
-src/
+/src
+/pkg
+*.pkg*
+*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index f468c22b7681..a7c3b4b20ab7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,25 @@
-# Maintainer: Lubomir Krajcovic <lubomir.krajcovic(AT)gmail(DOT)com>
+# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it>
+# Contributor: Lubomir Krajcovic <lubomir.krajcovic(AT)gmail(DOT)com>
 # Contributor: Vladimir Kutyavin <vlkut(AT)bk(DOT)ru>
 pkgname=xtables-addons-dkms
-pkgver=2.8
+pkgver=2.11
 pkgrel=1
 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')
 url="http://xtables-addons.sourceforge.net/"
-depends=('iptables>=1.4.5' 'dkms' 'gcc' 'make' 'automake' 'autoconf' 'pkg-config')
-optdepends=('perl-text-csv-xs: required for building GeoIP database')
+depends=('dkms')
+optdepends=('perl-text-csv-xs: required for building GeoIP database'
+            'unzip: required for building GeoIP database')
 makedepends=()
 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/xtables-addons-$pkgver.tar.xz)
-sha512sums=('428fea77c2df17778f6773ffbfcd9c57f91ce466eda2bdece2822ab2402541e4bff41888f4118e9e8da25f44967e978a2b378d07148f0f7edd672f99777dbd2b'
-            'b6ebf96d02f919522861205cd17d3a75e5890f7e50cb258689ffca8b4036e77a6e018893fe3ba2ad8ffcee13b6335080b46970486a49983ce0764e8d6fef4a02'
-            '337a0f9f8e1236a14977b1f60f82e9f6ea4b3d1134fb4ff29cdb7edfca54501639760e8f855ac803e259660a9a5afd7366770543e2f077346cb5dda8ef80462e')
-install=$pkgname.install
+        https://sourceforge.net/projects/${pkgname%-dkms}/files/Xtables-addons/${pkgver}/${pkgname%-dkms}-${pkgver}.tar.xz)
+sha256sums=('58a1ae063d61dcff8b5d68d19a828045af4b26810b471cad1461b610ac53900a'
+            'f14f8953a9d3a70157a82883886ff6ec866c61dbea1585edb421478107279921')
 
-package() {
+prepare() {
 	# go to builddir
 	cd "${srcdir}/xtables-addons-${pkgver}"
 	
@@ -29,26 +28,40 @@ package() {
 	# 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() {
+	cd "${srcdir}/xtables-addons-${pkgver}"
+
+	# build userspace parts
+    ./autogen.sh
+
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --bindir=/usr/bin \
+        --sbindir=/usr/bin \
+        --libdir=/usr/lib \
+        --mandir=/usr/share/man \
+        --docdir=/usr/share/doc \
+        --libexecdir=/usr/lib/iptables \
+        --with-xtlibdir=/usr/lib/iptables \
+		--without-kbuild
+
+	make
+}
+
+package() {
+	cd "${srcdir}/xtables-addons-${pkgver}"
+
 	# prepare dkms build tree
-	dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}-${pkgrel}"
+	dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}"
 	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"
-	
-	# build userspace parts
-	./autogen.sh
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--libexecdir=/usr/lib/iptables \
-		--sysconfdir=/etc \
-		--with-xtlibdir=/usr/lib/iptables \
-		--mandir=/usr/share/man \
-		--without-kbuild
-	make || return 1
-	make DESTDIR="${pkgdir}" install || return 1
+	sed -i -e "s/@VERSION@/${pkgver}/" "${dkmsDst}/dkms.conf"
+
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/dkms.conf b/dkms.conf
index 723da31a6873..0bc1116adb6d 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,95 +1,102 @@
-PACKAGE_NAME="xtables-addons"
 PACKAGE_VERSION="@VERSION@"
+
+# Items below here should not have to change with each driver version
+
+PACKAGE_NAME="xtables-addons"
+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} \;"
+
 AUTOINSTALL="yes"
-CLEAN="sh make.sh clean"
-MAKE[0]="sh make.sh make $kernelver"
 
-# per module configs
+# Automatically generated rules below
+####
+
+BUILT_MODULE_LOCATION[0]=""
 BUILT_MODULE_NAME[0]="xt_ACCOUNT"
-BUILT_MODULE_LOCATION[0]="extensions/ACCOUNT"
-DEST_MODULE_LOCATION[0]="/extramodules"
+DEST_MODULE_LOCATION[0]="/updates"
 
-BUILT_MODULE_NAME[1]="xt_pknock"
-BUILT_MODULE_LOCATION[1]="extensions/pknock"
-DEST_MODULE_LOCATION[1]="/extramodules"
+BUILT_MODULE_LOCATION[1]=""
+BUILT_MODULE_NAME[1]="compat_xtables"
+DEST_MODULE_LOCATION[1]="/updates"
 
-BUILT_MODULE_NAME[2]="compat_xtables"
-BUILT_MODULE_LOCATION[2]="extensions"
-DEST_MODULE_LOCATION[2]="/extramodules"
+BUILT_MODULE_LOCATION[2]=""
+BUILT_MODULE_NAME[2]="xt_pknock"
+DEST_MODULE_LOCATION[2]="/updates"
 
+BUILT_MODULE_LOCATION[3]=""
 BUILT_MODULE_NAME[3]="xt_CHAOS"
-BUILT_MODULE_LOCATION[3]="extensions"
-DEST_MODULE_LOCATION[3]="/extramodules"
+DEST_MODULE_LOCATION[3]="/updates"
 
-BUILT_MODULE_NAME[4]="xt_condition"
-BUILT_MODULE_LOCATION[4]="extensions"
-DEST_MODULE_LOCATION[4]="/extramodules"
+BUILT_MODULE_LOCATION[4]=""
+BUILT_MODULE_NAME[4]="xt_DELUDE"
+DEST_MODULE_LOCATION[4]="/updates"
 
-BUILT_MODULE_NAME[5]="xt_DELUDE"
-BUILT_MODULE_LOCATION[5]="extensions"
-DEST_MODULE_LOCATION[5]="/extramodules"
+BUILT_MODULE_LOCATION[5]=""
+BUILT_MODULE_NAME[5]="xt_DHCPMAC"
+DEST_MODULE_LOCATION[5]="/updates"
 
-BUILT_MODULE_NAME[6]="xt_DHCPMAC"
-BUILT_MODULE_LOCATION[6]="extensions"
-DEST_MODULE_LOCATION[6]="/extramodules"
+BUILT_MODULE_LOCATION[6]=""
+BUILT_MODULE_NAME[6]="xt_DNETMAP"
+DEST_MODULE_LOCATION[6]="/updates"
 
-BUILT_MODULE_NAME[7]="xt_DNETMAP"
-BUILT_MODULE_LOCATION[7]="extensions"
-DEST_MODULE_LOCATION[7]="/extramodules"
+BUILT_MODULE_LOCATION[7]=""
+BUILT_MODULE_NAME[7]="xt_IPMARK"
+DEST_MODULE_LOCATION[7]="/updates"
 
-BUILT_MODULE_NAME[8]="xt_fuzzy"
-BUILT_MODULE_LOCATION[8]="extensions"
-DEST_MODULE_LOCATION[8]="/extramodules"
+BUILT_MODULE_LOCATION[8]=""
+BUILT_MODULE_NAME[8]="xt_LOGMARK"
+DEST_MODULE_LOCATION[8]="/updates"
 
-BUILT_MODULE_NAME[9]="xt_geoip"
-BUILT_MODULE_LOCATION[9]="extensions"
-DEST_MODULE_LOCATION[9]="/extramodules"
+BUILT_MODULE_LOCATION[9]=""
+BUILT_MODULE_NAME[9]="xt_SYSRQ"
+DEST_MODULE_LOCATION[9]="/updates"
 
-BUILT_MODULE_NAME[10]="xt_iface"
-BUILT_MODULE_LOCATION[10]="extensions"
-DEST_MODULE_LOCATION[10]="/extramodules"
+BUILT_MODULE_LOCATION[10]=""
+BUILT_MODULE_NAME[10]="xt_TARPIT"
+DEST_MODULE_LOCATION[10]="/updates"
 
-BUILT_MODULE_NAME[11]="xt_IPMARK"
-BUILT_MODULE_LOCATION[11]="extensions"
-DEST_MODULE_LOCATION[11]="/extramodules"
+BUILT_MODULE_LOCATION[11]=""
+BUILT_MODULE_NAME[11]="xt_condition"
+DEST_MODULE_LOCATION[11]="/updates"
 
-BUILT_MODULE_NAME[12]="xt_ipp2p"
-BUILT_MODULE_LOCATION[12]="extensions"
-DEST_MODULE_LOCATION[12]="/extramodules"
+BUILT_MODULE_LOCATION[12]=""
+BUILT_MODULE_NAME[12]="xt_fuzzy"
+DEST_MODULE_LOCATION[12]="/updates"
 
-BUILT_MODULE_NAME[13]="xt_ipv4options"
-BUILT_MODULE_LOCATION[13]="extensions"
-DEST_MODULE_LOCATION[13]="/extramodules"
+BUILT_MODULE_LOCATION[13]=""
+BUILT_MODULE_NAME[13]="xt_geoip"
+DEST_MODULE_LOCATION[13]="/updates"
 
-BUILT_MODULE_NAME[14]="xt_length2"
-BUILT_MODULE_LOCATION[14]="extensions"
-DEST_MODULE_LOCATION[14]="/extramodules"
+BUILT_MODULE_LOCATION[14]=""
+BUILT_MODULE_NAME[14]="xt_iface"
+DEST_MODULE_LOCATION[14]="/updates"
 
-BUILT_MODULE_NAME[15]="xt_LOGMARK"
-BUILT_MODULE_LOCATION[15]="extensions"
-DEST_MODULE_LOCATION[15]="/extramodules"
+BUILT_MODULE_LOCATION[15]=""
+BUILT_MODULE_NAME[15]="xt_ipp2p"
+DEST_MODULE_LOCATION[15]="/updates"
 
-BUILT_MODULE_NAME[16]="xt_lscan"
-BUILT_MODULE_LOCATION[16]="extensions"
-DEST_MODULE_LOCATION[16]="/extramodules"
+BUILT_MODULE_LOCATION[16]=""
+BUILT_MODULE_NAME[16]="xt_ipv4options"
+DEST_MODULE_LOCATION[16]="/updates"
 
-BUILT_MODULE_NAME[17]="xt_psd"
-BUILT_MODULE_LOCATION[17]="extensions"
-DEST_MODULE_LOCATION[17]="/extramodules"
+BUILT_MODULE_LOCATION[17]=""
+BUILT_MODULE_NAME[17]="xt_length2"
+DEST_MODULE_LOCATION[17]="/updates"
 
-BUILT_MODULE_NAME[18]="xt_quota2"
-BUILT_MODULE_LOCATION[18]="extensions"
-DEST_MODULE_LOCATION[18]="/extramodules"
+BUILT_MODULE_LOCATION[18]=""
+BUILT_MODULE_NAME[18]="xt_lscan"
+DEST_MODULE_LOCATION[18]="/updates"
 
-BUILT_MODULE_NAME[19]="xt_SYSRQ"
-BUILT_MODULE_LOCATION[19]="extensions"
-DEST_MODULE_LOCATION[19]="/extramodules"
+BUILT_MODULE_LOCATION[19]=""
+BUILT_MODULE_NAME[19]="xt_psd"
+DEST_MODULE_LOCATION[19]="/updates"
 
-BUILT_MODULE_NAME[20]="xt_TARPIT"
-BUILT_MODULE_LOCATION[20]="extensions"
-DEST_MODULE_LOCATION[20]="/extramodules"
+BUILT_MODULE_LOCATION[20]=""
+BUILT_MODULE_NAME[20]="xt_quota2"
+DEST_MODULE_LOCATION[20]="/updates"
 
-# don't build xt_ECHO (example module, breaks build)
+#BUILT_MODULE_LOCATION[21]=""
 #BUILT_MODULE_NAME[21]="xt_ECHO"
-#BUILT_MODULE_LOCATION[21]="extensions"
-#DEST_MODULE_LOCATION[21]="/extramodules"
+#DEST_MODULE_LOCATION[21]="/updates"
diff --git a/make.sh b/make.sh
deleted file mode 100755
index bbcce12e2577..000000000000
--- a/make.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 Lubomir Krajcovic <lubomir.krajcovic@gmail.com>
-#
-# This file is free software.
-# You can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 or later.
-# This software is  distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY of any kind.
-#
-
-# param #1 is the action
-case "$1" in
-	'clean')
-		if [ -f ./Makefile ]; then
-			make clean
-			exit $?
-		fi
-		;;
-	'make')
-		# param #2 is the `uname -r` for desired kernel
-		kernver="$2"
-		kheaders="/usr/lib/modules/$kernver/build"
-		# check headers
-		if [ -z "${kernver}" ]; then
-			echo "Cannot build, need kernel version, e.g. your current: `uname -r`"
-			exit 1
-		fi
-		if [ ! -d "${kheaders}" ]; then
-			echo "Cannot build for kernel $kernver, missing headers: $kheaders"
-			exit 1
-		fi
-		# call automation friends
-		./autogen.sh
-		# build
-		./configure --with-kbuild="${kheaders}"
-		res=$?
-		[ $res -ne 0 ] && exit $res
-		make V=1
-		exit $?
-		;;
-	*)
-		echo -e "Usage:\n$0 [ clean | make <kerner-version> ]"
-		exit 1
-		;;
-esac