From be6d21ef38c1f21798d896325af41024ec464e9e Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Thu, 27 Aug 2020 18:54:40 +0200 Subject: [PATCH] net-firewall/ipset: update to ipset-7.6 Signed-off-by: Thilo Fromm --- .../net-firewall/ipset/Manifest | 1 + .../files/ipset-7.4-fix-pkgconfig-dir.patch | 11 ++ .../net-firewall/ipset/files/ipset.initd-r4 | 4 +- .../net-firewall/ipset/files/ipset.systemd | 15 +++ .../net-firewall/ipset/ipset-7.6.ebuild | 111 ++++++++++++++++++ 5 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd create mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest index b341593cec..3bd1176d1a 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest @@ -11,6 +11,7 @@ DIST ipset-6.20.1.tar.bz2 500898 SHA256 356cac020438cd0871acbfc4cb119b8296030f0b DIST ipset-6.21.1.tar.bz2 510013 SHA256 cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb WHIRLPOOL 230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b DIST ipset-6.24.tar.bz2 518811 SHA256 3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6 WHIRLPOOL d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112 DIST ipset-6.29.tar.bz2 542735 SHA256 6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3 WHIRLPOOL 8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999 +DIST ipset-7.6.tar.bz2 676777 BLAKE2B 98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061 SHA512 c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084 EBUILD ipset-6.15.ebuild 3233 SHA256 b0c3e06e939025b5a7d819fe53e99699afb3f726d5051f4cc2f80b84c2b00a08 SHA512 2e7cae5122480929018dd8c60d939d15efdbfebf5cd862eecac43ba467d921900ecba3204755cfc5792e174b8c2374e9a8ce3f609fcdb9a481a88a41800a8ee3 WHIRLPOOL d9e1b59c9f088b66f457bbdc765cad9a67ab5637ba18462a4e2077f8d41dc9d41d9ecb255ad7c010a7fd0005b0dddcfaf51d8a75fb130b965b5f1c9feb4eb3e4 EBUILD ipset-6.16.1.ebuild 3208 SHA256 89af801936191bdc00ab11bcd820472782a636af6e001ce9c9e75725350e4fe1 SHA512 3d90939bd7375a357c7d1857a98cf083e8e1b6846055c4ae6a602799a0189ecae5c1dec05c9216a5bff65a539942c9e2f2a7953dcdfc927e63ff2d7ceae8be9e WHIRLPOOL 1430e819b48a2b4b5d35df4ab2e7be03a76b849a1e207b5d0016e5cdf0acd9dbca3df1bac929cfa08497e292ec137d8ea9b067d0fcc5b347c67bb9701163041f EBUILD ipset-6.16.ebuild 3208 SHA256 89af801936191bdc00ab11bcd820472782a636af6e001ce9c9e75725350e4fe1 SHA512 3d90939bd7375a357c7d1857a98cf083e8e1b6846055c4ae6a602799a0189ecae5c1dec05c9216a5bff65a539942c9e2f2a7953dcdfc927e63ff2d7ceae8be9e WHIRLPOOL 1430e819b48a2b4b5d35df4ab2e7be03a76b849a1e207b5d0016e5cdf0acd9dbca3df1bac929cfa08497e292ec137d8ea9b067d0fcc5b347c67bb9701163041f diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch new file mode 100644 index 0000000000..b10ddbd4fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch @@ -0,0 +1,11 @@ +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \ + + EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/$(libdir)/pkgconfig + pkgconfig_DATA = libipset.pc + + dist_man_MANS = libipset.3 diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 index d3e8409128..32ab581d8c 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 @@ -1,7 +1,6 @@ #!/sbin/openrc-run # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ extra_commands="save" extra_started_commands="reload" @@ -89,8 +88,7 @@ reload() { save() { ebegin "Saving ipset session" - touch "${IPSET_SAVE}" - chmod 0600 "${IPSET_SAVE}" + checkpath --file --mode 0600 "${IPSET_SAVE}" ipset save > "${IPSET_SAVE}" eend $? } diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd new file mode 100644 index 0000000000..f7a5eb510a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd @@ -0,0 +1,15 @@ +[Unit] +Description=ipset service +Before=network-pre.target iptables.service ip6tables.service firewalld.service +Wants=network-pre.target +ConditionFileNotEmpty=/var/lib/ipset/rules-save + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore +ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore +ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save + +[Install] +WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.6.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.6.ebuild new file mode 100644 index 0000000000..bfc65c7818 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.6.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +MODULES_OPTIONAL_USE=modules +inherit autotools linux-info linux-mod systemd + +DESCRIPTION="IPset tool for iptables, successor to ippool" +HOMEPAGE="http://ipset.netfilter.org/" +SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~x86" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=">=net-firewall/iptables-1.4.7 + net-libs/libmnl" +DEPEND="${RDEPEND}" + +DOCS=( ChangeLog INSTALL README UPGRADE ) + +PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch ) + +# configurable from outside, e.g. /etc/portage/make.conf +IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} + +BUILD_TARGETS="modules" +MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" +MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" +for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do + MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" +done + +pkg_setup() { + get_version + CONFIG_CHECK="NETFILTER" + ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." + # It does still build without NET_NS, but it may be needed in future. + #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" + #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." + CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" + ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" + + build_modules=0 + if use modules; then + if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then + if linux_chkconfig_present "IP_NF_SET" || \ + linux_chkconfig_present "IP_SET"; then #274577 + eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." + eerror "Please either build ipset with modules USE flag disabled" + eerror "or rebuild kernel without IP_SET support and make sure" + eerror "there is NO kernel ip_set* modules in /lib/modules//... ." + die "USE=modules and in-kernel ipset support detected." + else + einfo "Modular kernel detected. Gonna build kernel modules..." + build_modules=1 + fi + else + eerror "Nonmodular kernel detected, but USE=modules. Either build" + eerror "modular kernel (without IP_SET) or disable USE=modules" + die "Nonmodular kernel detected, will not build kernel modules" + fi + fi + [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup +} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_with modules kmod) \ + --disable-static \ + --with-maxsets=${IP_NF_SET_MAX} \ + --libdir="${EPREFIX}/$(get_libdir)" \ + --with-ksource="${KV_DIR}" \ + --with-kbuild="${KV_OUT_DIR}" +} + +src_compile() { + einfo "Building userspace" + emake + + if [[ ${build_modules} -eq 1 ]]; then + einfo "Building kernel modules" + set_arch_to_kernel + emake modules + fi +} + +src_install() { + einfo "Installing userspace" + default + + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} + newconfd "${FILESDIR}"/ipset.confd ${PN} + systemd_newunit "${FILESDIR}"/ipset.systemd ${PN}.service + keepdir /var/lib/ipset + + if [[ ${build_modules} -eq 1 ]]; then + einfo "Installing kernel modules" + linux-mod_src_install + fi +}