commit: b85e9b4b352dac72db999011a570bcbcbcafddf3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 14:20:05 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 14:21:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85e9b4b
net-firewall/nftables: Removed old.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-firewall/nftables/Manifest | 2 -
.../nftables/files/nftables-0.5-pdf-doc.patch | 52 -------------
.../files/nftables-0.6-null-payload-desc-fix.patch | 14 ----
net-firewall/nftables/nftables-0.6-r4.ebuild | 87 ----------------------
net-firewall/nftables/nftables-0.7.ebuild | 82 --------------------
5 files changed, 237 deletions(-)
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 3264c8d8d2b..d0f5ddd5bf4 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,4 +1,2 @@
-DIST nftables-0.6.tar.gz 252523 BLAKE2B
0359ca5265b244c433efd0b3c5d6aaf1a68c40b70b9199602e8f17b4e509a24e48554aefafc89d51c9e1e821c471690af9c99f1178f227d3cd9395897837de9e
SHA512
17f3b94687865e077dc082cf61b29ab2854fd1ffe18212a8d424f2876aef8db9780dd4d06dca8e6d093498151d47bab73e40e1f54062a83a23a3cbe75f27e921
-DIST nftables-0.7.tar.gz 292652 BLAKE2B
036afb1d27ea7d078f976c76a87a4b1ccef519197594910f7f3cb9d37b09103da41c15f611e24392cc9648f216606a29bd312a9026ecf053fc3b71959d1da7e1
SHA512
6032720abf3af8a6dc0b4f507c6ae970447f504d59db4a34b2e0eea3c59962bc69d9ebfaa4e26a117747eb9d0224716a9709b96551b5479d914d7498f26ed43a
DIST nftables-0.8.1.tar.gz 329098 BLAKE2B
d6e5803e146ed5883761d620ef1549e883a2947b495a9b1ff2a40c70794ab5125596e0802fb60bff6d1a21e666c94338b92a22ef3c4c1b66e0b4521cd3dfb78d
SHA512
5cae3a411f24adc17786b45d4ed8256eb44fd90f044f7f5d7ddebb1875d0317197e13128d9b22115cd7fcdfa21dba3c539de325ecedce707f8766c93e03efc75
DIST nftables-0.8.tar.gz 327629 BLAKE2B
a484c22ac010f68fc7458c12cabd0c35e474a0bf81fa4edbefba12d75b424898d38adb11a7fbb4542efbbb2d14be823701b3d9ced7b9fd669338366733fa169b
SHA512
90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb
diff --git a/net-firewall/nftables/files/nftables-0.5-pdf-doc.patch
b/net-firewall/nftables/files/nftables-0.5-pdf-doc.patch
deleted file mode 100644
index d09faa3ddd9..00000000000
--- a/net-firewall/nftables/files/nftables-0.5-pdf-doc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Update configure script to include option to enable and disable PDF man page
-generation.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,10 +27,16 @@
- AC_CONFIG_HEADER([config.h])
-
- AC_DEFINE([_GNU_SOURCE], [], [Enable various GNU extensions])
- AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros])
-
-+AC_ARG_ENABLE([pdf-doc],
-+ AS_HELP_STRING([--disable-pdf-doc], [Disable PDF documentation]),
-+ AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no],
-+ [enable_pdf_doc=yes]), [enable_pdf_doc=yes])
-+AM_CONDITIONAL([BUILD_PDF], [test "x$enable_pdf_doc" == "xyes" ])
-+
- AC_ARG_ENABLE([debug],
- AS_HELP_STRING([--enable-debug], [Disable debugging]),
- AS_IF([test "x$enable_debug" = "xno"], [with_debug=no],
[with_debug=yes]),
- [with_debug=yes])
- AC_SUBST(with_debug)
-@@ -61,15 +67,15 @@
- )]
- )
- AC_SUBST(DB2MAN)
- AM_CONDITIONAL([BUILD_MAN], [test -n "$DB2MAN"])
-
--AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no])
--AS_IF([test "$DBLATEX" == "no"],
-- [AC_MSG_WARN([dblatex not found, no PDF manpages will be built])]
--)
--AM_CONDITIONAL([BUILD_PDF], [test "$DBLATEX" == "found"])
-+AM_COND_IF([BUILD_PDF], [
-+ AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no])
-+ AS_IF([test "$DBLATEX" == "no"],
-+ [AC_MSG_ERROR([dblatex not found])])
-+])
-
- # Checks for libraries.
- PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
- PKG_CHECK_MODULES([LIBNFTNL], [libnftnl >= 1.0.5])
-
-@@ -134,6 +140,7 @@
-
- echo "
- nft configuration:
- cli support: ${with_cli}
- enable debugging: ${with_debug}
-- use mini-gmp: ${with_mini_gmp}"
-+ use mini-gmp: ${with_mini_gmp}
-+ enable pdf documentation: ${enable_pdf_doc}"
diff --git
a/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch
b/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch
deleted file mode 100644
index 3ea59e7aa49..00000000000
--- a/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/payload.c b/src/payload.c
-index ac0e917..9ba980a 100644
---- a/src/payload.c
-+++ b/src/payload.c
-@@ -85,6 +85,9 @@ static void payload_expr_pctx_update(struct proto_ctx *ctx,
- base = ctx->protocol[left->payload.base].desc;
- desc = proto_find_upper(base, proto);
-
-+ if (!desc)
-+ return;
-+
- assert(desc->base <= PROTO_BASE_MAX);
- if (desc->base == base->base) {
- assert(base->length > 0);
diff --git a/net-firewall/nftables/nftables-0.6-r4.ebuild
b/net-firewall/nftables/nftables-0.6-r4.ebuild
deleted file mode 100644
index be9f30bcfbe..00000000000
--- a/net-firewall/nftables/nftables-0.6-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://netfilter.org/projects/nftables/";
-SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc gmp +readline xml"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
- gmp? ( dev-libs/gmp:0= )
- readline? ( sys-libs/readline:0= )
- >=net-libs/libnftnl-1.0.6[xml(-)?]
- "
-DEPEND="${RDEPEND}
- >=app-text/docbook2X-0.8.8-r4
- doc? ( >=app-text/dblatex-0.3.7 )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig"
-
-S="${WORKDIR}/v${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.5-pdf-doc.patch"
- "${FILESDIR}/${P}-null-payload-desc-fix.patch"
-)
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- 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
- eautoreconf
-}
-
-src_configure() {
- econf \
- --sbindir="${EPREFIX}"/sbin \
- $(use_enable doc pdf-doc) \
- $(use_enable debug) \
- $(use_with readline cli) \
- $(use_with !gmp mini_gmp)
-}
-
-src_install() {
- default
-
- dodir /usr/libexec/${PN}
- exeinto /usr/libexec/${PN}
- doexe "${FILESDIR}"/libexec/${PN}.sh
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- keepdir /var/lib/nftables
-
- systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
- systemd_enable_service basic.target ${PN}-restore.service
-}
-
-pkg_postinst() {
- local save_file
- save_file="${EROOT%/}/var/lib/nftables/rules-save"
-
- elog "In order for the nftables-restore systemd service to start, "
- elog "the file, ${save_file}, must exist. To create this "
- elog "file run the following command: "
- elog ""
- elog " touch '${save_file}'"
- elog ""
- elog "Afterwards, the nftables-restore service should be manually
started "
- elog "to ensure firewall changes are stored on system shutdown. The "
- elog "systemd service will function normally thereafter."
-}
diff --git a/net-firewall/nftables/nftables-0.7.ebuild
b/net-firewall/nftables/nftables-0.7.ebuild
deleted file mode 100644
index 30376495f19..00000000000
--- a/net-firewall/nftables/nftables-0.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://netfilter.org/projects/nftables/";
-SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
- gmp? ( dev-libs/gmp:0= )
- readline? ( sys-libs/readline:0= )
- >=net-libs/libnftnl-1.0.7"
-
-DEPEND="${RDEPEND}
- >=app-text/docbook2X-0.8.8-r4
- doc? ( >=app-text/dblatex-0.3.7 )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig"
-
-S="${WORKDIR}/v${PV}"
-
-pkg_setup() {
- if kernel_is ge 3 13; then
- 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
- eautoreconf
-}
-
-src_configure() {
- econf \
- --sbindir="${EPREFIX}"/sbin \
- $(use_enable doc pdf-doc) \
- $(use_enable debug) \
- $(use_with readline cli) \
- $(use_with !gmp mini_gmp)
-}
-
-src_install() {
- default
-
- dodir /usr/libexec/${PN}
- exeinto /usr/libexec/${PN}
- doexe "${FILESDIR}"/libexec/${PN}.sh
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- keepdir /var/lib/nftables
-
- systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
- systemd_enable_service basic.target ${PN}-restore.service
-}
-
-pkg_postinst() {
- local save_file
- save_file="${EROOT%/}/var/lib/nftables/rules-save"
-
- elog "In order for the nftables-restore systemd service to start, "
- elog "the file, ${save_file}, must exist. To create this "
- elog "file run the following command: "
- elog ""
- elog " touch '${save_file}'"
- elog ""
- elog "Afterwards, the nftables-restore service should be manually
started "
- elog "to ensure firewall changes are stored on system shutdown. The "
- elog "systemd service will function normally thereafter."
-}
