diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-02-07 15:59:26 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-02-07 15:59:26 +0000 |
| commit | 3669691e96bce3f48ca83ab09961500e6eac7b9c (patch) | |
| tree | 8e334a6858e493026bf054cbb2faa8bb8f7ab7f4 /net-firewall | |
| parent | Stable for HPPA (bug #455870). (diff) | |
| download | gentoo-2-3669691e96bce3f48ca83ab09961500e6eac7b9c.tar.gz gentoo-2-3669691e96bce3f48ca83ab09961500e6eac7b9c.tar.bz2 gentoo-2-3669691e96bce3f48ca83ab09961500e6eac7b9c.zip | |
Simplify patch.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/ipt_netflow/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch | 27 |
2 files changed, 12 insertions, 21 deletions
diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog index e8cae3a3f9be..8be1549e6c96 100644 --- a/net-firewall/ipt_netflow/ChangeLog +++ b/net-firewall/ipt_netflow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/ipt_netflow # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.4 2013/02/07 15:38:27 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.5 2013/02/07 15:59:25 jer Exp $ + + 07 Feb 2013; Jeroen Roovers <jer@gentoo.org> + files/ipt_netflow-1.8-configure.patch: + Simplify patch. 07 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> ipt_netflow-1.8-r1.ebuild: Fix for last commit - forgot to make CONFIG_CHECK non-fatal in last revision. diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch index bb3820a17e94..493d6080e44a 100644 --- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch +++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch @@ -3,24 +3,11 @@ Patch by Jeroen Roovers from https://bugs.gentoo.org/show_bug.cgi?id=455984 Fixes failure on configure stage with pkgconfig 0.28 --- a/configure +++ b/configure -@@ -11,10 +11,7 @@ - test "$IPTSRC" || return 1 +@@ -217,7 +217,6 @@ + iptables_ver #IPTVER + iptables_pkg_config + iptables_dir #IPTSRC +-iptables_src_version #check IPTSRC match to IPTVER + iptables_inc #IPTINC + iptables_modules #IPTLIB - echo -n "Checking iptables sources version: " -- SRC="$IPTSRC/Makefile" -- test -s "$SRC" || error "Please build iptables first." -- VER=`sed -n 's/^\(IPTABLES_\)\?VERSION[ :]= \?//p' "$SRC"` -- test "$VER" || error "Unknown version of iptables." -+ VER=`pkg-config --modversion xtables` - if [ "$VER" = "$IPTVER" ]; then - echo "$VER (ok)" - else -@@ -155,7 +152,7 @@ - iptables_pkg_config() { - if [ ! "$PKGVER" ]; then - echo -n "pkg-config for version $IPTVER exists: " -- PKGVER=`pkg-config --exact-version=$IPTVER --modversion xtables 2>/dev/null` -+ PKGVER=`pkg-config --modversion xtables 2>/dev/null` - if [ $? = 0 ]; then - echo "Yes" - else |