From 5b5df25227111ef465caf5c52bcfb66dac3219cd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2018 20:11:46 +0000 Subject: gentoo resync : 19.01.2018 --- net-firewall/Manifest.gz | Bin 5718 -> 5714 bytes net-firewall/nftables/Manifest | 8 +- .../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 ------------------- net-firewall/nftables/nftables-0.8.1.ebuild | 84 ++++++++++++++++++++ 7 files changed, 86 insertions(+), 241 deletions(-) delete mode 100644 net-firewall/nftables/files/nftables-0.5-pdf-doc.patch delete mode 100644 net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch delete mode 100644 net-firewall/nftables/nftables-0.6-r4.ebuild delete mode 100644 net-firewall/nftables/nftables-0.7.ebuild create mode 100644 net-firewall/nftables/nftables-0.8.1.ebuild (limited to 'net-firewall') diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz index 214fe8aba181..c041b6d673c0 100644 Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index d8fa240f5bc1..f20b4807566b 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -1,13 +1,9 @@ AUX libexec/nftables.sh 3643 BLAKE2B 83818eb88db2d30c58b348e12b5c5baf7599f4e301ac12455a70f1c98e369e4febab3020ddb1c5b83e6d3777b3a98bd30a5baf73d90ac00e1278d88fc1565b8b SHA512 efc9b4f9520c78b6248f16bd5708669872e8abf949f6f4b81182f331f8532dfeaae2df648e8878e9b5cbd66c0259daab71035ea922754807654b2b3bc86b4352 -AUX nftables-0.5-pdf-doc.patch 1663 BLAKE2B 6aa5e19c80dae0fa57c4f7ed403c99139e9a4fd12f39c55498920c5bf6eb1868c16ad31bd323ebf96f6f9382baeff26ae90bfc2c76779b4ea7f2b0d387e59931 SHA512 1925ba300068155ec38ed0631eea0bab1e17ac0b4b454b6f5bf6548961b0264dfd9c9be27e697b8fd7db1827cc670a132c3a716d0874535e29ddb696d1a3eedc -AUX nftables-0.6-null-payload-desc-fix.patch 411 BLAKE2B 6dbde332d41200db0dd7b81415d9a642026629ffb0ca8dfaf2a8433316fd59555a3fb9ef46fa92f2a6b2a84adad9c9ab9ac8dbc23a26d0482e8aaa1767794cfd SHA512 034bfa338ef52b722df8441ab981f45c4eeb88c0d65aa4fcdbee1d17df93c7c3239786351632ccadada08ecae796d366b994bd3c20f576a853885517d4de6116 AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b232a044c2fd64f8e50b9b55a4fe670174c3eabf3d176ee0158c1043baec4b76b0802e7e97bc862fcf SHA512 8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144 AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c89b59fc7e3ea0dff0e98d767cee2c00a5462023fdf6f59e813dec7063768a34187f2404377e498f7 SHA512 ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0 -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 -EBUILD nftables-0.6-r4.ebuild 2116 BLAKE2B 00a6a76fd348af26efbdfada14f338aa9a7f9e87364450c3b348e3343c616029bf5ab3516758d845477508fb08cc35bfb378533bf311c952a4ef4faa49a8737d SHA512 4c1a3420d9d228ff1925d91ee0bdd285995b7d06b59453863e5b5fef12813c6f58d8487a10c880c313a328be79e69b49147f0a5c73e07554d665ff24ffe1f265 -EBUILD nftables-0.7.ebuild 2002 BLAKE2B 2d83e619dd5400e7ef476a4b3c62acd223ed277c3b745f9bef69b3b10f0602af76914b50a6ea4167a251942d1f66f4f3d753f35485c0b16d45329079fccb8dcd SHA512 0b6efeee42b09b861a27fb11cf02b2096f5e66f8e80f92d8ed97bfeeabb8fe532b068761ffbadf7603cc6095ddd81abe313dd6f581b0719239411f740a0131bf EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6246c25042449cb5ffa7809401a7ef512275dc1f45c50b51bc2807b3679d1c386bcb2470522ba1a338dc728bdb15 SHA512 6bd510183e9d1cec3fa05970adccf28ac21c7ad839f3a6236ee584d1308c48988ee2b006630ecd558954cb80a7a8faf6e78ab9b06b29df4b2a69161a9e848c71 +EBUILD nftables-0.8.1.ebuild 1963 BLAKE2B c7b869611c3771b5225c5ee78ee7acb6f909b562c571153683013472b1c5df9e5e4ab6fefa6a6b3ea9777bc3d18e078e6a95a72381646886edab6c1bd3fc4054 SHA512 203c90866660f07594bb676a01ac13a0c4614a1be9161ae5ed8786a0fa343ae12feacc5066e466b73bc240fd5f2dc43bbc5458396913e299313ffa7e28d8976c MISC metadata.xml 372 BLAKE2B c1733809892af8497a3a0340d5877ec99b856083c8e16804f2129779e8065c1bd8b93f10b4c37c25e089ca474be5e18eb4344ce4e83c95c646fb9252f1451d0d SHA512 13f7b219a6a043a047b4be99f69cadf76b2a0c20800c1622f08dc9626ebc1115db79a3866fb19c1c00a98b66a692b42d42c2c3e66da654ff83e44d193da8a511 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 d09faa3ddd9f..000000000000 --- 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 3ea59e7aa490..000000000000 --- 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 be9f30bcfbe3..000000000000 --- 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 30376495f198..000000000000 --- 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." -} diff --git a/net-firewall/nftables/nftables-0.8.1.ebuild b/net-firewall/nftables/nftables-0.8.1.ebuild new file mode 100644 index 000000000000..5658cb069dfd --- /dev/null +++ b/net-firewall/nftables/nftables-0.8.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2018 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="https://netfilter.org/projects/nftables/" +SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~x86" +IUSE="debug doc +gmp +readline" + +RDEPEND=">=net-libs/libmnl-1.0.3:0= + gmp? ( dev-libs/gmp:0= ) + readline? ( sys-libs/readline:0= ) + >=net-libs/libnftnl-1.0.8:0=" + +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() { + local myeconfargs=( + --sbindir="${EPREFIX}"/sbin + $(use_enable doc pdf-doc) + $(use_enable debug) + $(use_with readline cli) + $(use_with !gmp mini_gmp) + ) + econf "${myeconfargs[@]}" +} + +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" + + # 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 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