pcr/xtables-addons: updated to 3.2

2 files changed, 37 insertions, 36 deletions

diff --git a/pcr/xtables-addons/PKGBUILD b/pcr/xtables-addons/PKGBUILD
index 1db9c2566..f5d4643fd 100644
--- a/pcr/xtables-addons/PKGBUILD
+++ b/pcr/xtables-addons/PKGBUILD
@@ -1,38 +1,45 @@
-# Contributor (Arch): Thiago Coutinho <root at thiagoc . net>
+# Maintainer (AUR): Shalygin Konstantin <k0ste@k0ste.ru>
+# Contributor (AUR): Shalygin Konstantin <k0ste@k0ste.ru>
 # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>
-pkgname=xtables-addons
-pkgver=2.6
-pkgrel=3
-pkgdesc="Successor to patch-o-matic(-ng). Additional extensions for iptables, ip6tables, etc. CHAOS, TARPIT, TEE, DELUDE and other targets; condition, geoip, ipp2p and other matches. Includes ipset package."
+
+pkgname='xtables-addons'
+pkgver='3.2'
+pkgrel='3'
+pkgdesc='Xtables-addons is a set of additional extensions for the Xtables packet filter that is present in the Linux kernel'
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://xtables-addons.sourceforge.net/"
-depends=('iptables>=1.4.5' 'glibc' 'linux>=3.7')
-makedepends=('linux-api-headers' 'linux-headers')
-conflicts=(ipset)
-replaces=(ipset)
-provides=(ipset)
-install='xtables-addons.install'
-source=(http://download.sourceforge.net/project/xtables-addons/Xtables-addons/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('087835ba7e564481b6fd398692268340')
+url="https://${pkgname}.sourceforge.net/"
+depends=('iptables' 'glibc' 'linux')
+makedepends=('linux-api-headers' 'linux-headers' 'libtool' 'gcc' 'pkg-config')
+source=("https://sourceforge.net/projects/${pkgname}/files/Xtables-addons//${pkgname}-${pkgver}.tar.xz")
+sha256sums=('006f4e38bbf4b9a9069b90ca78c93b65800e9ebfd17332b713f1f80292420aaa')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./autogen.sh
   ./configure \
-      --prefix=/usr \
-      --libexecdir=/usr/lib/iptables \
-      --sysconfdir=/etc \
-      --with-xtlibdir=/usr/lib/iptables \
-      --mandir=/usr/share/man
-  make || return 1
+    --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/xtables
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
 }
 
-package () {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install || return 1
-  mv $pkgdir/lib/* $pkgdir/usr/lib/
-  mv $pkgdir/usr/lib/modules/$(uname -r)/extra $pkgdir/usr/lib/modules/$(uname -r)/$(readlink /usr/lib/modules/$(uname -r)/extramodules)
-  rmdir $pkgdir/lib
-  mv $pkgdir/usr/sbin $pkgdir/usr/bin
-  chmod a-x $pkgdir/usr/lib/iptables/*.so
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  libtool --finish "${pkgdir}/usr/lib"
+  mv -f "${pkgdir}"/lib/* "${pkgdir}/usr/lib"
+  rmdir "${pkgdir}/lib"
+  rm "${pkgdir}"/usr/lib/modules/$(uname -r)/modules.*
 }
diff --git a/pcr/xtables-addons/xtables-addons.install b/pcr/xtables-addons/xtables-addons.install
deleted file mode 100644
index 7194d8e71..000000000
--- a/pcr/xtables-addons/xtables-addons.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-    echo "Please run \`depmod -a\` or reboot before load modules"
-}
-post_upgrade() {
-    echo "Please run \`depmod -a\` or reboot before load modules"
-}