diff options
Diffstat (limited to 'net-firewall')
26 files changed, 605 insertions, 205 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz Binary files differindex 1ce9cae9b0f4..fa5c590c42ea 100644 --- a/net-firewall/Manifest.gz +++ b/net-firewall/Manifest.gz diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest index 055ab6a17a93..b1a39cf9d652 100644 --- a/net-firewall/conntrack-tools/Manifest +++ b/net-firewall/conntrack-tools/Manifest @@ -9,5 +9,6 @@ DIST conntrack-tools-1.4.7.tar.bz2.sig 566 BLAKE2B c513cd59d9aeb76bb33bb8c4e0d25 DIST conntrack-tools-1.4.8.tar.xz 452980 BLAKE2B 2f8a7d7facf4890a8ca7dec54d5faa1383ad5e449a0599707578567e9c8ed6fd63ca308538afc34e99121e39e80c1ce686c8dda89247abdf4699bb420b52c4fb SHA512 95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf DIST conntrack-tools-1.4.8.tar.xz.sig 566 BLAKE2B 65c2ee185b099281603bca179038bd9ab6e28756f9fa12a53a8bcb75ed561097c9e4672c45fcecc366b86b65e1753073808090e264671d3a3d8dd18ed6f4d680 SHA512 8cd229d2e980ab1788e90fc8f53827fe1e4b21801cad6cddf6a9ff537501c40c52242cc964005b2889ad0a4548c772304db8696d4644611ecf9f091aca5c14ee EBUILD conntrack-tools-1.4.7-r1.ebuild 2741 BLAKE2B 34d581720fb7d86c078be5afc7a99e1f3ebdce2646b653a53b423079d13ab9235ff1c6dc6de242ae39b11aa209cbd3deffbed5edb938c976cd6431793fb9a0b9 SHA512 9abe9348dbd764eb42f659cf9beae51d4dd0e4d70548a67f4e31baea3ce66938f31385799e2d4fe62c664778cd093cc62b21edcd67eafbfcfc476dce2c603200 +EBUILD conntrack-tools-1.4.8-r1.ebuild 2474 BLAKE2B a51f041aa953a5b1524d27e44e8e729b971d6129073ecd36a411893f8e5e4beb0b58753f8c18fde380bf12bd1685987cc880eabcc69b876751334e803e0770d3 SHA512 d9df0dc185fe729d26b61748eb2e698ccacef0614a931e43a3dfeefb3736ed58027f4eb23f0a804ee9a73d98668f8f30919e143a76dee7125c4f565412c44fd4 EBUILD conntrack-tools-1.4.8.ebuild 2426 BLAKE2B c18a17fb8317167c0c01d08017c1c55007ee5a28b801355ec3617f9e4bd509f1c268c82ae2297bff39e505591a4bac2619d40ec4dc0ff3b5ae4286e3d52557be SHA512 acbb19587d3740e5854021d00a209313b5b771b29c80e54b79117741187680188538509435737158bb506e44a72022b3a52e9c0af06998be348b3b986067695e MISC metadata.xml 971 BLAKE2B 208df8b4957f46de52dd46b4a8bf5dbd879c0de41f7c48f524f088f4fb88b57f4767d5040da35e62d1b42da0082a0820d55366e70582c5057370d1e1aa5053bc SHA512 8dbd44b107bac7ac454d25250933eb34b0396297e0c16afec693a13e1f4ea773feeaf20499fbe369540b3ad70d296ef067d4f9752d0c9d8d81647d1828f0a8f2 diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.8-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.8-r1.ebuild new file mode 100644 index 000000000000..ff8d0251fc47 --- /dev/null +++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.8-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit linux-info systemd verify-sig + +DESCRIPTION="Connection tracking userspace tools" +HOMEPAGE="https://conntrack-tools.netfilter.org" +SRC_URI=" + https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.xz + verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.xz.sig ) +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc +cthelper +cttimeout systemd" + +RDEPEND=" + >=net-libs/libmnl-1.0.3 + >=net-libs/libnetfilter_conntrack-1.0.9 + >=net-libs/libnetfilter_queue-1.0.2 + >=net-libs/libnfnetlink-1.0.1 + net-libs/libtirpc + cthelper? ( + >=net-libs/libnetfilter_cthelper-1.0.0 + ) + cttimeout? ( + >=net-libs/libnetfilter_cttimeout-1.0.0 + ) + systemd? ( + >=sys-apps/systemd-227 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) + verify-sig? ( sec-keys/openpgp-keys-netfilter ) +" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is lt 2 6 18 ; then + die "${PN} requires at least 2.6.18 kernel version" + fi + + # netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="~NF_CT_NETLINK" + fi + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK + ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" + + check_extra_config + + linux_config_exists || \ + linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ + linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ + ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ + "are not set when one at least should be." +} + +src_prepare() { + default + + # bug #474858 + sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die +} + +src_configure() { + econf \ + $(use_enable cthelper) \ + $(use_enable cttimeout) \ + $(use_enable systemd) +} + +src_compile() { + default + + use doc && emake -C doc/manual +} + +src_install() { + default + + newinitd "${FILESDIR}"/conntrackd.initd-r3 conntrackd + newconfd "${FILESDIR}"/conntrackd.confd-r2 conntrackd + + insinto /etc/conntrackd + doins doc/stats/conntrackd.conf + + systemd_dounit "${FILESDIR}"/conntrackd.service + + dodoc -r doc/sync doc/stats AUTHORS TODO + use doc && dodoc doc/manual/${PN}.html + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index 84cc3ce568c1..dcf7dcc8b393 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -3,6 +3,8 @@ AUX firewalld-systemd-service.patch 769 BLAKE2B fbd8392b6f542413ae2896f8830faa0d AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1 DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a +DIST firewalld-2.2.3.tar.bz2 1310686 BLAKE2B dba517166e1588195ac76123503a2526ffa6c7bd884953ba7ec2806f9ef3a93a879936e48e0d5b638c6e3e888b558757989f8035106cc103eab92d72d8a077be SHA512 e1b1d5fc372359ecbbc074be15e8a9dc4e39836545d5a1364f05deb07eb6e43505eb37589a7b0fb5f3115e3ed3fbc58efe447e2d5b0dcc716a66903c63df824b EBUILD firewalld-2.1.1-r5.ebuild 5356 BLAKE2B 3d2ca4ce68b4c40b081c30780af9c32df51c9f857315c2b11bfdef56d67e5708d9569e0405d689499248dee395a83583e4a758879e42f5207b955ba08956738c SHA512 80266f187abd46119dbe2edcbc7b6c7f85e92cb5547652610a23bca833121d73859bf98a0b4f1dbaec5d313eff9680f3efce6e52b139050d05d05b7f303c17b7 -EBUILD firewalld-2.2.1-r1.ebuild 4854 BLAKE2B 6259dffa729262aa8902b4654fa3ba6a557db1834da74dbba67b9ea126c7457755c4bcf5231e640c8cc5d44cd67db18b13d3c206cab3d384b5936353b74238eb SHA512 a5202f1ea58452318cb106d305608a921a851346060e9ab40f3f5201a243a553449b9d862e6769d4d7a9329d56507d18ab9aad3fc99d79617b0363b5f384ef20 +EBUILD firewalld-2.2.1-r1.ebuild 4854 BLAKE2B ff6b6d0d3ff7c93831d36244de4935c2f42ae7db0b437f3fd769d473afe41aeec39e996495195cbb1319acea094cbadf442faa08408cc70662453cdcf5e8cf74 SHA512 ffa4b80719aeff75650b8289e9f55825fbc86dbffc92584fb3654166534ff7a862f089ad475f6cb6ee007b0c75f0ca54a7de4ca8e6f6133b111b9a691a77f5ff +EBUILD firewalld-2.2.3.ebuild 4859 BLAKE2B 68325a973970db419f10f545df43dcdf4c731ce1ce00951321fafa7e50ebc7b4cbfbdad668389992247adb5fe33b50728c8b69416f3256b061555640133663a2 SHA512 50dcf983e8bd07822d84ba66bc6af7ffcd7ca50ab81507a8ca589de1f73af7fef37fcedc5c42c2a7ec1f555d317164d52ac57a49f911bd917473d0f87cc03c3b MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild index f017a3287621..4a115f5bf943 100644 --- a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild +++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 gnome2-utils linux-info optfeature inherit plocale python-single-r1 systemd xdg-utils @@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" IUSE="gui selinux test" # Tests are too unreliable in sandbox environment RESTRICT="!test? ( test ) test" diff --git a/net-firewall/firewalld/firewalld-2.2.3.ebuild b/net-firewall/firewalld/firewalld-2.2.3.ebuild new file mode 100644 index 000000000000..d08a06d0215c --- /dev/null +++ b/net-firewall/firewalld/firewalld-2.2.3.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 gnome2-utils linux-info optfeature +inherit plocale python-single-r1 systemd xdg-utils + +DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall" +HOMEPAGE="https://firewalld.org/" +SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="gui selinux test" +# Tests are too unreliable in sandbox environment +RESTRICT="!test? ( test ) test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + || ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd ) + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}] + gui? ( + x11-libs/gtk+:3 + dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}] + ) + ') + net-firewall/nftables[xtables(+)] + selinux? ( sec-policy/selinux-firewalld ) +" +DEPEND=" + ${RDEPEND} + dev-libs/glib:2 +" +BDEPEND=" + app-text/docbook-xml-dtd + >=dev-util/intltool-0.35 + sys-devel/gettext +" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-systemd-service.patch +) + +pkg_setup() { + # See bug #830132 for the huge list + # We can probably narrow it down a bit but it's rather fragile + local CONFIG_CHECK=" + ~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK + ~NETFILTER + ~NETFILTER_ADVANCED + ~NETFILTER_INGRESS + ~NF_NAT_MASQUERADE + ~NF_NAT_REDIRECT + ~NF_TABLES_INET + ~NF_TABLES_IPV4 + ~NF_TABLES_IPV6 + ~NF_CONNTRACK + ~NF_CONNTRACK_BROADCAST + ~NF_CONNTRACK_NETBIOS_NS + ~NF_CONNTRACK_TFTP + ~NF_CT_NETLINK + ~NF_CT_NETLINK_HELPER + ~NF_DEFRAG_IPV4 + ~NF_DEFRAG_IPV6 + ~NF_NAT + ~NF_NAT_TFTP + ~NF_REJECT_IPV4 + ~NF_REJECT_IPV6 + ~NF_SOCKET_IPV4 + ~NF_SOCKET_IPV6 + ~NF_TABLES + ~NF_TPROXY_IPV4 + ~NF_TPROXY_IPV6 + ~IP_NF_FILTER + ~IP_NF_IPTABLES + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP_NF_RAW + ~IP_NF_SECURITY + ~IP_NF_TARGET_MASQUERADE + ~IP_NF_TARGET_REJECT + ~IP6_NF_FILTER + ~IP6_NF_IPTABLES + ~IP6_NF_MANGLE + ~IP6_NF_NAT + ~IP6_NF_RAW + ~IP6_NF_SECURITY + ~IP6_NF_TARGET_MASQUERADE + ~IP6_NF_TARGET_REJECT + ~IP_SET + ~NETFILTER_CONNCOUNT + ~NETFILTER_NETLINK + ~NETFILTER_NETLINK_OSF + ~NETFILTER_NETLINK_QUEUE + ~NETFILTER_SYNPROXY + ~NETFILTER_XTABLES + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MATCH_CONNTRACK + ~NETFILTER_XT_MATCH_MULTIPORT + ~NETFILTER_XT_MATCH_STATE + ~NETFILTER_XT_NAT + ~NETFILTER_XT_TARGET_MASQUERADE + ~NFT_COMPAT + ~NFT_CT + ~NFT_FIB + ~NFT_FIB_INET + ~NFT_FIB_IPV4 + ~NFT_FIB_IPV6 + ~NFT_HASH + ~NFT_LIMIT + ~NFT_LOG + ~NFT_MASQ + ~NFT_NAT + ~NFT_QUEUE + ~NFT_QUOTA + ~NFT_REDIR + ~NFT_REJECT + ~NFT_REJECT_INET + ~NFT_REJECT_IPV4 + ~NFT_REJECT_IPV6 + ~NFT_SOCKET + ~NFT_SYNPROXY + ~NFT_TPROXY + ~NFT_TUNNEL + ~NFT_XFRM + " + + # kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944 + if kernel_is -lt 4 19; then + CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6" + fi + + # bug #831259 + if kernel_is -le 5 4 ; then + CONFIG_CHECK+=" ~NF_TABLES_SET" + fi + + # bug #853055 + if kernel_is -lt 5 18 ; then + CONFIG_CHECK+=" ~NFT_COUNTER" + fi + + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + + linux-info_pkg_setup +} + +src_prepare() { + default + + plocale_find_changes "po" "" ".po" || die + plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS +} + +src_configure() { + python_setup + + local myeconfargs=( + --enable-systemd + --with-systemd-unitdir="$(systemd_get_systemunitdir)" + --with-bashcompletiondir="$(get_bashcompdir)" + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + python_optimize + + # Get rid of junk + rm -rf "${ED}"/etc/sysconfig/ || die + + # For non-gui installs we need to remove GUI bits + if ! use gui; then + rm -rf "${ED}"/etc/xdg/autostart || die + rm -f "${ED}"/usr/bin/firewall-applet || die + rm -f "${ED}"/usr/bin/firewall-config || die + rm -rf "${ED}"/usr/share/applications || die + rm -rf "${ED}"/usr/share/icons || die + fi + + newinitd "${FILESDIR}"/firewalld.init firewalld +} + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update + + # bug #833569 + optfeature "changing zones with NetworkManager" gnome-extra/nm-applet +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index e6b8ff9e3c88..66c5d232d8ff 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -6,6 +6,5 @@ AUX ipset.confd-r1 666 BLAKE2B 852963fd27d11f58305f33cc9be84d5eabde73f5af4924d97 AUX ipset.initd-r7 4175 BLAKE2B 8a9936ffc57ffcf25ed45769d6cb76cecc0de66919597a90e440156d7cf938ed5ffc6b71aed634cbc473c866ad542d9eb388e3d91ebd697949ceaa763ce24e80 SHA512 d208ee673119182ee515c25263704e0e5bbae1aefbf5ec469ca71f3e70e14900c5a2d8f0171b3a5754afbcc464d30a760d0e413b1b66ccb0d3805327fdd66b65 AUX ipset.systemd-r1 492 BLAKE2B 78fd7b122e0fe08b36d36e736d18b7a5f0bf1aa78802f1bdc7abf69ad2ef9c0bcfb22ae84f8f6489aee6c147ee3c0be7ebfa600712bf6169940802466daf68ba SHA512 6574e48ce6b3c4f45122a8b387746793ceda62f68ec8b0f3f6f949f5650ab557f3f7eb75699e36d5bf04efbf39dc17e030cc44ea9d97891578d4c909669e6eb7 DIST ipset-7.22.tar.bz2 694069 BLAKE2B 9daaff54adb6f9daf69cd7dabbd9134d8fcf8cd7f8ef0c52296961579ad3c8202087158a01664228eff70356ba97f77ec61abbab7c7ce323112fbdc32abd661b SHA512 e375a9110eb7974480147c57eb2cff4bdd03c7704cdae006a3d254cc80fada587aa8aee25a86f7cab29db83f5e283c5f9a47a314297317660ebba5097f623d79 -EBUILD ipset-7.22-r1.ebuild 3520 BLAKE2B b087322a155d4d40d2f7fc189a0d9c00d3cf33af9c8fb37ff6af22674fa06bcbdc00323404beb30ffdf07ada193077fff710bdb500d5309ccf8560ef1671054f SHA512 e222f15b72213d7926554261a0ef9c7544eda5cbe2e7ce19e6a0b8fe5c41fd76902c9d3d08be2fa1e5836384ef46f3026290a6acbc6517e85de1c8064e41ad48 -EBUILD ipset-7.22-r2.ebuild 3573 BLAKE2B acc642cfdba8ae813ba81831572c1318366c87f217dcf3314a4f6e914d3f4ebcc9fd23daf4d90c440e3f7fb14d772078ca7479e4cb276ec9b00078fd6e38b0e8 SHA512 b57f7a555e7b2f872b5ea8a4aba957e0bd0c0e9b4c445100ed16f399e70d7f506d92d2cba0b719e0d9ce1943b1796f37ab089208dca98b9ccc7930d88251fa4a +EBUILD ipset-7.22-r2.ebuild 3567 BLAKE2B e3775ef8927c1bd96d30064e04c9302d4e3025cbd6b9c73af9b2f65956a198b2164b9c9903eb9f0bc49122c98df0c89de12e970610f3de88118da93fccc9cabf SHA512 11d975b834bf0b376396a88265b8f65c3fbbb442c02826292926a6e31e045eb7ff2bec4447e11deae76e55b75cf3424b227999bf6505465f89977f673ebda897 MISC metadata.xml 475 BLAKE2B e1e06003a410249ed76d39b74ccbcd64b8572ff05f1c818729d787cecfb19cfa9c7e3463473688abc7a398efb908b0c7145bad88bbb7259e69f1b7d985584bcc SHA512 d0a3dca6593e8a62cbf5c325eb59b620137af8d8f5a463702c4d6ec102fd03b8adbbdcd9358777d0461f57a98d892d359d80b8f722d3f322f3d4766d762f6585 diff --git a/net-firewall/ipset/ipset-7.22-r1.ebuild b/net-firewall/ipset/ipset-7.22-r1.ebuild deleted file mode 100644 index 71fed5deb0fe..000000000000 --- a/net-firewall/ipset/ipset-7.22-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_OPTIONAL_IUSE=modules -inherit autotools bash-completion-r1 linux-mod-r1 systemd - -DESCRIPTION="IPset tool for iptables, successor to ippool" -HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/" -SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - -RDEPEND=" - net-firewall/iptables - net-libs/libmnl:= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( ChangeLog INSTALL README UPGRADE ) - -# configurable from outside, e.g. /etc/portage/make.conf -IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} - -PATCHES=( - "${FILESDIR}/${PN}-bash-completion.patch" - "${FILESDIR}/${P}-asan-buffer-overflow.patch" - "${FILESDIR}/${P}-argv-bounds.patch" -) - -src_prepare() { - default - eautoreconf -} - -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-r1_pkg_setup -} - -src_configure() { - export bashcompdir="$(get_bashcompdir)" - - econf \ - --enable-bashcompl \ - $(use_with modules kmod) \ - --with-maxsets=${IP_NF_SET_MAX} \ - --with-ksource="${KV_DIR}" \ - --with-kbuild="${KV_OUT_DIR}" -} - -src_compile() { - einfo "Building userspace" - - local modlist=( xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/: - em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules ) - - 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 - modlist+=( ${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset ) - done - - emake - - if [[ ${build_modules} -eq 1 ]]; then - einfo "Building kernel modules" - linux-mod-r1_src_compile - fi -} - -src_install() { - einfo "Installing userspace" - default - - find "${ED}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/ipset.initd-r7 ${PN} - newconfd "${FILESDIR}"/ipset.confd-r1 ${PN} - systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service - keepdir /var/lib/ipset - - if [[ ${build_modules} -eq 1 ]]; then - einfo "Installing kernel modules" - linux-mod-r1_src_install - fi -} diff --git a/net-firewall/ipset/ipset-7.22-r2.ebuild b/net-firewall/ipset/ipset-7.22-r2.ebuild index 5024380e1283..affe9147840d 100644 --- a/net-firewall/ipset/ipset-7.22-r2.ebuild +++ b/net-firewall/ipset/ipset-7.22-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" RDEPEND=" net-firewall/iptables diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index f4851c79d382..c10de6af139e 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -10,8 +10,8 @@ AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dc AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e DIST iptables-1.8.10.tar.xz 641168 BLAKE2B 417b33fcfc7edeba169caef26ed0322798f6b82500840509f6c10b97b4ef3f11932c0393fc8dcc5946264442bf8ee959a594b6fbd5dc92012cfad30edf130520 SHA512 71e6ed2260859157d61981a4fe5039dc9e8d7da885a626a4b5dae8164c509a9d9f874286b9468bb6a462d6e259d4d32d5967777ecefdd8a293011ae80c00f153 DIST iptables-1.8.9.tar.xz 637848 BLAKE2B 37ba80be0ee7049c4d3ee5689b273b4d2cc6e6fb9ebb297e86976b5750f987f2ae4536013fe1749ae79b6989c241eaece3202019fafd47d842c7a4fe3e5093b1 SHA512 e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70 -EBUILD iptables-1.8.10-r1.ebuild 4567 BLAKE2B ed3ef70fe7e0e72e9124c752068870222bf55f002812985ac87cd13a68e8ecbbe07f4a2adf52436b28176287035736b2e5d4114862749e78ae5bcf16e8f174cf SHA512 b1afc31a01047d3d4399a9c26ba61e90f1b40f163f04fc205c1117df0ebbb2eccb63df2fdcf3eee72cd99316283c86ab805276dd96d2f5ae873279a5d906cfc9 -EBUILD iptables-1.8.10.ebuild 4664 BLAKE2B e82b0eaf9448696e8c9163a3c389095cc973a725979a2a582b1850c25bdb0a33006e7d7a7e23ef8ce205d04f14b5ff7e19d104c9fe892403378a30a6aab02392 SHA512 62a7c2e0807a67266fdc0df30806fb6b63b83f44b70c73dcda7e4e0303e0e530148135efd9e137ca44cfbcc53663b7402a45c87948f2c0f5c89173bbb599feec -EBUILD iptables-1.8.9-r2.ebuild 4681 BLAKE2B 7351c269b83c5cd41547e0bee5d5b55e0c1fe51ee316fb96b2db4c1689550db79970f3f8a2b20cba2fb4990157328f0115529a8fa467048cf1f6a03b648ee9fa SHA512 5003888f620e3fb68ba0b4bf482771607f0010274369ea25fed9cfe8ba8265c08421f099edb0b361f5f24fb95a408b9209e231336acda183b929c91f246d0d20 -EBUILD iptables-1.8.9.ebuild 4556 BLAKE2B 76c710543d3aaa744ea299126cb97ac793f7c7c382cadbaab6e378d4249901d65cc7eb0ab9bf95e0571fd6902c74f5b207b3a6b4297f67d22743d52eed5419a3 SHA512 73c363ceec2be0a032088a9ddcbf7b4c6abf0886f32d59fb20369f6a816f3e29025a938e5c9326d36e4032a8a2c2795c61e625556c7e4614021e3fec6378c258 +EBUILD iptables-1.8.10-r1.ebuild 4561 BLAKE2B 14417d62fcd1e9102f543c664c81a834fae8392799e0a3cec107baa77f234228a0853fd48f6b06b5b79f5183eb4002c6e9445b7aa809cbb17ed618f5a9eb4f75 SHA512 437e1c541f0e959a80dd9e8938c82f2ccf23872cfefc84451a70ef75d74b7603a33a23be1a5c7ff31c0336bd613504c7249743d0d15e53022b2709e72cd1e545 +EBUILD iptables-1.8.10.ebuild 4658 BLAKE2B 878e6bc44f8bf6b2352217e225e1809f20e99ac62a872088b3ff6270610833ef24d6e7bb2a5d342899a33104071744b3895855c02b3fe0a7a24f0f041631c42f SHA512 bfc698898996b1154179d8f972c652b535e4454542923eb25a2c4503f4fc10bdfb2cc5bf702d5662c28881070474a8b61be0e899f3eef3d312cc1a2a7fca2970 +EBUILD iptables-1.8.9-r2.ebuild 4675 BLAKE2B eabc6ee05e768d69c1957d00e83b57032332f6444b1be70e54b3ccfaa7a0c3aaac2ebdd4413ee1012838bee256994e29b9ca5ea384b736bd9501f4ccb6fc6542 SHA512 1da93698bd9d7bc057a763686e32c85cf3525bdbf23d1bb94f5aa0846501d571fa2e5571a3db0bd3667e1167930a088ba5d474be4ff8c85b10a937ecc07a6768 +EBUILD iptables-1.8.9.ebuild 4550 BLAKE2B cf8ab3600795d1c327ac593a6152111bc17a6914eb29ea76ae27fa03b8555c90f1c15e5acdfab56290e636ff7b6080430a2054d1c4a5e6e25669c234c7a54149 SHA512 1a15dd7c07704ed2c5b3b3a30633e8c97ff1618f1f6a3e2b962d7b41c2d2930cc9477075ea4254a6dc12208fb87f8663f3dae994176a858882df6635a201dbea MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842 diff --git a/net-firewall/iptables/iptables-1.8.10-r1.ebuild b/net-firewall/iptables/iptables-1.8.10-r1.ebuild index 605fc7637a5c..2ffa21efe820 100644 --- a/net-firewall/iptables/iptables-1.8.10-r1.ebuild +++ b/net-firewall/iptables/iptables-1.8.10-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" # Subslot reflects PV when libxtables and/or libip*tc was changed # the last time. SLOT="0/1.8.3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="conntrack netlink nftables pcap static-libs test" RESTRICT="!test? ( test )" # TODO: skip tests needing nftables if no xtables-nft-multi (bug #890628) diff --git a/net-firewall/iptables/iptables-1.8.10.ebuild b/net-firewall/iptables/iptables-1.8.10.ebuild index 8060369d9feb..393d59e86718 100644 --- a/net-firewall/iptables/iptables-1.8.10.ebuild +++ b/net-firewall/iptables/iptables-1.8.10.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" # Subslot reflects PV when libxtables and/or libip*tc was changed # the last time. SLOT="0/1.8.3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="conntrack netlink nftables pcap static-libs test" RESTRICT="!test? ( test )" # TODO: skip tests needing nftables if no xtables-nft-multi (bug #890628) diff --git a/net-firewall/iptables/iptables-1.8.9-r2.ebuild b/net-firewall/iptables/iptables-1.8.9-r2.ebuild index 1c867f287d83..d726e124e301 100644 --- a/net-firewall/iptables/iptables-1.8.9-r2.ebuild +++ b/net-firewall/iptables/iptables-1.8.9-r2.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" # Subslot reflects PV when libxtables and/or libip*tc was changed # the last time. SLOT="0/1.8.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="conntrack netlink nftables pcap static-libs test" RESTRICT="!test? ( test )" # TODO: skip tests needing nftables if no xtables-nft-multi (bug #890628) diff --git a/net-firewall/iptables/iptables-1.8.9.ebuild b/net-firewall/iptables/iptables-1.8.9.ebuild index 4477f3edc064..89c013282510 100644 --- a/net-firewall/iptables/iptables-1.8.9.ebuild +++ b/net-firewall/iptables/iptables-1.8.9.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" # Subslot reflects PV when libxtables and/or libip*tc was changed # the last time. SLOT="0/1.8.3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="conntrack netlink nftables pcap static-libs" COMMON_DEPEND=" diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index c669a7a94571..df366819a618 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -11,7 +11,10 @@ DIST nftables-1.0.9.tar.xz 971968 BLAKE2B 1dfd1e79d3a7b645fd0995dad10893d70dbd13 DIST nftables-1.0.9.tar.xz.sig 566 BLAKE2B d4bb0a1f629d2950753799fba18f6c3ce50e5ff242816e392245a714bfeccb3408583added4362f1e0da47cc6e30b0b95f864cf8443a1872d59ae40b15b5f706 SHA512 9b96ce8539700713ff4802fb2deff5b2ea0dd3155c45f5a8f49a45f70226893c7449e0b79504833b2e63e5290290e693c962128a226ca8f6ca281185bdcd7b51 DIST nftables-1.1.0.tar.xz 1057672 BLAKE2B cc876d9ba344480a2f5a12811206356d9edbd4a95d29e8127f43864a1b4e2ae9bc88a6d07f0d36469dfed190c5822fd6a7c69b6a9028fbb0bc1ec254e76083d9 SHA512 0b0c6789b7d987289b9770ea2d26e640c50bc7f300685476c4fc367b5ad3d6980fca63b8fe701f727fb3a94328eb7dc560ed5745b5ce44f171022de5714d3a86 DIST nftables-1.1.0.tar.xz.sig 566 BLAKE2B 556287b40ad6f82d229ae18910ec2008c3168c7088e7149f8b5e80ca9983b90ec202cf01838c80e973845dd565f4f13a454d6dc99030a3f9cede6c33929da07d SHA512 1b3a42a76b378373c8a21b77aaf9c1fc57402360d49d56b22f02c50bef969b1f6867a4d40bda24b2dd1a0dfcf7148893938a7eea84ff8cc67d9edcd6b9b62bb4 -EBUILD nftables-1.0.9.ebuild 6478 BLAKE2B 67415f3877ba9d24eb995bb97f4bd93520d9fc70d7fde48b743779879886aad83d4cb3b5bcebbb3b63d27038d2e556c99b01979e539db1054058759b3830a663 SHA512 cd4ee3af488cc918cead56406f54a5b74dc54e3aabab3e63e7b704922add8cb652d509ea87b6c3227455bf0805b12fb328a94992062cc09c3ed9710be4bc7b85 -EBUILD nftables-1.1.0-r1.ebuild 6570 BLAKE2B a4fb963a29cfedf3a596377479ad8419b3609ada67362d499ab0a0ff7150a2effa9c23f662c199d808c878256b89b3d5526b8f3fe7ccf1950ba39383ebbb6435 SHA512 5ecd1232140316d7b9b9fe07c2ab44e702c099f11b62f7a5c21f12a253bdbddacd52d8a1d4573d5917eb4bde470c35c4841bd5f1032a0eb9d47c009a01f1efd6 -EBUILD nftables-9999.ebuild 6488 BLAKE2B eb5ca8ea1b6bd0ef187bc45aed113b0e24e691d958cd08c32b5f67bdbd2b22b25fbc438f77f5c54cd1e87cdda5b89e48a2d86dc58d04520920bcca09bb0ad0f6 SHA512 47848d0eb477c62ecc3250aa0bc2cfc20b4ec5226e377e3f533ee2e4c79189e2beb41ef77d424a8258bab8b1401cadff837fc327fa20eaa9faad00b2c9d34e05 +DIST nftables-1.1.1.tar.xz 989700 BLAKE2B f273c78369ba755049c6afa63eba195cf29f926fa8fc9bf344022904c00a8c6c4259cc5093e23993a55fd25790af575305df79a7c28624fa7082661b2eed70d0 SHA512 676413d4adadffb15d52c1f8f6432636cab83a7bcda1a18d9f0e6b58819a2c027a49922588c02bd9ad386de930eaa697bfe74c0938b595bf1ee485bfa7cf2e50 +DIST nftables-1.1.1.tar.xz.sig 566 BLAKE2B b7debda3373972f69af9b4b23e1b66a8fd156440187aafba605bb7342c267207e5aa628256e96432ebd4583a6a9436e1969a33636111d2bd8d57185a01e2d502 SHA512 fc23034c512f686167203e827ff2a8f7cb64530211ce92a28793bd49577ce3bf519ffbe910b0071cb21925898497cb5cbf70121c68bfcdbfa4460c63a14203ac +EBUILD nftables-1.0.9.ebuild 6472 BLAKE2B 28da5e49bdf6f55f3e5811d0563c8906e46c74dc8075bd9d88cb5558c6d2b41a9b3f6fe2cf310b8adbd2943ca2ee26e9fb96b516e14fdaf08a4c028ebb3546fc SHA512 46de8e2d2b0750185fdeefe4640d4df9233b7a9369a23f580bb4ab7681a830a7d7d13e2a7ebc9b10d1dfe11ba04b0d63a77e5902113543f45571205cc57b6254 +EBUILD nftables-1.1.0-r1.ebuild 6557 BLAKE2B e91702eac0abd74473da6f544b713f830f5895c1edb6458fa36897d5355e7590ea370b988d31ee105ed4cb8c39f29420bc4813593a761026cf5287d7be331f6c SHA512 5f2dbf626e6f35916b56c06aea28356728d644ac8a511a4463ff66d345588a8f5a3802d161981d0364e304a1a851734472ff24a6d15c8a8c76390baa51231e70 +EBUILD nftables-1.1.1.ebuild 6482 BLAKE2B f803c2b3ea243bdd7365fccdb7f36dffe6246381b7743d656dcebfa6c5afbaca110c2dd110cea0437f7d5fcc9790da57df00f6b6021861a048672abab8f26c8a SHA512 265d6d5512b005e45f555a812557ac7ca48a2a9efb0095cd9aa37e90877bc6943a2e751efd9f82f1583b623bb4c05cbb04e93253c8f9804f8a14887d1eadffba +EBUILD nftables-9999.ebuild 6482 BLAKE2B f803c2b3ea243bdd7365fccdb7f36dffe6246381b7743d656dcebfa6c5afbaca110c2dd110cea0437f7d5fcc9790da57df00f6b6021861a048672abab8f26c8a SHA512 265d6d5512b005e45f555a812557ac7ca48a2a9efb0095cd9aa37e90877bc6943a2e751efd9f82f1583b623bb4c05cbb04e93253c8f9804f8a14887d1eadffba MISC metadata.xml 684 BLAKE2B 96044107a07596178b59f3d4bed0433e06eb74693fafcc1a8c20468e02626814ba1544bba54c64367e43a126463b0f3b33e340476aff15db934467e8b9d46bf7 SHA512 fa4c9cadddccda4217837a892fbec3e1b984fb18a4d11d5536f22724d2455724eb59c5cc06da5830fb28bb48cb2d01374fdc56e216296c695c678af28390392a diff --git a/net-firewall/nftables/nftables-1.0.9.ebuild b/net-firewall/nftables/nftables-1.0.9.ebuild index 26816a8b5755..f042bec930bc 100644 --- a/net-firewall/nftables/nftables-1.0.9.ebuild +++ b/net-firewall/nftables/nftables-1.0.9.ebuild @@ -21,7 +21,7 @@ else https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig ) " - KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi diff --git a/net-firewall/nftables/nftables-1.1.0-r1.ebuild b/net-firewall/nftables/nftables-1.1.0-r1.ebuild index eb927df4997e..efec7e4d23d4 100644 --- a/net-firewall/nftables/nftables-1.1.0-r1.ebuild +++ b/net-firewall/nftables/nftables-1.1.0-r1.ebuild @@ -21,7 +21,7 @@ else https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi diff --git a/net-firewall/nftables/nftables-1.1.1.ebuild b/net-firewall/nftables/nftables-1.1.1.ebuild new file mode 100644 index 000000000000..ecfd85b0e138 --- /dev/null +++ b/net-firewall/nftables/nftables-1.1.1.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit edo linux-info distutils-r1 systemd verify-sig + +DESCRIPTION="Linux kernel firewall, NAT and packet mangling tools" +HOMEPAGE="https://netfilter.org/projects/nftables/" + +if [[ ${PV} =~ ^[9]{4,}$ ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.netfilter.org/${PN}" + BDEPEND="app-alternatives/yacc" +else + SRC_URI=" + https://netfilter.org/projects/nftables/files/${P}.tar.xz + verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" +fi + +# See COPYING: new code is GPL-2+, existing code is GPL-2 +LICENSE="GPL-2 GPL-2+" +SLOT="0/1" +IUSE="debug doc +gmp json libedit python +readline static-libs test xtables" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=net-libs/libmnl-1.0.4:= + >=net-libs/libnftnl-1.2.8:= + gmp? ( dev-libs/gmp:= ) + json? ( dev-libs/jansson:= ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) + xtables? ( >=net-firewall/iptables-1.6.1:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/asciidoc + >=app-text/docbook2X-0.8.8-r4 + ) + python? ( ${DISTUTILS_DEPS} ) +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + libedit? ( !readline ) +" + +src_prepare() { + default + + if [[ ${PV} =~ ^[9]{4,}$ ]] ; then + eautoreconf + fi + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi +} + +src_configure() { + local myeconfargs=( + --sbindir="${EPREFIX}"/sbin + $(use_enable debug) + $(use_enable doc man-doc) + $(use_with !gmp mini_gmp) + $(use_with json) + $(use_with libedit cli editline) + $(use_with readline cli readline) + $(use_enable static-libs static) + $(use_with xtables) + ) + + econf "${myeconfargs[@]}" + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi +} + +src_compile() { + default + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_test() { + emake check + + if [[ ${EUID} == 0 ]]; then + edo tests/shell/run-tests.sh -v + else + ewarn "Skipping shell tests (requires root)" + fi + + if use python; then + pushd tests/py >/dev/null || die + distutils-r1_src_test + popd >/dev/null || die + fi +} + +python_test() { + if [[ ${EUID} == 0 ]]; then + edo "${EPYTHON}" nft-test.py + else + ewarn "Skipping Python tests (requires root)" + fi +} + +src_install() { + default + + if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then + pushd doc >/dev/null || die + doman *.? + popd >/dev/null || die + fi + + # Do it here instead of in src_prepare to avoid eautoreconf + # rmdir lets us catch if more files end up installed in /etc/nftables + dodir /usr/share/doc/${PF}/skels/ + mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die + rmdir "${ED}"/etc/nftables || die + + exeinto /usr/libexec/${PN} + newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh + newconfd "${FILESDIR}"/${PN}-mk.confd ${PN} + newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service + + if use python ; then + pushd py >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_preinst() { + local stderr + + # There's a history of regressions with nftables upgrades. Perform a + # safety check to help us spot them earlier. For the check to pass, the + # currently loaded ruleset, if any, must be successfully evaluated by + # the newly built instance of nft(8). + if [[ -n ${ROOT} ]] || [[ ! -d /sys/module/nftables ]] || [[ ! -x /sbin/nft ]]; then + # Either nftables isn't yet in use or nft(8) cannot be executed. + return + elif ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 >"${T}"/ruleset.nft); then + # Report errors induced by trying to list the ruleset but don't + # treat them as being fatal. + printf '%s\n' "${stderr}" >&2 + elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then + # Rulesets generated by iptables-nft are special in nature and + # will not always be printed in a way that constitutes a valid + # syntax for ntf(8). Ignore them. + return + elif set -- "${ED}"/usr/lib*/libnftables.so; + ! LD_LIBRARY_PATH=${1%/*} "${ED}"/sbin/nft -c -f -- "${T}"/ruleset.nft + then + eerror "Your currently loaded ruleset cannot be parsed by the newly built instance of" + eerror "nft. This probably means that there is a regression introduced by v${PV}." + eerror "(To make the ebuild fail instead of warning, set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)" + if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then + die "Aborting because of failed nft reload!" + fi + fi +} + +pkg_postinst() { + local save_file + save_file="${EROOT}"/var/lib/nftables/rules-save + + # In order for the nftables-restore systemd service to start + # the save_file must exist. + if [[ ! -f "${save_file}" ]]; then + ( umask 177; touch "${save_file}" ) + elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then + ewarn "Your system has dangerous permissions for ${save_file}" + ewarn "It is probably affected by bug #691326." + ewarn "You may need to fix the permissions of the file. To do so," + ewarn "you can run the command in the line below as root." + ewarn " 'chmod 600 \"${save_file}\"'" + fi + + if has_version 'sys-apps/systemd'; then + elog "If you wish to enable the firewall rules on boot (on systemd) you" + elog "will need to enable the nftables-restore service." + elog " 'systemctl enable ${PN}-restore.service'" + elog + elog "If you are creating firewall rules before the next system restart" + elog "the nftables-restore service must be manually started in order to" + elog "save those rules on shutdown." + fi + + if has_version 'sys-apps/openrc'; then + elog "If you wish to enable the firewall rules on boot (on openrc) you" + elog "will need to enable the nftables service." + elog " 'rc-update add ${PN} default'" + elog + elog "If you are creating or updating the firewall rules and wish to save" + elog "them to be loaded on the next restart, use the \"save\" functionality" + elog "in the init script." + elog " 'rc-service ${PN} save'" + fi +} diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild index 60c4f92e0ca9..ecfd85b0e138 100644 --- a/net-firewall/nftables/nftables-9999.ebuild +++ b/net-firewall/nftables/nftables-9999.ebuild @@ -21,7 +21,7 @@ else https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi @@ -33,7 +33,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=net-libs/libmnl-1.0.4:= - >=net-libs/libnftnl-1.2.7:= + >=net-libs/libnftnl-1.2.8:= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( ${PYTHON_DEPS} ) diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest index 10f46d4c487f..4da12fc67f6a 100644 --- a/net-firewall/rtsp-conntrack/Manifest +++ b/net-firewall/rtsp-conntrack/Manifest @@ -1,6 +1,4 @@ AUX rtsp-conntrack-5.3-strlcpy.patch 888 BLAKE2B 2b106270b7ab915624ddb2dc2677f382b7514665015d65359c7db2ddb99370d7a9a43ce90ab7c728bbdda39e060b8028d2dfede0feba150f80c7561b53d758e9 SHA512 704fc37e3f477819a63832298300ab085eeca53009c29296cd10a014196b218e4973d8cc5c64956e2af55112eded101e19870f381181f9378f73d3a515e93a41 DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab -EBUILD rtsp-conntrack-5.3-r1.ebuild 598 BLAKE2B c6fcfc39d717fc8f7750e931e401f88de295123e64912acd39cc9483ba6114f6cc6f27e3f374046abd5077e2322372a32e83ae7e0cd104c24f1b3c39ef14a94f SHA512 97e48aee8ee73d2e4270bbe8fb448f69c2c8982fc2502a0c8630707481e4cd2f63c10506e2a846be27a0f36263868535b7a1d2a5abe6b1b81c6af853a76299f0 -EBUILD rtsp-conntrack-5.3-r2.ebuild 648 BLAKE2B 163761ab81a4f75fa9f5a04a2436dddb97cdd16fbcd8415efb104462cba1b699ac6f58f0067fcffbd4171aeec26fb590f3cccb56d919dbea71e4066418a018e2 SHA512 6733fc0f9587572faf190ab038a5467d8c1967e7813f9fe5eff5018ab4e7520ddd2549015ed738c4777145fb96974c3195da507ff32f05949fe4833ff702d1d3 -EBUILD rtsp-conntrack-5.3.ebuild 713 BLAKE2B 8559fc61f630373fe571805219ac94de0de02b6e9061b52f508f6e986da3a0c8b9c1a9c4bf688d4f5e2ad373825e72ccabeb99676afa97b66e868122694674f9 SHA512 edab69d7b9bf2cd6936831f12a6d2582a64b088a24573955eac978c6e255904570de16a052c3bab9f76df06fa68e83269060c5de8ec52c1e41ad1fd2f048885d +EBUILD rtsp-conntrack-5.3-r2.ebuild 655 BLAKE2B 34d42c4a5d6442b44067ef32df5bc51ee9ebcf855a73b49cd8dbf01a903590278edf554e196cf2932a5980fadf2b6c7044a913d639c43d69cd09751cae55403d SHA512 d99df8f039858b784eff18b90a2ad8df912a3efc7db9b2eb620282e29eb4abf2c758f0d7bebc8c369c0be134acf9a1eed43de32fb94a24824bbe3ce5e727b628 MISC metadata.xml 253 BLAKE2B 6c0ff48fb0bc43e945ed68a2f4a5f067ecef5c84a32c013616037dd8de51b7ce80bbe6560800bb16c4c24e0318a592bbf943c4182b826d694780b46e0d8dd95e SHA512 8487052b487f4d0aea42dcddcbb32e1c55ed9da79074c12971b9f31f84acc3df9d67735e247a55057312840ffc7e1ea1fa54a5fd5bb1638ca20924cb04d60919 diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild deleted file mode 100644 index 9711ab4dc102..000000000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="RTSP conntrack module for Netfilter" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/rtsp-linux-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -CONFIG_CHECK="NF_CONNTRACK" - -src_compile() { - local modlist=( - nf_conntrack_rtsp=net/netfilter - nf_nat_rtsp=net/ipv4/netfilter - ) - local modargs=( KERNELDIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild index b53a2b6b90ce..2282fcec6ec3 100644 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild +++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild @@ -6,13 +6,13 @@ EAPI=8 inherit linux-mod-r1 DESCRIPTION="RTSP conntrack module for Netfilter" -HOMEPAGE="https://mike.it-loops.com/rtsp" +HOMEPAGE="https://github.com/maru-sama/rtsp-linux" SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/rtsp-linux-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CONFIG_CHECK="NF_CONNTRACK" diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild deleted file mode 100644 index 3c5b55d22349..000000000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit linux-mod - -DESCRIPTION="RTSP conntrack module for Netfilter" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -S="${WORKDIR}/rtsp-linux-${PV}" - -BUILD_TARGETS="all" -MODULE_NAMES=" - nf_conntrack_rtsp(net/netfilter::) - nf_nat_rtsp(net/ipv4/netfilter::)" -MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You must enable NF_CONNTRACK in your kernel, otherwise ${PN} would not work" - -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1" diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest index 99af853c01cd..7dec8b3fd234 100644 --- a/net-firewall/ufw/Manifest +++ b/net-firewall/ufw/Manifest @@ -2,6 +2,7 @@ AUX rsyslog/ufw.logrotate 178 BLAKE2B 488f56cb61e3d708e771e927b0c92ce354ebd7aa65 AUX syslog-ng/syslog-ng.example 381 BLAKE2B 01026130ac3aec7bb4b3862e9567c225073d5f467eced4701c711842f2aa8ff7b566874e64e302728a5bff15d848325040e3df900776950269d431dda6763950 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e AUX syslog-ng/ufw.logrotate 269 BLAKE2B 6dd614ec033e8b9fd6d95e7a6fc69252e5a7fd33da6e760320b7f9fb519936a94f2f46e7833189601ddfa7fa080402237831fab9daf1b18a0872cc49c56715b1 SHA512 22d89f04b68a8b4deeb60aca263239255dd01b9c6e6d23a5d77514daf7bb9dc3910a28cfe9c606f70d2a50f0365bb19c3cf00c5859ee2630c00f0df451ee9c5d AUX ufw-0.36-bash-completion.patch 328 BLAKE2B 7f88afa8f4ccc12aba70dce1ca82e6992497819cfd7dc005b13c9d17212adb74134115d83907ec2b8c916d40213ab2acea170e649e438744b854f11fd22815bd SHA512 11a9cf4906fa0bd677e745615b3c4d663512a1d05f9c21149d09624237a88938b9ed83b8ca876dbcf9bbac41a4bf7155eba76ec32778e025f013e1ffb07e4abb +AUX ufw-0.36.1-distutils.patch 400 BLAKE2B c0e1fa2ca4f1582ad60023892247cf70801eefa249574349577c355136af14736a150ffebacaeec5372abfab1d65cef512b453c80518548044aac07059f9125b SHA512 77cbc7c575cc0f7af1d9e562234dbba22d9d58e268664e6ae1c656c4e558c50c614975d1dd69a948eaf6962e644de2ea0bb81a30cdff4000d243adb7d4e18daf AUX ufw-0.36.1-dont-check-iptables.patch 1956 BLAKE2B 1afb02e74e4855a93a6145756bf4ef2b3f4f457bc5af0844d9b4788f8e01d3fc2e3b9f27fbba8ab5316dd51f0e995632173b5dd5553a17e25f17d95e318317c2 SHA512 6b8f9f09d07a402aaf671a7d2ae899d4deb67fac5525f5733ed5e67b517d108df3d7037151f953dc0e5614997a5a44b32fd5c8746dcea57c5f264ae625d71554 AUX ufw-0.36.1-move-path.patch 4880 BLAKE2B 544dc08b6bb806929f049db4f9aa70dff35526ff0602bdb19ff4d5a8d3c0e19a46e62a617cd52c1bfd9a7300a48642e84478b924ba28f0e9183305486a002a6f SHA512 8b3710f3c0b8ca6a05db1dd74e84088b12fe9556a75da7fb7211788cdd24c3157251b4a82973d21c787b05bc81a27940c2d5fffd56d541334cdbd2e99c532019 AUX ufw-0.36.1-shebang.patch 713 BLAKE2B ad34303c58fd76f47d4ce550c1669c09cbbf9c00cfa986000d79cefbd44319f37b33b2b4090bf4551c9f6c2f961e7e9a3a628a8209fb6c43b8c7741406ff0b9f SHA512 ebf73b60b15292cd35c11262fe488294b229e60acaca81487d70bb2817c080f22d6813f1d8a9edc601fd9d2da141474a6da8dc7195fc99db7f664c7db1848457 @@ -9,5 +10,5 @@ AUX ufw-2.initd 2611 BLAKE2B b6a75e023ad0efeeef168e7e074c716ec66f40d3bde9f99cf1a AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0593e59cc7f5b988f8545ddea37f19d9b40e870d743bea66edd7da1e3d2753b6edda8afa352 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7 DIST ufw-0.36.1.tar.gz 583123 BLAKE2B 16e1ee67493d5db10a04667b646a019aa3aeb06345d0facc334fb07eeff4d4f6674a4699b2bd7bd6ed29de1c05c4e14812e9e8ec55c4bfb8579b8e3e2e577f6a SHA512 77d01fef661083eac041be6d6eabffb1d8aedb215f73e44e18a9a63a48da96414b3c0166e3ffd9402c22c72a6de5d774ba14b15368b02997aae8e08d1c5dd4c0 -EBUILD ufw-0.36.1.ebuild 6221 BLAKE2B 7831fc420b651da724b218cc3734ee5e6a457565d0b251a52c0cd2ed61d83f5e0d8f8694f0ddd0579479908b9efe1e895498eb17aaa0d60b09649a679c77c31e SHA512 e843dd4cd973338770ab2f525524ce546c76bdcb04e137a55596249d733621b52f632908b7f55bc5b33b99ddeed2db19431e55021dd1733af52a3631645c5713 +EBUILD ufw-0.36.1-r1.ebuild 6241 BLAKE2B 9bf06e8422f2086aa62d70f8b01c676c5ec3a50c894d0c3de0ddab435ff61bd1fe7648ff2e7dfe6c9bbc5fb3368c3658501a9c9b51864737407fe589006b3fd2 SHA512 e7f21ea7c250a505a931f12afe9763066e24448c3ababdea9e492029e946321e769384689214adab4ce53711b7b600313986f32ed886ca7c898fba712ae65cee MISC metadata.xml 686 BLAKE2B 6d415e2295cf7facf8908aab2fbd7d4150d24595c9eb30ccf7f105ff2263cd7dc6c393dc8ad8303b264d76be37bb11da3ce4d4b666c0648e974b7585e9e7e452 SHA512 c1dee02a7458095069243337abb01a66dc132de15a51114cc1b39778f02b3a05d28a869cfa8cef55cf8701bb7f872232b63d432c1c5e45d71d90fa6099f74dd5 diff --git a/net-firewall/ufw/files/ufw-0.36.1-distutils.patch b/net-firewall/ufw/files/ufw-0.36.1-distutils.patch new file mode 100644 index 000000000000..fe7ab3845058 --- /dev/null +++ b/net-firewall/ufw/files/ufw-0.36.1-distutils.patch @@ -0,0 +1,14 @@ +https://src.fedoraproject.org/rpms/ufw/raw/rawhide/f/ufw-0.35-distutils-setuptools.patch +--- a/setup.py ++++ b/setup.py +@@ -26,8 +26,8 @@ + # + + from __future__ import print_function +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import errno + import os + import re diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild b/net-firewall/ufw/ufw-0.36.1-r1.ebuild index 0c19a760f4dc..09b82a5878f8 100644 --- a/net-firewall/ufw/ufw-0.36.1.ebuild +++ b/net-firewall/ufw/ufw-0.36.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_IN_SOURCE_BUILD=1 DISTUTILS_USE_SETUPTOOLS=no @@ -15,15 +15,13 @@ SRC_URI="https://launchpad.net/ufw/${PV%.*}/${PV}/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="examples ipv6" RDEPEND="net-firewall/iptables[ipv6(+)?]" BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] sys-devel/gettext - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ' python3_12) " PATCHES=( @@ -35,6 +33,8 @@ PATCHES=( "${FILESDIR}/${P}-shebang.patch" # Fix bash completions, bug #526300 "${FILESDIR}/${PN}-0.36-bash-completion.patch" + # Strip distutils use + "${FILESDIR}/${PN}-0.36.1-distutils.patch" ) pkg_pretend() { |