commit: 3299ae70d136f8841ea556cd7ad33364201eabee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 04:48:19 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 04:48:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3299ae70
net-firewall/ipset: add 7.16 Signed-off-by: Sam James <sam <AT> gentoo.org> net-firewall/ipset/Manifest | 1 + net-firewall/ipset/files/ipset-7.16-bashism.patch | 46 ++++++++ net-firewall/ipset/ipset-7.16.ebuild | 121 ++++++++++++++++++++++ 3 files changed, 168 insertions(+) diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index dabd8dda8287..db79ace8bb25 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -1 +1,2 @@ DIST ipset-7.15.tar.bz2 680383 BLAKE2B 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed SHA512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a +DIST ipset-7.16.tar.bz2 684512 BLAKE2B c2c58bd6250bab41c3c5cb2ed6a39b1cd5e47a60eca5ed19373dad6c611f5263c61cf12915b5d658700e8e78f4f445788900a2b89cdcdbef3407375b4131fb04 SHA512 e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307 diff --git a/net-firewall/ipset/files/ipset-7.16-bashism.patch b/net-firewall/ipset/files/ipset-7.16-bashism.patch new file mode 100644 index 000000000000..ff4d6b095528 --- /dev/null +++ b/net-firewall/ipset/files/ipset-7.16-bashism.patch @@ -0,0 +1,46 @@ +From 6004475ff78ddb3afd8beadcb5330664d50081f5 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Thu, 24 Nov 2022 04:38:28 +0000 +Subject: [PATCH] configure.ac: fix bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +configure scripts need to be runnable with a POSIX-compliant /bin/sh. + +On many (but not all!) systems, /bin/sh is provided by Bash, so errors +like this aren't spotted. Notably Debian defaults to /bin/sh provided +by dash which doesn't tolerate such bashisms as '=='. + +This retains compatibility with bash. + +Signed-off-by: Sam James <s...@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_ARG_WITH([kmod], + [Build the kernel module (default: yes)]), + [BUILDKMOD="$withval";], + [BUILDKMOD="yes";]) +-AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" == "yes") ++AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" = "yes") + + dnl Additional arguments + dnl Kernel build directory or source tree +@@ -76,7 +76,7 @@ if test "x$enable_bashcompl" = "xyes"; then + AC_SUBST(bashcompdir) + fi + +-if test "$BUILDKMOD" == "yes" ++if test "$BUILDKMOD" = "yes" + then + dnl Sigh: check kernel version dependencies + if test "$KBUILDDIR" != "" +@@ -204,7 +204,7 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include <linux/types.h> + dnl Checks for functions + AC_CHECK_FUNCS(gethostbyname2) + +-if test "$BUILDKMOD" == "yes" ++if test "$BUILDKMOD" = "yes" + then + dnl Check kernel incompatibilities... Ugly like hell + diff --git a/net-firewall/ipset/ipset-7.16.ebuild b/net-firewall/ipset/ipset-7.16.ebuild new file mode 100644 index 000000000000..c19854792ec7 --- /dev/null +++ b/net-firewall/ipset/ipset-7.16.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE=modules +inherit autotools bash-completion-r1 linux-info linux-mod systemd + +DESCRIPTION="IPset tool for iptables, successor to ippool" +HOMEPAGE="https://ipset.netfilter.org/"; +SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + +RDEPEND=" + >=net-firewall/iptables-1.4.7 + net-libs/libmnl:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( ChangeLog INSTALL README UPGRADE ) + +PATCHES=( + "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch + "${FILESDIR}"/${PN}-7.16-bashism.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/)" +MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)" +for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,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." + CONFIG_CHECK+=" NETFILTER_NETLINK" + ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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/<your_kernel>/... ." + 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() { + export bashcompdir="$(get_bashcompdir)" + + econf \ + --enable-bashcompl \ + $(use_with modules kmod) \ + --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 +}
