1 |
commit: f7e482662bc47f098378f99aca0a04fdac6f9c5e |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 27 21:51:38 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 21:52:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e48266 |
7 |
|
8 |
net-firewall/ipset: bump to v7.4 |
9 |
|
10 |
- Add systemd unit |
11 |
|
12 |
Closes: https://bugs.gentoo.org/680438 |
13 |
Closes: https://bugs.gentoo.org/558038 |
14 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
16 |
|
17 |
net-firewall/ipset/Manifest | 1 + |
18 |
.../ipset/files/ipset-7.4-fix-pkgconfig-dir.patch | 11 ++ |
19 |
net-firewall/ipset/files/ipset.systemd | 15 +++ |
20 |
net-firewall/ipset/ipset-7.4.ebuild | 111 +++++++++++++++++++++ |
21 |
4 files changed, 138 insertions(+) |
22 |
|
23 |
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest |
24 |
index 80346c6ee35..55fce9cf618 100644 |
25 |
--- a/net-firewall/ipset/Manifest |
26 |
+++ b/net-firewall/ipset/Manifest |
27 |
@@ -5,3 +5,4 @@ DIST ipset-6.34.tar.bz2 547940 BLAKE2B a42ad1b0af07250ecae645424d6a9564f16a388da |
28 |
DIST ipset-6.38.tar.bz2 545568 BLAKE2B 14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f SHA512 ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60 |
29 |
DIST ipset-7.0.tar.bz2 552144 BLAKE2B 722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4 SHA512 4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669 |
30 |
DIST ipset-7.1.tar.bz2 669520 BLAKE2B 0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699 SHA512 eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854 |
31 |
+DIST ipset-7.4.tar.bz2 670906 BLAKE2B 46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391 SHA512 b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196 |
32 |
|
33 |
diff --git a/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..b10ddbd4fae |
36 |
--- /dev/null |
37 |
+++ b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch |
38 |
@@ -0,0 +1,11 @@ |
39 |
+--- a/lib/Makefile.am |
40 |
++++ b/lib/Makefile.am |
41 |
+@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \ |
42 |
+ |
43 |
+ EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map |
44 |
+ |
45 |
+-pkgconfigdir = $(libdir)/pkgconfig |
46 |
++pkgconfigdir = $(prefix)/$(libdir)/pkgconfig |
47 |
+ pkgconfig_DATA = libipset.pc |
48 |
+ |
49 |
+ dist_man_MANS = libipset.3 |
50 |
|
51 |
diff --git a/net-firewall/ipset/files/ipset.systemd b/net-firewall/ipset/files/ipset.systemd |
52 |
new file mode 100644 |
53 |
index 00000000000..f7a5eb510a0 |
54 |
--- /dev/null |
55 |
+++ b/net-firewall/ipset/files/ipset.systemd |
56 |
@@ -0,0 +1,15 @@ |
57 |
+[Unit] |
58 |
+Description=ipset service |
59 |
+Before=network-pre.target iptables.service ip6tables.service firewalld.service |
60 |
+Wants=network-pre.target |
61 |
+ConditionFileNotEmpty=/var/lib/ipset/rules-save |
62 |
+ |
63 |
+[Service] |
64 |
+Type=oneshot |
65 |
+RemainAfterExit=yes |
66 |
+ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore |
67 |
+ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore |
68 |
+ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save |
69 |
+ |
70 |
+[Install] |
71 |
+WantedBy=multi-user.target |
72 |
|
73 |
diff --git a/net-firewall/ipset/ipset-7.4.ebuild b/net-firewall/ipset/ipset-7.4.ebuild |
74 |
new file mode 100644 |
75 |
index 00000000000..dbc327ccc29 |
76 |
--- /dev/null |
77 |
+++ b/net-firewall/ipset/ipset-7.4.ebuild |
78 |
@@ -0,0 +1,111 @@ |
79 |
+# Copyright 1999-2019 Gentoo Authors |
80 |
+# Distributed under the terms of the GNU General Public License v2 |
81 |
+ |
82 |
+EAPI="7" |
83 |
+MODULES_OPTIONAL_USE=modules |
84 |
+inherit autotools linux-info linux-mod systemd |
85 |
+ |
86 |
+DESCRIPTION="IPset tool for iptables, successor to ippool" |
87 |
+HOMEPAGE="http://ipset.netfilter.org/" |
88 |
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
89 |
+ |
90 |
+LICENSE="GPL-2" |
91 |
+SLOT="0" |
92 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
93 |
+ |
94 |
+BDEPEND="virtual/pkgconfig" |
95 |
+ |
96 |
+RDEPEND=">=net-firewall/iptables-1.4.7 |
97 |
+ net-libs/libmnl" |
98 |
+DEPEND="${RDEPEND}" |
99 |
+ |
100 |
+DOCS=( ChangeLog INSTALL README UPGRADE ) |
101 |
+ |
102 |
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch ) |
103 |
+ |
104 |
+# configurable from outside, e.g. /etc/portage/make.conf |
105 |
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
106 |
+ |
107 |
+BUILD_TARGETS="modules" |
108 |
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
109 |
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
110 |
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do |
111 |
+ MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
112 |
+done |
113 |
+ |
114 |
+pkg_setup() { |
115 |
+ get_version |
116 |
+ CONFIG_CHECK="NETFILTER" |
117 |
+ ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
118 |
+ # It does still build without NET_NS, but it may be needed in future. |
119 |
+ #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" |
120 |
+ #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." |
121 |
+ CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" |
122 |
+ ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" |
123 |
+ |
124 |
+ build_modules=0 |
125 |
+ if use modules; then |
126 |
+ if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
127 |
+ if linux_chkconfig_present "IP_NF_SET" || \ |
128 |
+ linux_chkconfig_present "IP_SET"; then #274577 |
129 |
+ eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
130 |
+ eerror "Please either build ipset with modules USE flag disabled" |
131 |
+ eerror "or rebuild kernel without IP_SET support and make sure" |
132 |
+ eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
133 |
+ die "USE=modules and in-kernel ipset support detected." |
134 |
+ else |
135 |
+ einfo "Modular kernel detected. Gonna build kernel modules..." |
136 |
+ build_modules=1 |
137 |
+ fi |
138 |
+ else |
139 |
+ eerror "Nonmodular kernel detected, but USE=modules. Either build" |
140 |
+ eerror "modular kernel (without IP_SET) or disable USE=modules" |
141 |
+ die "Nonmodular kernel detected, will not build kernel modules" |
142 |
+ fi |
143 |
+ fi |
144 |
+ [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
145 |
+} |
146 |
+ |
147 |
+src_prepare() { |
148 |
+ default |
149 |
+ |
150 |
+ eautoreconf |
151 |
+} |
152 |
+ |
153 |
+src_configure() { |
154 |
+ econf \ |
155 |
+ $(use_with modules kmod) \ |
156 |
+ --disable-static \ |
157 |
+ --with-maxsets=${IP_NF_SET_MAX} \ |
158 |
+ --libdir="${EPREFIX}/$(get_libdir)" \ |
159 |
+ --with-ksource="${KV_DIR}" \ |
160 |
+ --with-kbuild="${KV_OUT_DIR}" |
161 |
+} |
162 |
+ |
163 |
+src_compile() { |
164 |
+ einfo "Building userspace" |
165 |
+ emake |
166 |
+ |
167 |
+ if [[ ${build_modules} -eq 1 ]]; then |
168 |
+ einfo "Building kernel modules" |
169 |
+ set_arch_to_kernel |
170 |
+ emake modules |
171 |
+ fi |
172 |
+} |
173 |
+ |
174 |
+src_install() { |
175 |
+ einfo "Installing userspace" |
176 |
+ default |
177 |
+ |
178 |
+ find "${ED}" -name '*.la' -delete || die |
179 |
+ |
180 |
+ newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} |
181 |
+ newconfd "${FILESDIR}"/ipset.confd ${PN} |
182 |
+ systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service |
183 |
+ keepdir /var/lib/ipset |
184 |
+ |
185 |
+ if [[ ${build_modules} -eq 1 ]]; then |
186 |
+ einfo "Installing kernel modules" |
187 |
+ linux-mod_src_install |
188 |
+ fi |
189 |
+} |