[arch-commits] Commit in ipset/repos (10 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sun Oct 20 19:57:37 UTC 2013
Date: Sunday, October 20, 2013 @ 21:57:37
Author: seblu
Revision: 98863
archrelease: copy trunk to community-i686, community-x86_64
Added:
ipset/repos/community-i686/01-Fix-configure-failure-when-with-kmod.patch
(from rev 98862, ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch)
ipset/repos/community-i686/PKGBUILD
(from rev 98862, ipset/trunk/PKGBUILD)
ipset/repos/community-i686/ipset.service
(from rev 98862, ipset/trunk/ipset.service)
ipset/repos/community-x86_64/01-Fix-configure-failure-when-with-kmod.patch
(from rev 98862, ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch)
ipset/repos/community-x86_64/PKGBUILD
(from rev 98862, ipset/trunk/PKGBUILD)
ipset/repos/community-x86_64/ipset.service
(from rev 98862, ipset/trunk/ipset.service)
Deleted:
ipset/repos/community-i686/PKGBUILD
ipset/repos/community-i686/ipset.service
ipset/repos/community-x86_64/PKGBUILD
ipset/repos/community-x86_64/ipset.service
----------------------------------------------------------------+
/PKGBUILD | 96 ++++++++++
/ipset.service | 24 ++
community-i686/01-Fix-configure-failure-when-with-kmod.patch | 43 ++++
community-i686/PKGBUILD | 41 ----
community-i686/ipset.service | 12 -
community-x86_64/01-Fix-configure-failure-when-with-kmod.patch | 43 ++++
community-x86_64/PKGBUILD | 41 ----
community-x86_64/ipset.service | 12 -
8 files changed, 206 insertions(+), 106 deletions(-)
Copied: ipset/repos/community-i686/01-Fix-configure-failure-when-with-kmod.patch (from rev 98862, ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch)
===================================================================
--- community-i686/01-Fix-configure-failure-when-with-kmod.patch (rev 0)
+++ community-i686/01-Fix-configure-failure-when-with-kmod.patch 2013-10-20 19:57:37 UTC (rev 98863)
@@ -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
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-10-20 19:57:26 UTC (rev 98862)
+++ community-i686/PKGBUILD 2013-10-20 19:57:37 UTC (rev 98863)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=ipset
-pkgver=6.19
-pkgrel=2
-pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
-url='http://ipset.netfilter.org'
-license=('GPL2')
-depends=('libmnl' 'bash')
-backup=("etc/$pkgname.conf")
-options=('!libtool')
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
- "$pkgname.service")
-md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
- '6be6a2b34c1f38fc8ad60828403e2077')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # install doc
- install -dm755 "$pkgdir/usr/share/doc/$pkgname"
- install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
- # install pkgconfig file
- install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
- popd
- # systemd
- install -Dm 644 $pkgname.service \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
- # default config file
- install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ipset/repos/community-i686/PKGBUILD (from rev 98862, ipset/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-10-20 19:57:37 UTC (rev 98863)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=ipset
+pkgver=6.20
+pkgrel=1
+pkgdesc='Administration tool for IP sets'
+arch=('i686' 'x86_64')
+url='http://ipset.netfilter.org'
+license=('GPL2')
+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=('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
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install doc
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+ # install pkgconfig file
+ install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
+ popd
+ # systemd
+ install -Dm 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # default config file
+ install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/ipset.service
===================================================================
--- community-i686/ipset.service 2013-10-20 19:57:26 UTC (rev 98862)
+++ community-i686/ipset.service 2013-10-20 19:57:37 UTC (rev 98863)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Loading IP Sets
-Before=iptables.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/bin/ipset destroy
-
-[Install]
-WantedBy=multi-user.target
Copied: ipset/repos/community-i686/ipset.service (from rev 98862, ipset/trunk/ipset.service)
===================================================================
--- community-i686/ipset.service (rev 0)
+++ community-i686/ipset.service 2013-10-20 19:57:37 UTC (rev 98863)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Loading IP Sets
+Before=iptables.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
+
+[Install]
+WantedBy=multi-user.target
Copied: ipset/repos/community-x86_64/01-Fix-configure-failure-when-with-kmod.patch (from rev 98862, ipset/trunk/01-Fix-configure-failure-when-with-kmod.patch)
===================================================================
--- community-x86_64/01-Fix-configure-failure-when-with-kmod.patch (rev 0)
+++ community-x86_64/01-Fix-configure-failure-when-with-kmod.patch 2013-10-20 19:57:37 UTC (rev 98863)
@@ -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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-10-20 19:57:26 UTC (rev 98862)
+++ community-x86_64/PKGBUILD 2013-10-20 19:57:37 UTC (rev 98863)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=ipset
-pkgver=6.19
-pkgrel=2
-pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
-url='http://ipset.netfilter.org'
-license=('GPL2')
-depends=('libmnl' 'bash')
-backup=("etc/$pkgname.conf")
-options=('!libtool')
-source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
- "$pkgname.service")
-md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
- '6be6a2b34c1f38fc8ad60828403e2077')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- # install doc
- install -dm755 "$pkgdir/usr/share/doc/$pkgname"
- install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
- # install pkgconfig file
- install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
- popd
- # systemd
- install -Dm 644 $pkgname.service \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
- # default config file
- install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ipset/repos/community-x86_64/PKGBUILD (from rev 98862, ipset/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-10-20 19:57:37 UTC (rev 98863)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=ipset
+pkgver=6.20
+pkgrel=1
+pkgdesc='Administration tool for IP sets'
+arch=('i686' 'x86_64')
+url='http://ipset.netfilter.org'
+license=('GPL2')
+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=('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
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install doc
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname"
+ # install pkgconfig file
+ install -Dm644 lib/libipset.pc "$pkgdir/usr/lib/pkgconfig/libipset.pc"
+ popd
+ # systemd
+ install -Dm 644 $pkgname.service \
+ "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # default config file
+ install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/ipset.service
===================================================================
--- community-x86_64/ipset.service 2013-10-20 19:57:26 UTC (rev 98862)
+++ community-x86_64/ipset.service 2013-10-20 19:57:37 UTC (rev 98863)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Loading IP Sets
-Before=iptables.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
-ExecStop=/usr/bin/ipset destroy
-
-[Install]
-WantedBy=multi-user.target
Copied: ipset/repos/community-x86_64/ipset.service (from rev 98862, ipset/trunk/ipset.service)
===================================================================
--- community-x86_64/ipset.service (rev 0)
+++ community-x86_64/ipset.service 2013-10-20 19:57:37 UTC (rev 98863)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Loading IP Sets
+Before=iptables.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore
+ExecStop=/usr/bin/ipset destroy
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list