Update to 3.5

1 files changed, 24 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cdf3358fe7b4..f554b478ef29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Lubomir Krajcovic <lubomir.krajcovic(AT)gmail(DOT)com>
 # Contributor: Vladimir Kutyavin <vlkut(AT)bk(DOT)ru>
 pkgname=xtables-addons-dkms
-pkgver=3.3
-pkgrel=2
+pkgver=3.5
+pkgrel=1
 pkgdesc='DKMS for additional extensions for Xtables packet filter present in the Linux kernel'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,29 +17,25 @@ optdepends=('perl-text-csv-xs: required for building GeoIP database'
 conflicts=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 replaces=(xtables-addons xtables-addons-git xtables-addons-multikernel)
 source=(https://sourceforge.net/projects/${pkgname%-dkms}/files/Xtables-addons/${pkgname%-dkms}-${pkgver}.tar.xz
-        0002-fix-deprecated-flags-field.patch
         dkms.conf)
-sha256sums=('efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6'
-            '615c953786f5441c06d099dfe477aeed8a87e70334cee17369850cfdc8c3f3e3'
+sha256sums=('189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6'
             '87546f6d100a33271086d3bc990a2a1e4de83e25fb4a048774c520f4c36729e6')
 
 prepare() {
-	# go to builddir
-	cd "${srcdir}/xtables-addons-${pkgver}"
-	patch -p1 -i "${srcdir}/0002-fix-deprecated-flags-field.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
+    # 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
 }
 
 build() {
-	cd "${srcdir}/xtables-addons-${pkgver}"
+    cd "${srcdir}/xtables-addons-${pkgver}"
 
-	# build userspace parts
+    # build userspace parts
     ./autogen.sh
-
     ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
@@ -50,22 +46,21 @@ build() {
         --docdir=/usr/share/doc \
         --libexecdir=/usr/lib/xtables \
         --with-xtlibdir=/usr/lib/xtables \
-		--without-kbuild
-
-	make
+        --without-kbuild
+    make
 }
 
 package() {
-	cd "${srcdir}/xtables-addons-${pkgver}"
+    cd "${srcdir}/xtables-addons-${pkgver}"
+
+    # prepare dkms build tree
+    dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}"
+    mkdir -p "${dkmsDst}/"
+    cp -R . "${dkmsDst}/"
 
-	# prepare dkms build tree
-	dkmsDst="${pkgdir}/usr/src/xtables-addons-${pkgver}"
-	mkdir -p "${dkmsDst}/"
-	cp -R . "${dkmsDst}/"
-	
-	# prepare dkms config
-	cp "${srcdir}/dkms.conf" "${dkmsDst}/"
-	sed -i -e "s/@VERSION@/${pkgver}/" "${dkmsDst}/dkms.conf"
+    # prepare dkms config
+    cp "${srcdir}/dkms.conf" "${dkmsDst}/"
+    sed -i -e "s/@VERSION@/${pkgver}/" "${dkmsDst}/dkms.conf"
 
-	make DESTDIR="${pkgdir}" install
+    make DESTDIR="${pkgdir}" install
 }