From dcfd63bb712b79c1fe10413fe30278e8daeac449 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Wed, 12 Oct 2011 14:13:35 +0000 Subject: On second thought drop USE=ipv6: userspace should work is the same independently of USE=ipv6 and kernel side will depend on kernel configuration. Package-Manager: portage-2.1.10.25/cvs/Linux x86_64 --- net-firewall/ipset/ChangeLog | 7 ++++++- net-firewall/ipset/Manifest | 10 +++++----- net-firewall/ipset/ipset-6.9.1-r2.ebuild | 10 ++++------ 3 files changed, 15 insertions(+), 12 deletions(-) (limited to 'net-firewall') diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog index 7fed3705e64e..17fbf7ade8cb 100644 --- a/net-firewall/ipset/ChangeLog +++ b/net-firewall/ipset/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/ipset # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.55 2011/10/12 13:26:16 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.56 2011/10/12 14:13:35 pva Exp $ + + 12 Oct 2011; Peter Volkov ipset-6.9.1-r2.ebuild: + On second thought drop USE=ipv6: userspace should work is the same + independently of USE=ipv6 and kernel side will depend on kernel + configuration. *ipset-6.9.1-r2 (12 Oct 2011) diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index 4852bd1e7598..86a86af937c7 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -9,14 +9,14 @@ DIST ipset-6.9.1.tar.bz2 123268 RMD160 068e5e37e761374089e53815b0ddca9ffd1894bb EBUILD ipset-4.5.ebuild 2840 RMD160 bae015ed7f806cee6c6c8cb411815afff8bdfae4 SHA1 94cd6b8724e0f403f5d9969cd2de4a5ac2ab1abf SHA256 96e2d91d9a1f27abe2e44f380705536e4894fd27e4c9a684ebd4540d24da0ca0 EBUILD ipset-6.8.ebuild 3250 RMD160 6e9ffa7ff745b7a0ae2053222f449d1553cb5f32 SHA1 e8efe33efc46bec20d20cf33b34e9aa124ae0660 SHA256 adc276a151d484a522464376d127cd4437acdef5bd7a871fcea79c65fa7a1c9c EBUILD ipset-6.9.1-r1.ebuild 3391 RMD160 be1e553f741c5760279ecd7ab4b6d0f581c8c798 SHA1 1a82ea52d786103142f3e88b73ee55e09ffea9d0 SHA256 1ccf3ae26d73600ebc5e7fe316eb6d3b049887cc64bac078226c0b1e3fe22eac -EBUILD ipset-6.9.1-r2.ebuild 3479 RMD160 560a79911b3342932d0be44dff097c8061434d77 SHA1 f6b98e52d258a987437dcd23416ecd98c9992e99 SHA256 659397ee29fd7cc5dcca358d27b5026eb3bb3dddf2c2318743866fbc73fb843e +EBUILD ipset-6.9.1-r2.ebuild 3397 RMD160 3f19c1bb4a84c0358a275bfdc1b1e3c61e2e31ef SHA1 402ba2f4ccd2ad621fca2fb5c619779b53ae2483 SHA256 349e0b63af1730d016d2963a0e10519d104a33828df1d3079d345462f355427f EBUILD ipset-6.9.1.ebuild 3249 RMD160 4a32a1a7ceb39a8a986d4e1f0217799522185ee0 SHA1 e63a469a55f3b60191822e09d21b4def1e16b7c9 SHA256 990e629564a4849fb8aafb3344d11132298d3bb20b0653ff28b2b145dec750c5 -MISC ChangeLog 9896 RMD160 84835fb8e91a9609634082a7695682623a236745 SHA1 95ada396083a43e66dace409caf6a6ef88ca10e3 SHA256 65c4497a2703f556d604e7b34df3f7c9cd0904567b9c8d39a6aeba606a8c1c85 +MISC ChangeLog 10117 RMD160 d4b2681c08ef903e1a928908ac8a11e430f94889 SHA1 1155807420a00b132296d9ead0b6b7d63921dec7 SHA256 36274d075b82bcde484348ca2fa7514daf1c05d5f0403748884a6abdedd4c581 MISC metadata.xml 261 RMD160 011c351b20b4b062f3d8018435a1b0b8eb1693ce SHA1 4d43ddf52da446a21a2565ebd52272d19dfaa767 SHA256 66f8679fb88591451a2fb75caa068efe24aa933bdf312ed6337eb74f933ac9a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6VlQ4ACgkQGrk+8vGYmweM8QD+NxdD3VXP3fOCbs/NiTwwE4rK -E9u1oURNwyDSS87exOAA/1v8dG+UlyOvrG3pYlEorBVv8GpgcekrzvuwBvcNsBlq -=f1i6 +iF4EAREIAAYFAk6VoCUACgkQGrk+8vGYmwfJbAEAsiIbpJkQyexnK9EoBlZwxAbd +2soXT80pPLOQ2D5qsKEBALuP//DvIobGTaAw/VHyBvrntz0kYixW1tpBld2F2mr1 +=8vEe -----END PGP SIGNATURE----- diff --git a/net-firewall/ipset/ipset-6.9.1-r2.ebuild b/net-firewall/ipset/ipset-6.9.1-r2.ebuild index 0b82ecf471b6..6d89ad5ea9cb 100644 --- a/net-firewall/ipset/ipset-6.9.1-r2.ebuild +++ b/net-firewall/ipset/ipset-6.9.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.9.1-r2.ebuild,v 1.1 2011/10/12 13:26:16 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.9.1-r2.ebuild,v 1.2 2011/10/12 14:13:35 pva Exp $ EAPI="4" inherit autotools linux-info linux-mod @@ -15,7 +15,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ipv6 modules" +IUSE="modules" RDEPEND=">=net-firewall/iptables-1.4.4 net-libs/libmnl" @@ -44,9 +44,7 @@ check_header_patch() { pkg_setup() { get_version CONFIG_CHECK="NETFILTER" - use ipv6 && CONFIG_CHECK+=" IP6_NF_IPTABLES" ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." - ERROR_IP6_NF_IPTABLES="ipset requires IP6_NF_IPTABLES support in your kernel." build_modules=0 if use modules; then @@ -65,11 +63,11 @@ pkg_setup() { fi else eerror "Nonmodular kernel detected, but USE=modules. Either build" - eerror "modular kernel or disable USE=modules" + eerror "modular kernel (without IP_SET) or disable USE=modules" die "Nonmodular kernel detected, will not build kernel modules" fi fi - linux-mod_pkg_setup + [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup } src_prepare() { -- cgit v1.2.3-65-gdbad