diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-02-07 15:59:27 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-02-07 15:59:27 +0000 |
| commit | 692e3cfb5a499add02aca6cba7b5b4fcf306326d (patch) | |
| tree | 4d37532101cfaa235b7060b640de751a4ae942e3 /net-firewall | |
| parent | Stable for HPPA (bug #455870). (diff) | |
| download | historical-692e3cfb5a499add02aca6cba7b5b4fcf306326d.tar.gz historical-692e3cfb5a499add02aca6cba7b5b4fcf306326d.tar.bz2 historical-692e3cfb5a499add02aca6cba7b5b4fcf306326d.zip | |
Simplify patch.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/ipt_netflow/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/ipt_netflow/Manifest | 14 | ||||
| -rw-r--r-- | net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch | 27 |
3 files changed, 24 insertions, 23 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/Manifest b/net-firewall/ipt_netflow/Manifest index b31f9a1b9923..fd615d241174 100644 --- a/net-firewall/ipt_netflow/Manifest +++ b/net-firewall/ipt_netflow/Manifest @@ -1,6 +1,16 @@ -AUX ipt_netflow-1.8-configure.patch 890 SHA256 cc567d3b96183db2db92a196dd27774e761e9992a5a139567b0c063db94bc7bb SHA512 09a9018482de4ce9cced1a66bc18b1ca4992e11471e0b9a19431f5b746a5b7cf4c942ca1ac695459ae389e9a1e485e75d271226142023148f8c03c76b2523093 WHIRLPOOL cb2cfa8ad7b4a4a21a1214e5ef786d419187ad1edf67d36f50d31e262b8ae30767babf2d849f14f87674ea670708c164511971505c6b36ad7a4227e3c320a330 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe6d4cab0c68c5cc6e7ee870bad76b3de SHA512 7e00aee7837a0806a39c5367451a140cd7e7e789d30cce72b1a000db0c6b8d97f5d9ff90616dad3bdf2054227628dae4dce693c3eb56d80c670ff589244cdd6c WHIRLPOOL 7f12720b71889af947ce73bdae838a70f171e801955b30c62d30b86a5abf6ceed1bbe5e29145c6c455a95c1e08757816e5eedccec2a993da0dae1525d24a9517 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4 EBUILD ipt_netflow-1.8-r1.ebuild 1699 SHA256 d032d92ad5512bd35d14befe3b5a0806a5e1f39091bd084025425bdb7a348725 SHA512 34b540b741fa10bdfec1ad11fd51183b7ad4799328f78d3c8528ece6d7a0bcb294aee31b1559a2747e7af9bf161977175e41e98151592ccb5572fac7b33b80ea WHIRLPOOL 3af305b8de0595ae8d09f8a0b18f5d56fc08846727cf23a7fa1e04db6120a8e8075444fab17ffadc15340d97209c5e5f3f1710583713f4762e456ed5e196efbd EBUILD ipt_netflow-1.8.ebuild 1557 SHA256 0c12c4368e22dd8de2d14ff8fe2185f7bccc48be327727e10b2129c70480f840 SHA512 632f68120cfb79ea9b7f26aa3722d4a60522d5dcccade2e4c70e9a2493fe19cefb00a50165d7902ca34f755046de202e8d1e9e0ba96cc0f94cef9ecf21838faa WHIRLPOOL d2ab585e7dc0bfd788449f81c27035616cee59931b6d3e6e4a1cca1cb0862c3157f38f5726bab06accb57eb53c93e997662efdefd7944a18d5536fd836ef7ef9 -MISC ChangeLog 1040 SHA256 30da521a82588998ea5497e113fe6231c15f925a993992b09796e6d0189166c8 SHA512 776c7faf4b2c3c95cf65bfc069ef53e2473e7443164d948b90a305714acdf30e7e7a5c36b444fce61d3c2c3b0d5acf988e5b154359a8ca3b6a8c6e2920aa83a4 WHIRLPOOL ed8c75c7281d916e3bece3298343eb7dc9edba2961744a2dcd3138ff1328f9785685447f1b09555d2e15d4fd7630a489d8f218339ea9cdb1d0d482942bc8c3f8 +MISC ChangeLog 1142 SHA256 7f8f6a8e08dcf080f6e806463dda6dc74865fea0a4725f4172e0fe244a9bcb15 SHA512 abc2abcea73a17e5c5a69802985566af35e6c75643a11e2caa39578269585b2e202984c6e8bccd2feb4c56a36b2913850fbf376310e8f181659b511b78298c15 WHIRLPOOL b8687ddc7168be84c7fd09e7360354d0612b6a1b7430bd02ac62302554b2a863c1931a6e6c278c8b5f278867ba1bb26985a8cc25a51d5d73339980759f96fad2 MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEUEAREIAAYFAlETz18ACgkQVWmRsqeSphMC5ACYnsr0MUJ3l4NfjzifEKczmpV6 +eACeO/LsUrw24zCZeKVv+eGdoFVs7FM= +=jgVY +-----END PGP SIGNATURE----- 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 |