[arch-commits] Commit in ipset/trunk (2 files)

[Sébastien Luttringer]

    Date: Sunday, October 20, 2013 @ 21:57:26
  Author: seblu
Revision: 98862

upgpkg: ipset 6.20-1

Added:
  ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch
Modified:
  ipset/trunk/PKGBUILD

-----------------------------------------------+
 01-Fix-configure-failure-when-with-kmod.patch |   43 ++++++++++++++++++++++++
 PKGBUILD                                      |   15 ++++++--
 2 files changed, 54 insertions(+), 4 deletions(-)

Added: 01-Fix-configure-failure-when-with-kmod.patch
===================================================================
--- 01-Fix-configure-failure-when-with-kmod.patch	                        (rev 0)
+++ 01-Fix-configure-failure-when-with-kmod.patch	2013-10-20 19:57:26 UTC (rev 98862)
@@ -0,0 +1,43 @@
+From a76488a84db452865e114336b3fde6257e327715 Mon Sep 17 00:00:00 2001
+From: Oliver Smith <oliver at 8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
+Date: Fri, 11 Oct 2013 16:41:12 +0200
+Subject: [PATCH 1/2] netfilter: ipset: Fix configure failure when
+ --with-kmod=no
+
+When configuring the sources to build without kernel modules, the path
+to the kernel sources was not set and the kernel header files were still
+checked.
+
+Now, we do not check the kernel sources for compatibility if we're not
+going to build any kernel modules.
+
+Signed-off-by: Oliver Smith <oliver at 8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
+Signed-off-by: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0eb1022..d56328c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -167,6 +167,8 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include <linux/types.h>
+ dnl Checks for functions
+ AC_CHECK_FUNCS(gethostbyname2)
+ 
++if test "$BUILDKMOD" == "yes"
++then
+ dnl Check kernel incompatibilities... Ugly like hell
+ AC_MSG_CHECKING([kernel source for struct xt_action_param])
+ if test -f $ksourcedir/include/linux/netfilter/x_tables.h && \
+@@ -309,6 +311,7 @@ else
+ 	AC_MSG_RESULT(no)
+ 	AC_MSG_ERROR([Netns support is required in the Linux kernel tree])
+ fi
++fi
+ 
+ dnl Checks for compiler characteristics.
+ dnl Check extra warning flags except
+-- 
+1.8.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-20 18:22:20 UTC (rev 98861)
+++ PKGBUILD	2013-10-20 19:57:26 UTC (rev 98862)
@@ -2,20 +2,27 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.19
-pkgrel=2
+pkgver=6.20
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
 license=('GPL2')
-depends=('libmnl' 'bash')
+depends=('libmnl')
 backup=("etc/$pkgname.conf")
 options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+        '01-Fix-configure-failure-when-with-kmod.patch'
         "$pkgname.service")
-md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
+md5sums=('af28b3af356fff3e4a8e321ff7145678'
+         '5569fd4ee93acac4ae01d091002cc2f5'
          '6be6a2b34c1f38fc8ad60828403e2077')
 
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-Fix-configure-failure-when-with-kmod.patch
+  cd $pkgname-$pkgver && ./autogen.sh
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no