[arch-commits] Commit in nftables/repos (10 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Thu Feb 13 01:49:17 UTC 2014
Date: Thursday, February 13, 2014 @ 02:49:17
Author: seblu
Revision: 105653
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
nftables/repos/community-testing-i686/01-fix-nftables-rename.patch
(from rev 105652, nftables/trunk/01-fix-nftables-rename.patch)
nftables/repos/community-testing-i686/02-manpages.patch
(from rev 105652, nftables/trunk/02-manpages.patch)
nftables/repos/community-testing-i686/PKGBUILD
(from rev 105652, nftables/trunk/PKGBUILD)
nftables/repos/community-testing-x86_64/01-fix-nftables-rename.patch
(from rev 105652, nftables/trunk/01-fix-nftables-rename.patch)
nftables/repos/community-testing-x86_64/02-manpages.patch
(from rev 105652, nftables/trunk/02-manpages.patch)
nftables/repos/community-testing-x86_64/PKGBUILD
(from rev 105652, nftables/trunk/PKGBUILD)
Deleted:
nftables/repos/community-testing-i686/01-fix-nftables-rename.patch
nftables/repos/community-testing-i686/PKGBUILD
nftables/repos/community-testing-x86_64/01-fix-nftables-rename.patch
nftables/repos/community-testing-x86_64/PKGBUILD
-------------------------------------------------------+
/01-fix-nftables-rename.patch | 44 +++++++++
/PKGBUILD | 78 ++++++++++++++++
community-testing-i686/01-fix-nftables-rename.patch | 22 ----
community-testing-i686/02-manpages.patch | 40 ++++++++
community-testing-i686/PKGBUILD | 35 -------
community-testing-x86_64/01-fix-nftables-rename.patch | 22 ----
community-testing-x86_64/02-manpages.patch | 40 ++++++++
community-testing-x86_64/PKGBUILD | 35 -------
8 files changed, 202 insertions(+), 114 deletions(-)
Deleted: community-testing-i686/01-fix-nftables-rename.patch
===================================================================
--- community-testing-i686/01-fix-nftables-rename.patch 2014-02-13 01:48:57 UTC (rev 105652)
+++ community-testing-i686/01-fix-nftables-rename.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -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
Copied: nftables/repos/community-testing-i686/01-fix-nftables-rename.patch (from rev 105652, nftables/trunk/01-fix-nftables-rename.patch)
===================================================================
--- community-testing-i686/01-fix-nftables-rename.patch (rev 0)
+++ community-testing-i686/01-fix-nftables-rename.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -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
Copied: nftables/repos/community-testing-i686/02-manpages.patch (from rev 105652, nftables/trunk/02-manpages.patch)
===================================================================
--- community-testing-i686/02-manpages.patch (rev 0)
+++ community-testing-i686/02-manpages.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -0,0 +1,40 @@
+# https://bugzilla.netfilter.org/show_bug.cgi?id=893
+
+diff -r -u nftables-0.099/configure.ac nftables-0.099.new/configure.ac
+--- nftables-0.099/configure.ac 2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/configure.ac 2014-02-02 13:01:39.355368732 -0500
+@@ -24,11 +24,19 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_INSTALL
+ AC_PROG_SED
++AC_PROG_GREP
+
+-AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
+-if test "$CONFIG_MAN" != "y"
++AC_PATH_PROGS_FEATURE_CHECK([DOCBOOK2MAN], [docbook2x-man docbook2man],
++ [$ac_path_DOCBOOK2MAN --version | grep -qm1 'part of docbook2X' \
++ && ac_cv_path_DOCBOOK2MAN=$ac_path_DOCBOOK2MAN ac_path_DOCBOOK2MAN_found=:])
++
++if test -n "$ac_cv_path_DOCBOOK2MAN"
+ then
+- AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
++ AC_SUBST([CONFIG_MAN], "y")
++ AC_SUBST([DOCBOOK2MAN], [$ac_cv_path_DOCBOOK2MAN])
++else
++ AC_SUBST([CONFIG_MAN], "n")
++ AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
+ fi
+
+ AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
+diff -r -u nftables-0.099/Makefile.rules.in nftables-0.099.new/Makefile.rules.in
+--- nftables-0.099/Makefile.rules.in 2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/Makefile.rules.in 2014-02-02 13:02:53.660639570 -0500
+@@ -37,7 +37,7 @@
+
+ %.8: %.xml $(makedeps)
+ @echo -e " MAN\t\t$@"
+- (cd $(SUBDIR); docbook2x-man ../$<)
++ (cd $(SUBDIR); @DOCBOOK2MAN@ ../$<)
+
+ %.pdf: %.xml $(makedeps)
+ @echo -e " PDF\t\t$@"
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2014-02-13 01:48:57 UTC (rev 105652)
+++ community-testing-i686/PKGBUILD 2014-02-13 01:49:17 UTC (rev 105653)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=nftables
-pkgver=0.099
-pkgrel=1
-pkgdesc='Netfilter nftables userspace tools'
-arch=('i686' 'x86_64')
-url='http://netfilter.org/projects/nftables/'
-license=('GPL2')
-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-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: nftables/repos/community-testing-i686/PKGBUILD (from rev 105652, nftables/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-02-13 01:49:17 UTC (rev 105653)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=nftables
+pkgver=0.099
+pkgrel=2
+pkgdesc='Netfilter nftables userspace tools'
+arch=('i686' 'x86_64')
+url='http://netfilter.org/projects/nftables/'
+license=('GPL2')
+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'
+ '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"
+ ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-testing-x86_64/01-fix-nftables-rename.patch
===================================================================
--- community-testing-x86_64/01-fix-nftables-rename.patch 2014-02-13 01:48:57 UTC (rev 105652)
+++ community-testing-x86_64/01-fix-nftables-rename.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -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
Copied: nftables/repos/community-testing-x86_64/01-fix-nftables-rename.patch (from rev 105652, nftables/trunk/01-fix-nftables-rename.patch)
===================================================================
--- community-testing-x86_64/01-fix-nftables-rename.patch (rev 0)
+++ community-testing-x86_64/01-fix-nftables-rename.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -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
Copied: nftables/repos/community-testing-x86_64/02-manpages.patch (from rev 105652, nftables/trunk/02-manpages.patch)
===================================================================
--- community-testing-x86_64/02-manpages.patch (rev 0)
+++ community-testing-x86_64/02-manpages.patch 2014-02-13 01:49:17 UTC (rev 105653)
@@ -0,0 +1,40 @@
+# https://bugzilla.netfilter.org/show_bug.cgi?id=893
+
+diff -r -u nftables-0.099/configure.ac nftables-0.099.new/configure.ac
+--- nftables-0.099/configure.ac 2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/configure.ac 2014-02-02 13:01:39.355368732 -0500
+@@ -24,11 +24,19 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_INSTALL
+ AC_PROG_SED
++AC_PROG_GREP
+
+-AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
+-if test "$CONFIG_MAN" != "y"
++AC_PATH_PROGS_FEATURE_CHECK([DOCBOOK2MAN], [docbook2x-man docbook2man],
++ [$ac_path_DOCBOOK2MAN --version | grep -qm1 'part of docbook2X' \
++ && ac_cv_path_DOCBOOK2MAN=$ac_path_DOCBOOK2MAN ac_path_DOCBOOK2MAN_found=:])
++
++if test -n "$ac_cv_path_DOCBOOK2MAN"
+ then
+- AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
++ AC_SUBST([CONFIG_MAN], "y")
++ AC_SUBST([DOCBOOK2MAN], [$ac_cv_path_DOCBOOK2MAN])
++else
++ AC_SUBST([CONFIG_MAN], "n")
++ AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
+ fi
+
+ AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
+diff -r -u nftables-0.099/Makefile.rules.in nftables-0.099.new/Makefile.rules.in
+--- nftables-0.099/Makefile.rules.in 2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/Makefile.rules.in 2014-02-02 13:02:53.660639570 -0500
+@@ -37,7 +37,7 @@
+
+ %.8: %.xml $(makedeps)
+ @echo -e " MAN\t\t$@"
+- (cd $(SUBDIR); docbook2x-man ../$<)
++ (cd $(SUBDIR); @DOCBOOK2MAN@ ../$<)
+
+ %.pdf: %.xml $(makedeps)
+ @echo -e " PDF\t\t$@"
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2014-02-13 01:48:57 UTC (rev 105652)
+++ community-testing-x86_64/PKGBUILD 2014-02-13 01:49:17 UTC (rev 105653)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=nftables
-pkgver=0.099
-pkgrel=1
-pkgdesc='Netfilter nftables userspace tools'
-arch=('i686' 'x86_64')
-url='http://netfilter.org/projects/nftables/'
-license=('GPL2')
-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-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: nftables/repos/community-testing-x86_64/PKGBUILD (from rev 105652, nftables/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-02-13 01:49:17 UTC (rev 105653)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=nftables
+pkgver=0.099
+pkgrel=2
+pkgdesc='Netfilter nftables userspace tools'
+arch=('i686' 'x86_64')
+url='http://netfilter.org/projects/nftables/'
+license=('GPL2')
+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'
+ '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"
+ ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list