Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/
Date: Wed, 26 Feb 2020 11:18:36
Message-Id: 1582715908.bc9e9e47f1622a6343e6088fb185da64fb6ae572.polynomial-c@gentoo
1 commit: bc9e9e47f1622a6343e6088fb185da64fb6ae572
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 11:18:17 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 11:18:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9e9e47
7
8 net-firewall/ipset: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-firewall/ipset/Manifest | 1 -
14 net-firewall/ipset/ipset-7.4.ebuild | 111 ------------------------------------
15 2 files changed, 112 deletions(-)
16
17 diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
18 index 49ac69e4074..362b82f0f88 100644
19 --- a/net-firewall/ipset/Manifest
20 +++ b/net-firewall/ipset/Manifest
21 @@ -1,5 +1,4 @@
22 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4 SHA512 ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
23 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f SHA512 ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
24 -DIST ipset-7.4.tar.bz2 670906 BLAKE2B 46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391 SHA512 b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196
25 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5 SHA512 97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
26 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061 SHA512 c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
27
28 diff --git a/net-firewall/ipset/ipset-7.4.ebuild b/net-firewall/ipset/ipset-7.4.ebuild
29 deleted file mode 100644
30 index 827969dce4b..00000000000
31 --- a/net-firewall/ipset/ipset-7.4.ebuild
32 +++ /dev/null
33 @@ -1,111 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="7"
38 -MODULES_OPTIONAL_USE=modules
39 -inherit autotools linux-info linux-mod systemd
40 -
41 -DESCRIPTION="IPset tool for iptables, successor to ippool"
42 -HOMEPAGE="http://ipset.netfilter.org/"
43 -SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
48 -
49 -BDEPEND="virtual/pkgconfig"
50 -
51 -RDEPEND=">=net-firewall/iptables-1.4.7
52 - net-libs/libmnl"
53 -DEPEND="${RDEPEND}"
54 -
55 -DOCS=( ChangeLog INSTALL README UPGRADE )
56 -
57 -PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
58 -
59 -# configurable from outside, e.g. /etc/portage/make.conf
60 -IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
61 -
62 -BUILD_TARGETS="modules"
63 -MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
64 -MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
65 -for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do
66 - MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
67 -done
68 -
69 -pkg_setup() {
70 - get_version
71 - CONFIG_CHECK="NETFILTER"
72 - ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
73 - # It does still build without NET_NS, but it may be needed in future.
74 - #CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
75 - #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
76 - CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
77 - ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
78 -
79 - build_modules=0
80 - if use modules; then
81 - if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
82 - if linux_chkconfig_present "IP_NF_SET" || \
83 - linux_chkconfig_present "IP_SET"; then #274577
84 - eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
85 - eerror "Please either build ipset with modules USE flag disabled"
86 - eerror "or rebuild kernel without IP_SET support and make sure"
87 - eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
88 - die "USE=modules and in-kernel ipset support detected."
89 - else
90 - einfo "Modular kernel detected. Gonna build kernel modules..."
91 - build_modules=1
92 - fi
93 - else
94 - eerror "Nonmodular kernel detected, but USE=modules. Either build"
95 - eerror "modular kernel (without IP_SET) or disable USE=modules"
96 - die "Nonmodular kernel detected, will not build kernel modules"
97 - fi
98 - fi
99 - [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
100 -}
101 -
102 -src_prepare() {
103 - default
104 -
105 - eautoreconf
106 -}
107 -
108 -src_configure() {
109 - econf \
110 - $(use_with modules kmod) \
111 - --disable-static \
112 - --with-maxsets=${IP_NF_SET_MAX} \
113 - --libdir="${EPREFIX}/$(get_libdir)" \
114 - --with-ksource="${KV_DIR}" \
115 - --with-kbuild="${KV_OUT_DIR}"
116 -}
117 -
118 -src_compile() {
119 - einfo "Building userspace"
120 - emake
121 -
122 - if [[ ${build_modules} -eq 1 ]]; then
123 - einfo "Building kernel modules"
124 - set_arch_to_kernel
125 - emake modules
126 - fi
127 -}
128 -
129 -src_install() {
130 - einfo "Installing userspace"
131 - default
132 -
133 - find "${ED}" -name '*.la' -delete || die
134 -
135 - newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
136 - newconfd "${FILESDIR}"/ipset.confd ${PN}
137 - systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service
138 - keepdir /var/lib/ipset
139 -
140 - if [[ ${build_modules} -eq 1 ]]; then
141 - einfo "Installing kernel modules"
142 - linux-mod_src_install
143 - fi
144 -}