From 7be951c308fdca589c4d7a54131bb39d841a8955 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 28 Jun 2019 11:07:23 +0200 Subject: net-firewall/nftables: Bump to version 0.9.1 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Lars Wendler --- net-firewall/nftables/Manifest | 1 + .../nftables-0.9.1-avoid_dive_into_py_subdir.patch | 49 ++++++++ .../files/nftables-0.9.1-python_build.patch | 45 +++++++ net-firewall/nftables/nftables-0.9.1.ebuild | 137 +++++++++++++++++++++ 4 files changed, 232 insertions(+) create mode 100644 net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch create mode 100644 net-firewall/nftables/files/nftables-0.9.1-python_build.patch create mode 100644 net-firewall/nftables/nftables-0.9.1.ebuild (limited to 'net-firewall') diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index 528cd04345ef..70378f4b8691 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -1,3 +1,4 @@ DIST nftables-0.8.5.tar.gz 355403 BLAKE2B 124bc5c35f050cc591f57b39cddcd595f97d14f83aed464b42efed272a03150623667dd0ca2862833c6b86d825d264c79dd1a211b9a6913b5734c0eaa4029b13 SHA512 311ec77646e2bc7da1b46ef2aba7492a5c0fdf23d33633649a6304771c5ce5ad839353b0702e942a82508c01d1c35705b602d91e54913944e03e176dc3f855f8 DIST nftables-0.8.tar.gz 327629 BLAKE2B a484c22ac010f68fc7458c12cabd0c35e474a0bf81fa4edbefba12d75b424898d38adb11a7fbb4542efbbb2d14be823701b3d9ced7b9fd669338366733fa169b SHA512 90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb DIST nftables-0.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e23c5ba716e726e1e6aba0efb2703233528f7a408bfefe47bfe54aa3612cccab9742c2a2208ec8c7a4bcda0e1823 SHA512 78e383bad5440c9414202cf0e4b6749fc5c01071d2fa547208e61cea6e7e179933990e7e538a60696eb0a7cf510d2c4b273a91d50287bb51507d244cd2875aed +DIST nftables-0.9.1.tar.bz2 764066 BLAKE2B 26b194d6b3b970c05348c32a3ab21e8c25fcdb0d09d3d6b467198ba23a5bb44e7b6450d3efb86c39a488df4a837885c4a1ab96c197d5449f7de49b7b18ff5f90 SHA512 e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242 diff --git a/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch b/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch new file mode 100644 index 000000000000..8ff4b85d88a8 --- /dev/null +++ b/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch @@ -0,0 +1,49 @@ +From c5ca85848c2fe28366d286a5b000f99d927516d3 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 25 Jun 2019 08:58:34 +0200 +Subject: build: avoid recursion into py/ if not selected + +Signed-off-by: Jan Engelhardt +Signed-off-by: Pablo Neira Ayuso +--- + Makefile.am | 6 ++++-- + py/Makefile.am | 3 --- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e567d32d..4a17424d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,8 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = src \ + include \ + files \ +- doc \ +- py ++ doc ++if HAVE_PYTHON ++SUBDIRS += py ++endif + + EXTRA_DIST = tests \ + files +diff --git a/py/Makefile.am b/py/Makefile.am +index 9fce7c9e..5f4e1f6f 100644 +--- a/py/Makefile.am ++++ b/py/Makefile.am +@@ -1,7 +1,5 @@ + EXTRA_DIST = setup.py __init__.py nftables.py schema.json + +-if HAVE_PYTHON +- + all-local: + cd $(srcdir) && \ + $(PYTHON_BIN) setup.py build --build-base $(abs_builddir) +@@ -28,4 +26,3 @@ clean-local: + + distclean-local: + rm -f version +-endif +-- +cgit v1.2.1 + diff --git a/net-firewall/nftables/files/nftables-0.9.1-python_build.patch b/net-firewall/nftables/files/nftables-0.9.1-python_build.patch new file mode 100644 index 000000000000..81f65524ce7d --- /dev/null +++ b/net-firewall/nftables/files/nftables-0.9.1-python_build.patch @@ -0,0 +1,45 @@ +From 1f7e4deb527db32c55646e6e5baedb2ff2aa205e Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 25 Jun 2019 08:58:33 +0200 +Subject: build: unbreak non-functionality of --disable-python + +Signed-off-by: Jan Engelhardt +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 75cf9199..b71268e8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,11 +103,14 @@ AC_ARG_WITH([python_bin], + ) + + AS_IF([test "x$PYTHON_BIN" = "x"], [ +- AS_IF([test "x$enable_python" = "xyes"], [AC_MSG_ERROR([Python asked but not found])]) +- AS_IF([test "x$enable_python" = "xcheck"], [AC_MSG_WARN([Python not found, continuing anyway])]) ++ AS_IF([test "x$enable_python" = "xyes"], [AC_MSG_ERROR([Python asked but not found])], ++ [test "x$enable_python" = "xcheck"], [ ++ AC_MSG_WARN([Python not found, continuing anyway]) ++ enable_python=no + ]) ++]) + +-AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON_BIN" != "x"]) ++AM_CONDITIONAL([HAVE_PYTHON], [test "$enable_python" != "no"]) + + AC_CONFIG_FILES([ \ + Makefile \ +@@ -138,7 +141,7 @@ nft configuration: + libxtables support: ${with_xtables} + json output support: ${with_json}" + +-AS_IF([test "x$PYTHON_BIN" != "x"], [ ++AS_IF([test "$enable_python" != "no"], [ + echo " enable Python: yes (with $PYTHON_BIN)" + ], [ + echo " enable Python: no" +-- +cgit v1.2.1 + diff --git a/net-firewall/nftables/nftables-0.9.1.ebuild b/net-firewall/nftables/nftables-0.9.1.ebuild new file mode 100644 index 000000000000..832ec7e67b47 --- /dev/null +++ b/net-firewall/nftables/nftables-0.9.1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit autotools linux-info python-r1 systemd + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="https://netfilter.org/projects/nftables/" +#SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" +IUSE="debug +gmp json +modern_kernel python +readline static-libs" + +RDEPEND="${PYTHON_DEPS} + >=net-libs/libmnl-1.0.3:0= + gmp? ( dev-libs/gmp:0= ) + json? ( dev-libs/jansson ) + readline? ( sys-libs/readline:0= ) + >=net-libs/libnftnl-1.1.3:0=" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=app-text/docbook2X-0.8.8-r4 + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +#S="${WORKDIR}/v${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-python_build.patch + "${FILESDIR}"/${P}-avoid_dive_into_py_subdir.patch +) + +python_make() { + emake \ + -C py \ + abs_builddir="${S}" \ + DESTDIR="${D}" \ + PYTHON_BIN="${PYTHON}" \ + ${@} +} + +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}@' \ + -i files/nftables/Makefile.am || die + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/osf@' \ + -i files/osf/Makefile.am || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + # We handle python separately + --disable-python + --sbindir="${EPREFIX}"/sbin + $(use_enable debug) + $(use_with !gmp mini_gmp) + $(use_with json) + $(use_with readline cli) + $(use_enable static-libs static) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use python ; then + python_foreach_impl python_make + fi +} + +src_install() { + default + + 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 ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service + + if use python ; then + python_foreach_impl python_make install + 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 + touch ${save_file} + fi + + elog "If you wish to enable the firewall rules on boot (on systemd) you" + elog "will need to enable the nftables-restore service." + elog " 'systemd_enable_service basic.target ${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." +} -- cgit v1.2.3-65-gdbad