commit: 6a42bdbee74a5273dc7177cb62a250dffe21dea8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 13:15:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 13:17:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a42bdbe
net-firewall/nftables: add 1.0.8
With USE=modern-kernel dropped, for two reasons:
1. We do USE=old-kernel for this normally
2. > 3.19 is not simply "modern".
And I suppose a third:
3. You shouldn't use nftables on such an old kernel anyway, as it's buggy.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-firewall/nftables/Manifest | 2 ++
...{nftables-9999.ebuild => nftables-1.0.8.ebuild} | 31 ++++++----------------
net-firewall/nftables/nftables-9999.ebuild | 31 ++++++----------------
3 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 61843826524a..9efdba0b9910 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,2 +1,4 @@
DIST nftables-1.0.7.tar.xz 857140 BLAKE2B
972adbb958f36b300618ce03fbbfc1fdb6fd55a3512227e4bc1fd71365be5cc8d3ee105424e8cc513588100bf00d5e69486310435efb2b0d3f5d464ed6999859
SHA512
063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116
DIST nftables-1.0.7.tar.xz.sig 566 BLAKE2B
53abe2598e9b362912d3e2e94ea6e04352d0484b9d1d645c8f18b6133be53d63a8d71d500e57528a57aededb84dedaf61010236afda560b16e7642db45e2f45c
SHA512
b5821aa6939dc5b4d16065d9d7083e4ff40b9f99417354efbcbc95a8ccde43108b99a5b8a75a24086cd3df2291a049cad3adb7b06e2c098f0eb7861f85c5c768
+DIST nftables-1.0.8.tar.xz 882980 BLAKE2B
cdf174846cbc3e581993cdee3a24e5ead3fdbb3d6b24d51473ed88affb7fcf70279a8374a4963b31044a9e64cb72ddb28ca1f1686bbaa3101eed4d623fb67d05
SHA512
06053c05a0d7c84a5cc4d22733836dadf9880c3552df3dace6d30aea95c7e1edb5528ea45df8576f282c15bf58f23407e26efb22257bd98a478849a8bdd4f8d5
+DIST nftables-1.0.8.tar.xz.sig 566 BLAKE2B
2f22b9467a55a46ec9e8caf13efe3cd59a6a1a867174602b583549ccaff54576b5f80b5ad9b1cefd208c3f49bc6ce07072626218f479628df369ed7294e1b83b
SHA512
0ddd8f29dc5ba891069c63715719f11c0a4745f1e3cd9cd7f9e388ac35835cfbe8f34b371a2ce2a06cbda42384cc72d0bf57746fb02757d68a9b053bbbd67a77
diff --git a/net-firewall/nftables/nftables-9999.ebuild
b/net-firewall/nftables/nftables-1.0.8.ebuild
similarity index 89%
copy from net-firewall/nftables/nftables-9999.ebuild
copy to net-firewall/nftables/nftables-1.0.8.ebuild
index bee5c7fd77bd..d1055f03bbea 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-1.0.8.ebuild
@@ -4,7 +4,8 @@
EAPI=8
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
inherit edo linux-info distutils-r1 systemd verify-sig
@@ -25,21 +26,19 @@ 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 +modern-kernel python +readline static-libs
test xtables"
+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.5:=
+ >=net-libs/libnftnl-1.2.6:=
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+="
sys-devel/flex
virtual/pkgconfig
@@ -47,7 +46,7 @@ BDEPEND+="
app-text/asciidoc
>=app-text/docbook2X-0.8.8-r4
)
- python? ( ${PYTHON_DEPS} )
+ python? ( ${DISTUTILS_DEPS} )
"
REQUIRED_USE="
@@ -55,18 +54,6 @@ REQUIRED_USE="
libedit? ( !readline )
"
-pkg_setup() {
- if kernel_is ge 3 13; then
- if use modern-kernel && kernel_is lt 3 18; then
- eerror "The modern-kernel USE flag requires kernel
version 3.18 or newer to work properly."
- fi
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to
work properly."
- fi
-}
-
src_prepare() {
default
@@ -145,12 +132,10 @@ src_install() {
mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
rmdir "${ED}"/etc/nftables || die
- local mksuffix="$(usex modern-kernel '-mk' '')"
-
exeinto /usr/libexec/${PN}
- newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
- newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+ newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
keepdir /var/lib/nftables
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
diff --git a/net-firewall/nftables/nftables-9999.ebuild
b/net-firewall/nftables/nftables-9999.ebuild
index bee5c7fd77bd..d1055f03bbea 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -4,7 +4,8 @@
EAPI=8
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
inherit edo linux-info distutils-r1 systemd verify-sig
@@ -25,21 +26,19 @@ 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 +modern-kernel python +readline static-libs
test xtables"
+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.5:=
+ >=net-libs/libnftnl-1.2.6:=
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+="
sys-devel/flex
virtual/pkgconfig
@@ -47,7 +46,7 @@ BDEPEND+="
app-text/asciidoc
>=app-text/docbook2X-0.8.8-r4
)
- python? ( ${PYTHON_DEPS} )
+ python? ( ${DISTUTILS_DEPS} )
"
REQUIRED_USE="
@@ -55,18 +54,6 @@ REQUIRED_USE="
libedit? ( !readline )
"
-pkg_setup() {
- if kernel_is ge 3 13; then
- if use modern-kernel && kernel_is lt 3 18; then
- eerror "The modern-kernel USE flag requires kernel
version 3.18 or newer to work properly."
- fi
- CONFIG_CHECK="~NF_TABLES"
- linux-info_pkg_setup
- else
- eerror "This package requires kernel version 3.13 or newer to
work properly."
- fi
-}
-
src_prepare() {
default
@@ -145,12 +132,10 @@ src_install() {
mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
rmdir "${ED}"/etc/nftables || die
- local mksuffix="$(usex modern-kernel '-mk' '')"
-
exeinto /usr/libexec/${PN}
- newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
- newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+ newexe "${FILESDIR}"/libexec/${PN}.sh ${PN}.sh
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
keepdir /var/lib/nftables
systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
