[arch-commits] Commit in nftables/trunk (01-fix-nftables-rename.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Monday, January 20, 2014 @ 23:43:57
  Author: seblu
Revision: 104445

upgpkg: nftables 0.099-1

Added:
  nftables/trunk/01-fix-nftables-rename.patch
Modified:
  nftables/trunk/PKGBUILD

------------------------------+
 01-fix-nftables-rename.patch |   22 ++++++++++++++++++++++
 PKGBUILD                     |   23 +++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

Added: 01-fix-nftables-rename.patch
===================================================================
--- 01-fix-nftables-rename.patch	                        (rev 0)
+++ 01-fix-nftables-rename.patch	2014-01-20 22:43:57 UTC (rev 104445)
@@ -0,0 +1,22 @@
+From 94300c75fc3e113009e68e2ab9db91c31e99e9f4 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo at netfilter.org>
+Date: Mon, 20 Jan 2014 14:02:50 +0000
+Subject: build: use libnftnl instead of libnftables in configure.in
+
+Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
+---
+diff --git a/configure.ac b/configure.ac
+index b38295f..9f0d894 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ fi
+ AC_CHECK_LIB([mnl], [mnl_socket_open], ,
+ 	     AC_MSG_ERROR([No suitable version of libmnl found]))
+ 
+-AC_CHECK_LIB([nftables], [nft_rule_alloc], ,
++AC_CHECK_LIB([nftnl], [nft_rule_alloc], ,
+ 	     AC_MSG_ERROR([No suitable version of libnftnl found]))
+ 
+ AC_CHECK_LIB([gmp], [__gmpz_init], ,
+--
+cgit v0.9.2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-20 22:38:37 UTC (rev 104444)
+++ PKGBUILD	2014-01-20 22:43:57 UTC (rev 104445)
@@ -2,26 +2,33 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=nftables
-pkgver=0
+pkgver=0.099
 pkgrel=1
 pkgdesc='Netfilter nftables userspace tools'
 arch=('i686' 'x86_64')
 url='http://netfilter.org/projects/nftables/'
 license=('GPL2')
-depends=('libmnl' 'libnftables' 'gmp' 'readline' 'ncurses')
-makedepends=(git)
-source=("git://git.netfilter.org/nftables")
-md5sums=(SKIP)
+depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses')
+source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
+        '01-fix-nftables-rename.patch')
+sha1sums=('c8fb650263f68f43498306af36910791871ec1e1'
+          'SKIP'
+          '38d7c1e4bc8590a549e16a2385af37704460642b')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p 1 -i "$srcdir/01-fix-nftables-rename.patch"
+  ./autogen.sh
+}
+
 build() {
-  cd $pkgname
-  ./autogen.sh
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }