core/xtables-addons: upgrade to 1.17. sparate -grsec modules package

3 files changed, 55 insertions, 43 deletions

diff --git a/core/xtables-addons-grsec/APKBUILD b/core/xtables-addons-grsec/APKBUILD
new file mode 100644
index 000000000..17853cede
--- /dev/null
+++ b/core/xtables-addons-grsec/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_flavor=${FLAVOR:-grsec}
+_realname=xtables-addons
+
+# source the kernel version
+if [ -f ../linux-$_flavor/APKBUILD ]; then
+	. ../linux-$_flavor/APKBUILD
+fi
+_abi_release=$pkgver-${_flavor}
+
+# get pkgver from xtables-addons package
+if [ -f ../$_realname/APKBUILD ]; then
+	. ../$_realname/APKBUILD
+fi
+
+pkgname=${_realname}-${_flavor}
+pkgver=${pkgver:-1.17}
+pkgrel=0
+pkgdesc="Iptables extensions kernel modules"
+url="http://xtables-addons.sourceforge.net/"
+license="GPL"
+depends=
+makedepends="linux-${_flavor}-dev iptables-dev pkgconfig"
+install=
+subpackages=
+source="http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/$_realname-$pkgver"
+
+	./configure --prefix=/usr \
+		--with-kbuild=/usr/src/linux-headers-${_abi_release}
+
+	cd extensions
+	make CC="${CC:-gcc}" modules || return 1
+	make DESTDIR="$pkgdir" modules_install
+}
+
+md5sums="eca2e3f4f4904814e3a301539876fae6  xtables-addons-1.17.tar.bz2"
diff --git a/core/xtables-addons/APKBUILD b/core/xtables-addons/APKBUILD
index 49b1fc742..75b6820f7 100644
--- a/core/xtables-addons/APKBUILD
+++ b/core/xtables-addons/APKBUILD
@@ -1,42 +1,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_kflavor=${FLAVOR:-grsec}
-_kernver=2.6.28.9
-
 pkgname=xtables-addons
-pkgver=1.14
-pkgrel=1
-pkgdesc="Xtables-addons is the successor to patch-o-matic(-ng)"
-url="http://jengelh.medozas.de/projects/xtables/"
+pkgver=1.17
+pkgrel=0
+pkgdesc="Netfilter userspace extensions for iptables"
+url="http://xtables-addons.sourceforge.net/"
 license="GPL"
-depends="linux-$_kflavor"
-makedepends="linux-${_kflavor}-dev linux-${_kflavor}-sources iptables-dev pkgconfig"
+depends="iptables"
+makedepends="iptables-dev pkgconfig"
 install=
-subpackages="$pkgname-doc $pkgname-${_kflavor}:mod"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	$pkgname-1.12-readlink.patch"
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	local kout="$srcdir"/$_kflavor
-	mkdir -p "$kout"
-	cd "$kout"
-	cp /boot/config-$_kflavor .config || return 1
-	cp /boot/Module.symvers-$_kflavor Module.symvers || return 1
-	make -C /usr/src/linux-$_kernver-$_kflavor O=$PWD silentoldconfig \
-		|| return 1
-	make modules_prepare
-
 	cd "$srcdir/$pkgname-$pkgver"
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return
-	done
-
 	./configure --prefix=/usr \
-		--with-kbuild="$kout"
+		--mandir=/usr/share/man \
+		--without-kbuild 
+
+	# we dont want to build or install modules. We hack the makefile
+	sed -i -e '/^all:/s/modules//; /^install:/s/modules_install//' \
+		extensions/GNUmakefile
 
-	make CC="$CC" || return 1
+	make CC="${CC-gcc}" || return 1
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="a17b178d137480b870a7aeb54aea44f8  xtables-addons-1.14.tar.bz2
-22bb434696be0960a6c758de17420e18  xtables-addons-1.12-readlink.patch"
+md5sums="eca2e3f4f4904814e3a301539876fae6  xtables-addons-1.17.tar.bz2"
diff --git a/core/xtables-addons/xtables-addons-1.12-readlink.patch b/core/xtables-addons/xtables-addons-1.12-readlink.patch
deleted file mode 100644
index 6f597738a..000000000
--- a/core/xtables-addons/xtables-addons-1.12-readlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xtables-addons-1.12.orig/extensions/ipset/GNUmakefile.in	2009-03-19 14:38:02.000000000 +0000
-+++ xtables-addons-1.12/extensions/ipset/GNUmakefile.in	2009-03-19 14:40:28.000000000 +0000
-@@ -3,8 +3,8 @@
- top_srcdir      := @top_srcdir@
- srcdir          := @srcdir@
- datarootdir     := @datarootdir@
--abstop_srcdir   := $(shell readlink -e ${top_srcdir})
--abssrcdir       := $(shell readlink -e ${srcdir})
-+abstop_srcdir   := $(shell readlink -f ${top_srcdir})
-+abssrcdir       := $(shell readlink -f ${srcdir})
- 
- ifeq (${abstop_srcdir},)
- $(error Path resolution of ${top_srcdir} failed)