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

[Sébastien Luttringer]

    Date: Sunday, March 13, 2016 @ 12:51:45
  Author: seblu
Revision: 261394

upgpkg: ipset 6.28-1

Added:
  ipset/trunk/0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
Modified:
  ipset/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch |   27 ++++++++++
 PKGBUILD                                                        |   21 +++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

Added: 0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch
===================================================================
--- 0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch	                        (rev 0)
+++ 0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch	2016-03-13 11:51:45 UTC (rev 261394)
@@ -0,0 +1,27 @@
+From fc7221d243c44be917dc21cbdc70df7d14e4ce4d Mon Sep 17 00:00:00 2001
+From: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>
+Date: Sun, 13 Mar 2016 12:10:47 +0100
+Subject: [PATCH] Fix "configure" breakage due to pkg-config related changes
+
+The support for older pkg-config packages broke the "configure" script
+(reported by Jan Engelhardt).
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1988836..b05646b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,8 @@ LT_INIT([dlopen])
+ LT_CONFIG_LTDL_DIR([libltdl])
+ LTDL_INIT([nonrecursive])
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl Shortcut: Linux supported alone
+ case "$host" in
+ *-*-linux* | *-*-uclinux*) ;;
+-- 
+2.7.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-13 11:18:51 UTC (rev 261393)
+++ PKGBUILD	2016-03-13 11:51:45 UTC (rev 261394)
@@ -2,7 +2,7 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.27
+pkgver=6.28
 pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
@@ -11,10 +11,27 @@
 depends=('glibc' 'libmnl')
 backup=("etc/$pkgname.conf")
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
+        '0001-Fix-configure-breakage-due-to-pkg-config-related-cha.patch'
         "$pkgname.service")
-md5sums=('c39f8958908b1396e2c69f082b75d924'
+md5sums=('68217d8031045d9e5dbd451f3933399e'
+         'fc177910dc5110f2a3d76427f6a54163'
          'e20fe62881993078591f1bb8b2fa22bb')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch $filename"
+      patch -p1 -i "$srcdir/$filename"
+    fi
+  done
+  :
+  # needed because we patch configure.ac (TO BE REMOVED)
+  ./autogen.sh
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no