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

[Sébastien Luttringer]

    Date: Friday, April 18, 2014 @ 00:31:39
  Author: seblu
Revision: 109666

upgpkg: nftables 0.2-1

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

------------------------------+
 01-fix-nftables-rename.patch |   22 ----------------------
 PKGBUILD                     |   11 ++++-------
 2 files changed, 4 insertions(+), 29 deletions(-)

Deleted: 01-fix-nftables-rename.patch
===================================================================
--- 01-fix-nftables-rename.patch	2014-04-17 22:06:38 UTC (rev 109665)
+++ 01-fix-nftables-rename.patch	2014-04-17 22:31:39 UTC (rev 109666)
@@ -1,22 +0,0 @@
-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-04-17 22:06:38 UTC (rev 109665)
+++ PKGBUILD	2014-04-17 22:31:39 UTC (rev 109666)
@@ -2,8 +2,8 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=nftables
-pkgver=0.099
-pkgrel=2
+pkgver=0.2
+pkgrel=1
 pkgdesc='Netfilter nftables userspace tools'
 arch=('i686' 'x86_64')
 url='http://netfilter.org/projects/nftables/'
@@ -11,17 +11,14 @@
 depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses')
 makedepends=('docbook2x')
 source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
-        '01-fix-nftables-rename.patch'
         '02-manpages.patch')
-sha1sums=('c8fb650263f68f43498306af36910791871ec1e1'
+sha1sums=('1d1959e02e970b1de0e9435142a64d09240c0591'
           'SKIP'
-          '38d7c1e4bc8590a549e16a2385af37704460642b'
           '3ef58d5199b358ceb184307aca3e215c40ce3707')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p 1 -i "$srcdir/01-fix-nftables-rename.patch"
-  patch -p 1 -i "$srcdir/02-manpages.patch"
+  sed -ri 's/docbook2x-man/docbook2man/g' configure.ac
   ./autogen.sh
 }