Date: Tuesday, October 29, 2013 @ 22:15:23 Author: seblu Revision: 99567
upgpkg: ipset 6.20.1-1 Modified: ipset/trunk/PKGBUILD Deleted: ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch -----------------------------------------------+ 01-Fix-configure-failure-when-with-kmod.patch | 43 ------------------------ PKGBUILD | 13 +------ 2 files changed, 3 insertions(+), 53 deletions(-) Deleted: 01-Fix-configure-failure-when-with-kmod.patch =================================================================== --- 01-Fix-configure-failure-when-with-kmod.patch 2013-10-29 21:03:55 UTC (rev 99566) +++ 01-Fix-configure-failure-when-with-kmod.patch 2013-10-29 21:15:23 UTC (rev 99567) @@ -1,43 +0,0 @@ -From a76488a84db452865e114336b3fde6257e327715 Mon Sep 17 00:00:00 2001 -From: Oliver Smith <[email protected]> -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 <[email protected]> -Signed-off-by: Jozsef Kadlecsik <[email protected]> ---- - 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-29 21:03:55 UTC (rev 99566) +++ PKGBUILD 2013-10-29 21:15:23 UTC (rev 99567) @@ -2,8 +2,8 @@ # Maintainer: Sébastien Luttringer pkgname=ipset -pkgver=6.20 -pkgrel=2 +pkgver=6.20.1 +pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -11,17 +11,10 @@ depends=('libmnl') backup=("etc/$pkgname.conf") source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"; - '01-Fix-configure-failure-when-with-kmod.patch' "$pkgname.service") -md5sums=('af28b3af356fff3e4a8e321ff7145678' - '5569fd4ee93acac4ae01d091002cc2f5' +md5sums=('8af741492752fbf24d3a28a9d1473d40' '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
