commit:     00f385e7029c9a98e4b9a1912c749d20a8ce77cb
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 16:07:26 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 16:07:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f385e7

net-firewall/nftables: drop 1.0.1-r2, 1.0.3, 1.0.3-r1

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-firewall/nftables/Manifest                     |   4 -
 .../nftables/files/nftables-0.9.8-slibtool.patch   |  13 --
 .../files/nftables-1.0.3-optimize-segfault.patch   |  64 -------
 .../files/nftables-1.0.3-test-shell-sets.patch     |  21 ---
 net-firewall/nftables/nftables-1.0.1-r2.ebuild     | 188 -------------------
 net-firewall/nftables/nftables-1.0.3-r1.ebuild     | 206 ---------------------
 net-firewall/nftables/nftables-1.0.3.ebuild        | 185 ------------------
 7 files changed, 681 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 5b6889bfbb24..89b4506ccf95 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,8 +1,4 @@
-DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B 
e406699c96b98495f1b6deeab0233873ce20b43c13c162eafea1e6b371961123a69f3d5e7bd2f1bedfdbe58fed56ba3e2dae962b88657af6f4ab5b3743fb6373
 SHA512 
a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
-DIST nftables-1.0.1.tar.bz2.sig 566 BLAKE2B 
d504987b16b7a8676586ecb3a1ce9588bff972ca54bbb3ce3b0db5288f1fd981e529dccea009bd01a3a96e5199a034956bd43cdeaba67847239a88d458f43f8a
 SHA512 
0884098ceabe7b070e146e47292afd8c80188ea595eaeaadb228307f502dae4a43bf801dea2a25519eaef3c96d567daf40e45c37fabb58db1b2256eb8f256cb0
 DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 
650ae6badb574ff3628d21c8aa99f81e73932dd172b3569618696100bf3853b9a108bf0296dcf9d615ae7c0fbec84b48266299b62cf755d181d19c626f8a3cd4
 SHA512 
560d23c6e369eafd7b354d29fe73d46154e4a74dec000178c1aea47751fe535d20c4e6bbecd3955eb2b327c7a60b1269e5c6dc5781498546b639fa2d1367a9ca
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 
5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98
 SHA512 
9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
-DIST nftables-1.0.3.tar.bz2 978270 BLAKE2B 
f0410805e47679749a7e157e76834ee977bda53042a3c9fa34052778613c25bfc944257f6e51a94c9981cacbe28fb82ec8e3b82a2e1e34865b1412890138bfb0
 SHA512 
83252c0275f20243065c4d77dfca4ab2b70b4042c9491fb3323eb60c96f9a6e0d69699a641457f3d629d078269ba62ce766ffdb2ad79c64bd54ad11943819900
-DIST nftables-1.0.3.tar.bz2.sig 566 BLAKE2B 
8cf74954708c827e16932c58481981838b129f598f760a457fc2ab503500dfdf4de42f671d07e7920a028d2489f8a96a14bf8698fa3a9ad9997ce3411d6be0fd
 SHA512 
f8a4acc6cf0a844720cf4bf2808b0c6a103f81f54d90cf155bd2c86938d997dc92d405b94eb91b725edeb8e76ef23c6ec318f067b30b2049fbef765230020ff2
 DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 
1b2c596245cb7f1bc574250d13b9ff6f424f98e98d5955befadb83ea0a71acc6524b066e39f1e9d151f3946b690b2dee45b7d416347371f88911c8d6a9de047e
 SHA512 
7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215
 DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 
1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf
 SHA512 
2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8

diff --git a/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch 
b/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch
deleted file mode 100644
index a92645f793c7..000000000000
--- a/net-firewall/nftables/files/nftables-0.9.8-slibtool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This fixes build with sys-devel/slibtool
-
---- nftables-0.9.8/src/Makefile.am
-+++ nftables-0.9.8/src/Makefile.am
-@@ -90,7 +90,7 @@
- 
- libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBNFTNL_LIBS} libparser.la
- libnftables_la_LDFLAGS = -version-info ${libnftables_LIBVERSION} \
--                       --version-script=$(srcdir)/libnftables.map
-+                       -Wl,--version-script=$(srcdir)/libnftables.map
- 
- if BUILD_MINIGMP
- noinst_LTLIBRARIES += libminigmp.la

diff --git a/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch 
b/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
deleted file mode 100644
index 95e53adc0b2f..000000000000
--- a/net-firewall/nftables/files/nftables-1.0.3-optimize-segfault.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://git.netfilter.org/nftables/commit/?id=59bd944f6d75e99fe0c8d743e7fd482672640c2d
-
-From: Pablo Neira Ayuso <[email protected]>
-Date: Wed, 1 Jun 2022 10:14:22 +0200
-Subject: optimize: segfault when releasing unsupported statement
-
-Call xfree() instead since stmt_alloc() does not initialize the
-statement type fields.
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1609
-Fixes: ea1f1c9ff608 ("optimize: memleak in statement matrix")
-Signed-off-by: Pablo Neira Ayuso <[email protected]>
---- a/src/optimize.c
-+++ b/src/optimize.c
-@@ -304,7 +304,7 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, 
struct rule *rule)
-                       clone->nat.type_flags = stmt->nat.type_flags;
-                       break;
-               default:
--                      stmt_free(clone);
-+                      xfree(clone);
-                       continue;
-               }
- 
---- a/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
-+++ b/tests/shell/testcases/optimizations/dumps/merge_vmaps.nft
-@@ -1,4 +1,10 @@
- table ip x {
-+      set s {
-+              type ipv4_addr
-+              size 65535
-+              flags dynamic
-+      }
-+
-       chain filter_in_tcp {
-       }
- 
-@@ -6,6 +12,7 @@ table ip x {
-       }
- 
-       chain y {
-+              update @s { ip saddr limit rate 12/minute burst 30 packets } 
accept
-               tcp dport vmap { 80 : accept, 81 : accept, 443 : accept, 
8000-8100 : accept, 24000-25000 : accept }
-               meta l4proto vmap { tcp : goto filter_in_tcp, udp : goto 
filter_in_udp }
-               log
---- a/tests/shell/testcases/optimizations/merge_vmaps
-+++ b/tests/shell/testcases/optimizations/merge_vmaps
-@@ -3,11 +3,16 @@
- set -e
- 
- RULESET="table ip x {
-+      set s {
-+              type ipv4_addr
-+              flags dynamic
-+      }
-       chain filter_in_tcp {
-       }
-       chain filter_in_udp {
-       }
-       chain y {
-+              update @s { ip saddr limit rate 12/minute burst 30 packets } 
accept
-               tcp dport vmap {
-                       80 : accept,
-                       81 : accept,
-cgit v1.2.3

diff --git a/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch 
b/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch
deleted file mode 100644
index c5f93e20eea6..000000000000
--- a/net-firewall/nftables/files/nftables-1.0.3-test-shell-sets.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.netfilter.org/nftables/commit/?id=3835de19fe5773baac5b79f35484d0f0e99bcfe1
-
-From: Pablo Neira Ayuso <[email protected]>
-Date: Wed, 1 Jun 2022 18:17:02 +0200
-Subject: tests: shell: sets_with_ifnames release netns on exit
-
-Missing ip netns del call from cleanup()
-
-Fixes: d6fdb0d8d482 ("sets_with_ifnames: add test case for concatenated range")
-Signed-off-by: Pablo Neira Ayuso <[email protected]>
---- a/tests/shell/testcases/sets/sets_with_ifnames
-+++ b/tests/shell/testcases/sets/sets_with_ifnames
-@@ -13,6 +13,7 @@ ns2="nft2ifname-$rnd"
- cleanup()
- {
-       ip netns del "$ns1"
-+      ip netns del "$ns2"
- }
- 
- trap cleanup EXIT
-cgit v1.2.3

diff --git a/net-firewall/nftables/nftables-1.0.1-r2.ebuild 
b/net-firewall/nftables/nftables-1.0.1-r2.ebuild
deleted file mode 100644
index a6b3f71dcc5e..000000000000
--- a/net-firewall/nftables/nftables-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd verify-sig
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/";
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://git.netfilter.org/${PN}";
-
-       BDEPEND="
-               sys-devel/bison
-               sys-devel/flex
-       "
-else
-       SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-               verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-       KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-       BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
xtables"
-
-RDEPEND="
-       >=net-libs/libmnl-1.0.4:0=
-       >=net-libs/libnftnl-1.2.1:0=
-       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+="
-       doc? (
-               app-text/asciidoc
-               >=app-text/docbook2X-0.8.8-r4
-       )
-       virtual/pkgconfig
-"
-
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-       libedit? ( !readline )
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-0.9.8-slibtool.patch"
-)
-
-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
-
-       # fix installation path for doc stuff
-       sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
-               -i files/nftables/Makefile.am || die
-       sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
-               -i files/osf/Makefile.am || die
-
-       eautoreconf
-
-       if use python; then
-               pushd py >/dev/null || die
-               distutils-r1_src_prepare
-               popd >/dev/null || die
-       fi
-}
-
-src_configure() {
-       local myeconfargs=(
-               # We handle python separately
-               --disable-python
-               --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_install() {
-       default
-
-       if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
-               pushd doc >/dev/null || die
-               doman *.?
-               popd >/dev/null || die
-       fi
-
-       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}
-       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_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-1.0.3-r1.ebuild 
b/net-firewall/nftables/nftables-1.0.3-r1.ebuild
deleted file mode 100644
index 86c5513a263c..000000000000
--- a/net-firewall/nftables/nftables-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-inherit edo linux-info distutils-r1 systemd verify-sig
-
-DESCRIPTION="Linux kernel (3.13+) 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="
-               sys-devel/bison
-               sys-devel/flex
-       "
-else
-       SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-               verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
-       BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-RDEPEND="
-       >=net-libs/libmnl-1.0.4:0=
-       >=net-libs/libnftnl-1.2.1:0=
-       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+="
-       virtual/pkgconfig
-       doc? (
-               app-text/asciidoc
-               >=app-text/docbook2X-0.8.8-r4
-       )
-       python? ( ${PYTHON_DEPS} )
-"
-
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-       libedit? ( !readline )
-"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-optimize-segfault.patch
-       "${FILESDIR}"/${P}-test-shell-sets.patch
-)
-
-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
-
-       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=(
-               # We handle python separately
-               --disable-python
-               --disable-static
-               --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
-
-       edo tests/shell/run-tests.sh -v
-
-       # Need to rig up Python eclass if using this, but it doesn't seem to 
work
-       # for me anyway.
-       #cd tests/py || die
-       #"${EPYTHON}" nft-test.py || die
-}
-
-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
-
-       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}
-       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_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-1.0.3.ebuild 
b/net-firewall/nftables/nftables-1.0.3.ebuild
deleted file mode 100644
index cdfe5fdcf824..000000000000
--- a/net-firewall/nftables/nftables-1.0.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
-inherit autotools linux-info distutils-r1 systemd verify-sig
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/";
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://git.netfilter.org/${PN}";
-
-       BDEPEND="
-               sys-devel/bison
-               sys-devel/flex
-       "
-else
-       SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
-               verify-sig? ( 
https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-       BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/1"
-IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs 
xtables"
-
-RDEPEND="
-       >=net-libs/libmnl-1.0.4:0=
-       >=net-libs/libnftnl-1.2.1:0=
-       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+="
-       doc? (
-               app-text/asciidoc
-               >=app-text/docbook2X-0.8.8-r4
-       )
-       virtual/pkgconfig
-"
-
-REQUIRED_USE="
-       python? ( ${PYTHON_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
-
-       # fix installation path for doc stuff
-       sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
-               -i files/nftables/Makefile.am || die
-       sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
-               -i files/osf/Makefile.am || die
-
-       eautoreconf
-
-       if use python; then
-               pushd py >/dev/null || die
-               distutils-r1_src_prepare
-               popd >/dev/null || die
-       fi
-}
-
-src_configure() {
-       local myeconfargs=(
-               # We handle python separately
-               --disable-python
-               --disable-static
-               --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_install() {
-       default
-
-       if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
-               pushd doc >/dev/null || die
-               doman *.?
-               popd >/dev/null || die
-       fi
-
-       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}
-       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_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
-}

Reply via email to