Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/
Date: Fri, 28 Oct 2016 17:44:32
Message-Id: 1477676654.c176bc615b92a2c5aaf00f1ad729e314214d244c.robbat2@gentoo
1 commit: c176bc615b92a2c5aaf00f1ad729e314214d244c
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 28 17:44:14 2016 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 28 17:44:14 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c176bc61
7
8 net-firewall/ipset: bump per bug #598344.
9
10 Package-Manager: portage-2.3.2
11
12 net-firewall/ipset/Manifest | 1 +
13 net-firewall/ipset/ipset-6.30.ebuild | 98 ++++++++++++++++++++++++++++++++++++
14 2 files changed, 99 insertions(+)
15
16 diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
17 index 32cf255..e25317a 100644
18 --- a/net-firewall/ipset/Manifest
19 +++ b/net-firewall/ipset/Manifest
20 @@ -7,3 +7,4 @@ DIST ipset-6.20.1.tar.bz2 500898 SHA256 356cac020438cd0871acbfc4cb119b8296030f0b
21 DIST ipset-6.21.1.tar.bz2 510013 SHA256 cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb WHIRLPOOL 230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b
22 DIST ipset-6.24.tar.bz2 518811 SHA256 3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6 WHIRLPOOL d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112
23 DIST ipset-6.29.tar.bz2 542735 SHA256 6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3 WHIRLPOOL 8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999
24 +DIST ipset-6.30.tar.bz2 544054 SHA256 65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 SHA512 6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903 WHIRLPOOL d7721b40c5a1556928778fe8adec6c792d0f281737b61680ab414e4aa11691dc2f9c0bf0e56ec8873f4263011e836963d1ab2e273b206b7a0a98adc2ea3d5468
25
26 diff --git a/net-firewall/ipset/ipset-6.30.ebuild b/net-firewall/ipset/ipset-6.30.ebuild
27 new file mode 100644
28 index 00000000..40a8b6f
29 --- /dev/null
30 +++ b/net-firewall/ipset/ipset-6.30.ebuild
31 @@ -0,0 +1,98 @@
32 +# Copyright 1999-2016 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI="6"
37 +MODULES_OPTIONAL_USE=modules
38 +inherit autotools linux-info linux-mod
39 +
40 +DESCRIPTION="IPset tool for iptables, successor to ippool"
41 +HOMEPAGE="http://ipset.netfilter.org/"
42 +SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
43 +
44 +LICENSE="GPL-2"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
47 +
48 +RDEPEND=">=net-firewall/iptables-1.4.7
49 + net-libs/libmnl"
50 +DEPEND="${RDEPEND}"
51 +
52 +DOCS=( ChangeLog INSTALL README UPGRADE )
53 +
54 +# configurable from outside, e.g. /etc/make.conf
55 +IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
56 +
57 +BUILD_TARGETS="modules"
58 +MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
59 +MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
60 +for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
61 + MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
62 +done
63 +
64 +pkg_setup() {
65 + get_version
66 + CONFIG_CHECK="NETFILTER"
67 + ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
68 + # It does still build without NET_NS, but it may be needed in future.
69 + #CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
70 + #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
71 +
72 + build_modules=0
73 + if use modules; then
74 + if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
75 + if linux_chkconfig_present "IP_NF_SET" || \
76 + linux_chkconfig_present "IP_SET"; then #274577
77 + eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
78 + eerror "Please either build ipset with modules USE flag disabled"
79 + eerror "or rebuild kernel without IP_SET support and make sure"
80 + eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
81 + die "USE=modules and in-kernel ipset support detected."
82 + else
83 + einfo "Modular kernel detected. Gonna build kernel modules..."
84 + build_modules=1
85 + fi
86 + else
87 + eerror "Nonmodular kernel detected, but USE=modules. Either build"
88 + eerror "modular kernel (without IP_SET) or disable USE=modules"
89 + die "Nonmodular kernel detected, will not build kernel modules"
90 + fi
91 + fi
92 + [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
93 +}
94 +
95 +src_configure() {
96 + econf \
97 + $(use_with modules kmod) \
98 + --disable-static \
99 + --with-maxsets=${IP_NF_SET_MAX} \
100 + --libdir="${EPREFIX}/$(get_libdir)" \
101 + --with-ksource="${KV_DIR}" \
102 + --with-kbuild="${KV_OUT_DIR}"
103 +}
104 +
105 +src_compile() {
106 + einfo "Building userspace"
107 + emake
108 +
109 + if [[ ${build_modules} -eq 1 ]]; then
110 + einfo "Building kernel modules"
111 + set_arch_to_kernel
112 + emake modules
113 + fi
114 +}
115 +
116 +src_install() {
117 + einfo "Installing userspace"
118 + default
119 + prune_libtool_files
120 +
121 + newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
122 + newconfd "${FILESDIR}"/ipset.confd ${PN}
123 + keepdir /var/lib/ipset
124 +
125 + if [[ ${build_modules} -eq 1 ]]; then
126 + einfo "Installing kernel modules"
127 + linux-mod_src_install
128 + fi
129 +}