summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-04-25 13:31:58 +0000
committerJeroen Roovers <jer@gentoo.org>2013-04-25 13:31:58 +0000
commit8a09388e5c3f086c22e7639bfe7d999d7f3b8c23 (patch)
tree82d1d194b496fbc9e216fb6d5b3e0ba876a666cf /net-firewall/conntrack-tools
parentVersion bump (bug #466736 by Olipro). (diff)
downloadhistorical-8a09388e5c3f086c22e7639bfe7d999d7f3b8c23.tar.gz
historical-8a09388e5c3f086c22e7639bfe7d999d7f3b8c23.tar.bz2
historical-8a09388e5c3f086c22e7639bfe7d999d7f3b8c23.zip
Fix libnetfilter_conntrack version check.
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-firewall/conntrack-tools')
-rw-r--r--net-firewall/conntrack-tools/ChangeLog6
-rw-r--r--net-firewall/conntrack-tools/Manifest11
-rw-r--r--net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild10
-rw-r--r--net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch11
4 files changed, 29 insertions, 9 deletions
diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 16596e43849e..1e5edbc47178 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-firewall/conntrack-tools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.54 2013/04/25 13:22:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.55 2013/04/25 13:31:57 jer Exp $
+
+ 25 Apr 2013; Jeroen Roovers <jer@gentoo.org> conntrack-tools-1.4.1.ebuild,
+ +files/conntrack-tools-1.4.1-version.patch:
+ Fix libnetfilter_conntrack version check.
*conntrack-tools-1.4.1 (25 Apr 2013)
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 4fdf46a103b7..5aad30513664 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX conntrack-tools-1.4.1-version.patch 556 SHA256 666e8e037198cce0d203877c0d24f0072257bbe220b197a1ac93302b409d4bfd SHA512 81d368ccb71265b4a13fccd261cc6958b577f130cdb9f7b06627c0d6514e8b74d077f3d5e4c74af7a78e98abce8f94aacf202fbe1fd0d3b3b84794cae590d60a WHIRLPOOL 63bb9f25d0c80e69a00f76272befb87ab39876d08a23e16d3dcb12ab785c4ae694eb5e9fd6a3340e036ce38b626342ed2024b2ee0439806cdde8473297adfb73
AUX conntrackd.confd-r1 498 SHA256 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7 SHA512 fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f WHIRLPOOL eecdb58fc2c3ab7656feb994394d947a1860ef118ee7ac6e850ecdb2f65cc597045a3f32bab5615fe1b8a819772c5ff651b396c51edb437fd43fcb6825a681a8
AUX conntrackd.initd-r1 2897 SHA256 34a88a0e9291d4473f72b246e12ebe00121dff9b06c6b54c1da5f06045a2fc09 SHA512 deaee64007106cf9d4e397bef7f7408ea372427b2361f0b72ecc545de1e45607049281c1c38942139c6269af88d62f18113ed105b6c468f27ce03d0bb1f9c1d8 WHIRLPOOL e3cdbeb5aa8fb57f8991f5e89c0d4d3e162dee51e69cdea513d7c208c5d3335404840045e96dcaad3cf71b96caf89418cb2c8fc4572b6b2878dd9c1d291e246c
AUX conntrackd.initd-r2 2239 SHA256 a1a0e2453ec8f5dee58f8cd95e6e969794ee9dfbc55236e7fd3eef5116cacab5 SHA512 faa5d8ebbea4fee39740f09ec983f29239b3cc17d75c0f70f3108c017e9f90f4754da3deca13412bf84ac365487c1f11fa80b6b15d44ad1659727d5deb144b97 WHIRLPOOL 3975490f89d58bd7c79a878012c3ff4b18840dc2d0e5bfd0981a33248567c93fb7e5246e70ed9c8eefff29abfd6d4ed04a049dfdc31908aaa2c1120e2ab47298
@@ -16,13 +17,13 @@ EBUILD conntrack-tools-1.0.1.ebuild 1578 SHA256 8ba6928cdbce385b8c97850218ac8f24
EBUILD conntrack-tools-1.2.2-r1.ebuild 1760 SHA256 1f7fc9a6346e39afbec212005fdbe3598f1464d519dbe4cb9cb73bf91a0e0757 SHA512 fba095f1b4c8bf2d3ccfa2e599c6d3defdd478b6aa207c66d3081a964e6144f1f9f4c90149c5ca127546e28cc4538f90294a1b986c8f1598c1cacbbc50efed30 WHIRLPOOL 5977f7fcf1ffe326a9eb936289da02f761e7b07acb2eae0efd36ca4f0f2675728483393a5cec22e6238d7a7fb24261b6eb5318863679d1e5053a3feaddcad271
EBUILD conntrack-tools-1.2.2.ebuild 1632 SHA256 21047d2dc283ab75fa42baa616003d09d6ccf2629910f44a5d9845b5a27803d1 SHA512 e5a8304cd06b35cbfc12d08b641003294c30f34d9dbf118c4a86073f486f7b417d05c2707a640f9fa8089fc8738491c156632883d17f39403afbbf55a5b6b10c WHIRLPOOL 7c3a4e1fb96c2d07cf101abe01dd794f6e355b8cdc15a68a859bb18c8815e0c3e2dae9f7d986d1affaccdc83049e53e9e41246563064864e9b458a192e6105d5
EBUILD conntrack-tools-1.4.0.ebuild 1843 SHA256 6d33ab4bfbb6c7cd63b28d98231b9f0a8889c57be06cc31757a0659d6a7459ee SHA512 0fdef9266c137c13b8476038f5c6441c4db690bb21519a06b607e2684fef6bea6f3119885442b1542b21999d823f6dfd822c9892bc12375b111304fc60b4ae43 WHIRLPOOL 83cd5c7e032ca9cf1ac1b157478bdeae9d7f9581f21a849f50faaeeba93e5943449cff19430bd0485ef5245c0d3994aadf595dbbf8e91ea22ca3a2d41da39d4d
-EBUILD conntrack-tools-1.4.1.ebuild 1841 SHA256 f78bd01fdbc2e40ae0fce26b68c02293edb0e9d3f28a15cd85529524ab3ed150 SHA512 bc408cb327b1b5213049892f98fad45bdec745047a6749c2024db11cf5af879bb13b07f8b5dd24f7cf509c6fd5b4cb4777d599033a62601af6c02f5beeda0f2f WHIRLPOOL 67a0b421776f0a2d20226dddf8b80c8e56d99423a73b7bf94cf026e0145962180c0a48e1f659b46360fa112c62804b04a13b603cb22de135604b1998b7244a8e
-MISC ChangeLog 8780 SHA256 bc983e71be36123c3154b917b16000bd6c12d076e7bffd0ebaeb86330296d5e9 SHA512 abbd1fdbb0d3151abc3149331fd84b1731b68e6ff9fcee55afa5625cc5bef065bcc4bb9e3c1533ff00bc923b05714ada3b7bde1f78f6c9e9b8ef15d61c9ae10c WHIRLPOOL c7972a033d32261d55aab6e1c9728dacf85fdd60e57f9f57a5148299dcc1c4aa1bed8b9c23d11526b159c0a423c98aaf587d00a02db7efb00c5039e4bdd0822c
+EBUILD conntrack-tools-1.4.1.ebuild 1930 SHA256 bd38a7b11ecef236bbe3d524f464f52a1600cfcf43207a8e205d39e6e0681e83 SHA512 8de4c0384abf46a8d6670bd3cd4c3ca35f24d5bc9eddb36d0236eb438fc6a2e2f9c55dfe2e689d4b36feba48fe5d62e875b3a8b4f30a1333f81750e406569d84 WHIRLPOOL 3e5d0f3ac035e28dd53cc8f02e38d31f5952ed904887c2ba0ece48aff5eaa94e8c78ffabd3c469a424363dd8fc88ad758f8fc3f37b45925dbf80a4e358c3825b
+MISC ChangeLog 8948 SHA256 5a98167c820da7b22eb924b3f3b3d1947ebb04bab5cc28490294e7bad018d6e0 SHA512 503f61868d0c229998cca5cd2f80d9a906b2f8ad3ef2daab713b20cbbda6c1f6cfa0cd388a4ca5daa7e1d77e7473827cc3f21a6e20b598839ae6cb2dcf12c5c6 WHIRLPOOL 3240cee2f0549b4d470ecf1fc11572c785c297b0e28c0944610d6c3b21206f94967b40900d8e161019956e1aeed31fc14b65e6f2153c38b30a39fcc9833203cb
MISC metadata.xml 647 SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0 SHA512 a362d145aace1a28c441c4367d03602c2e8dbeb781edc123bf4e1758d6668e90b5c5a5fa67894ed8fd9dbc63c9c2a75178ccd199202474a36d611af18cf8ed1e WHIRLPOOL 8bbb507711121009f96387069fc6153b8f4c6457d5ec18d0ad0b715d7659e4a7323d1a6807c4156dcf9d9377d29d2550ac23a5fec26bbab5c93d6eb798ec0c75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlF5LhkACgkQVWmRsqeSphMA+QCdFSrpboa/k6f1qwd58X2Ouh/n
-CvcAni1MTeDBxG2bk4F/UnN9Uj6fy3O4
-=8hn5
+iEYEAREIAAYFAlF5ME4ACgkQVWmRsqeSphMilACcCtEAebVriItQLOEHvg5O3LPZ
+o80An3wiwxDPe9ZRZj7VVaHIOEzNPGbr
+=UoQH
-----END PGP SIGNATURE-----
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
index e7d8234778c0..da96317279a9 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild,v 1.1 2013/04/25 13:22:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild,v 1.2 2013/04/25 13:31:57 jer Exp $
EAPI=5
-
-inherit linux-info
+inherit autotools eutils linux-info
DESCRIPTION="Connection tracking userspace tools"
HOMEPAGE="http://conntrack-tools.netfilter.org"
@@ -54,6 +53,11 @@ pkg_setup() {
"are not set when one at least should be."
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-version.patch
+ eautoreconf
+}
+
src_compile() {
default
use doc && emake -C doc/manual
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch
new file mode 100644
index 000000000000..b49d16657051
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@
+
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
+ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+-PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2])
++PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_CTTIMEOUT], [libnetfilter_cttimeout >= 1.0.0])
+ PKG_CHECK_MODULES([LIBNETFILTER_CTHELPER], [libnetfilter_cthelper >= 1.0.0])
+ PKG_CHECK_MODULES([LIBNETFILTER_QUEUE], [libnetfilter_queue >= 1.0.2])