From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- net-firewall/Manifest.gz | Bin 4547 -> 4548 bytes net-firewall/ipt_netflow/Manifest | 3 + .../ipt_netflow/files/ipt_netflow-2.6-gentoo.patch | 61 +++++++ net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild | 110 +++++++++++++ net-firewall/nftables/Manifest | 4 +- net-firewall/nftables/nftables-0.9.9.ebuild | 179 +++++++++++++++++++++ net-firewall/nftables/nftables-9999.ebuild | 8 +- net-firewall/nufw/Manifest | 2 +- net-firewall/nufw/nufw-2.2.22-r3.ebuild | 4 +- net-firewall/ufw/Manifest | 4 +- net-firewall/ufw/metadata.xml | 1 + net-firewall/ufw/ufw-0.36.ebuild | 4 +- 12 files changed, 369 insertions(+), 11 deletions(-) create mode 100644 net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch create mode 100644 net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild create mode 100644 net-firewall/nftables/nftables-0.9.9.ebuild (limited to 'net-firewall') diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz index 0e1bf739da5a..284cf62588e3 100644 Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest index 37bdc569cfd9..b9689b8c73b9 100644 --- a/net-firewall/ipt_netflow/Manifest +++ b/net-firewall/ipt_netflow/Manifest @@ -1,8 +1,11 @@ AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0 AUX ipt_netflow-2.5-gentoo.patch 1944 BLAKE2B 0acb66305cd7f337a271b356f65c2984b445fc245d4de5668ccdff54ef7bb5095fc27148be978f13bc84dfc92be58abda897dacf053a31b10b44caffb5cbabb7 SHA512 781c4286889b2e39f2276de02970306b76f859c87565dff5235cfb1fedd0e7f6cc2a5f1263899f7505317ce22fd73c724a4a1273114adcc6ad2c3cc84069d47d AUX ipt_netflow-2.5.1-vlan_dev_priv.patch 1182 BLAKE2B f5522a888133b5411cb6b3e43e2cc2d0457b521a46e26b3f3d6826a84dc016dd8b58195317601ebf49de81031faf9100f95dd547adbda81a9b4814a75c3e147b SHA512 d1d23794871237338102ed148b94a6d0f92997675f6e059fc0f1e94b54aed894dd4325721d8427edcaf6747bd063338b7f94b4ab51904bf76bd98c8380d4e5e2 +AUX ipt_netflow-2.6-gentoo.patch 1998 BLAKE2B b4da947e83bc7c80f91a489858a9a7fdf461f29c331822c1c417bc233af18d7b89517aa443d7ac0bd0212ace6fa8707528254930ca78fceef24e8e1c90109bac SHA512 71a39f75860e1112d900ab8f86c36cbd6bf7908f0caca9d7e3cf257accdd6d08c51d3584129cdf4b145123e67510bf3792fc8c330036e26af441f115241623d9 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce +DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5 EBUILD ipt_netflow-2.5.1-r1.ebuild 2462 BLAKE2B 27dd6837a8be04ddb8d4cc95895630360d2d4e791698ec509477a7c591ac28c853e3b8985dd2178fade70d7477a448f6f8b0f288fe363bbfe636ae94ddbb18f3 SHA512 81f9fd7612a9584c7790f8309450af3e3b6ae9bf07c40042be7cdf6f7414f0fcadb2bf0aa608d92cefd555071d473883ccae090f1024d7c7115ceb14731d7f3b +EBUILD ipt_netflow-2.6.ebuild 2424 BLAKE2B 8ab74f15f2a3f7824eb0e76ea94c52acd022bc0e80861890a402e3ea6b3e1e7db534b645b4ec6a49a36006f24a0a4ba98036607225c56041b0bf3b4b7ff432fc SHA512 a0642f0ad24c4e981705dc53c08652658d967ec597a89b4db2f7002ffa2673c8a03572a00344d1b5159e94a5894e0140ce4ae7584157cb39d6280f8fc155e1eb EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5b6f3fa7387d690d361f6cc26b83507944f0cefc560db6894efebf9e399b1a97eab5884fb62cddccadb984272e0fd630b19af224f1b26dc335a732eb3ce3dfa8 SHA512 2b2ce7e03db3d3168876c8c83ebf271f75aa3d85e05436234fd4c36738da096243fd7f5f3ba648efdf65d62ec986c956c8014cd69afa73e40e67be717bf3b295 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5 diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch new file mode 100644 index 000000000000..44dcfdec6d7b --- /dev/null +++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-gentoo.patch @@ -0,0 +1,61 @@ +--- a/Makefile.in 2021-05-27 12:57:29.600377496 +0300 ++++ b/Makefile.in 2021-05-27 12:58:55.111381725 +0300 +@@ -13,7 +13,7 @@ + SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so + SNMPCONF = /etc/snmp/snmpd.conf + SNMPLINE = dlmod netflow $(SNMPTGSO) +-CC = gcc ++CC ?= gcc + + # https://www.kernel.org/doc/Documentation/kbuild/modules.txt + # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt +@@ -24,31 +24,31 @@ + + ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.h compat.h Makefile + @echo Compiling $(shell ./version.sh) for kernel $(KVERSION) +- make -C $(KDIR) M=$(CURDIR) modules ++ $(MAKE) -C $(KDIR) M=$(CURDIR) modules + @touch $@ + compat_def.h: gen_compat_def + ./gen_compat_def > $@ + sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile + @rm -f ipt_NETFLOW.ko ipt_NETFLOW.o + @echo Compiling for kernel $(KVERSION) +- make -C $(KDIR) M=$(CURDIR) modules C=1 ++ $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1 + @touch ipt_NETFLOW.ko + coverity: + coverity-submit -v + + minstall: | ipt_NETFLOW.ko + @echo " *" +- make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) ++ $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) + $(DEPMOD) + mclean: +- make -C $(KDIR) M=$(CURDIR) clean ++ $(MAKE) -C $(KDIR) M=$(CURDIR) clean + lclean: + -rm -f *.so *_sh.o + clean: mclean lclean + -rm -f *.so *.o modules.order version.h compat_def.h + + snmp_NETFLOW.so: snmp_NETFLOW.c +- $(CC) -fPIC -shared -o $@ $< -lnetsnmp ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp + + sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my + @echo " *" +@@ -68,10 +68,10 @@ + fi + + %_sh.o: libipt_NETFLOW.c +- $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c ++ $(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c + + %.so: %_sh.o +- $(CC) -shared -o $@ $< ++ $(CC) $(LDFLAGS) -shared -o $@ $< + + version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile + @./version.sh --define > version.h diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild new file mode 100644 index 000000000000..97fce443ce9b --- /dev/null +++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod toolchain-funcs + +DESCRIPTION="Netflow iptables module" +HOMEPAGE=" + https://sourceforge.net/projects/ipt-netflow + https://github.com/aabc/ipt-netflow +" +SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug natevents snmp" + +RDEPEND=" + net-firewall/iptables:0= + snmp? ( net-analyzer/net-snmp ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/linux-sources + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 + "${FILESDIR}/${PN}-2.6-gentoo.patch" +) + +pkg_setup() { + linux-info_pkg_setup + + local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q" + use debug && CONFIG_CHECK+=" ~DEBUG_FS" + if use natevents; then + CONFIG_CHECK+=" NF_CONNTRACK_EVENTS" + if kernel_is lt 5 2; then + CONFIG_CHECK+=" NF_NAT_NEEDED" + else + CONFIG_CHECK+=" NF_NAT" + fi + fi + + BUILD_TARGETS="all" + MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" + IPT_LIB="/usr/$(get_libdir)/xtables" + + linux-mod_pkg_setup +} + +src_unpack() { + default + + mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die +} + +src_prepare() { + default + + # Checking for directory is enough + sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die +} + +do_conf() { + tc-export CC + echo ./configure $* + ./configure $* ${EXTRA_ECONF} || die 'configure failed' +} + +src_configure() { + local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)" + # this configure script is not based on autotools + # ipt-src need to be defined, see bug #455984 + do_conf \ + --disable-dkms \ + --enable-aggregation \ + --enable-direction \ + --enable-macaddress \ + --enable-vlan \ + --ipt-lib="${IPT_LIB}" \ + --ipt-src="/usr/" \ + --ipt-ver="${IPT_VERSION}" \ + --kdir="${KV_DIR}" \ + --kver="${KV_FULL}" \ + $(use debug && echo '--enable-debugfs') \ + $(use natevents && echo '--enable-natevents') \ + $(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent') +} + +src_compile() { + emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all +} + +src_install() { + linux-mod_src_install + + use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall + + exeinto "${IPT_LIB}" + doexe libip{,6}t_NETFLOW.so + + doheader ipt_NETFLOW.h + dodoc README* +} diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index eb689192bbf9..376f3ae66c3c 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -8,6 +8,8 @@ AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b23 AUX nftables.init-r1 2279 BLAKE2B 1c4c28ea5b6a22905b3ec7de8e54726933b579352ecd799b7641384a138ffa2d4a2deb87d84ef5d75a43ae30759f1550d611c2560096bb5083cae9bb834be2bb SHA512 2165223bfd4f300b9cc01f604347fc5167f68515174b0d116b667bd05f4baf8c2f931e482f632975a8be371c2147951d9407f397ea4dbcbac79a6738cbd23015 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0 DIST nftables-0.9.8.tar.bz2 879516 BLAKE2B 5063090d648668f4d5ae6d4be48ebecc65dfd4b525768e94a0d90ceebbee73874c916727be8de633550db71c612d698d88cf93575931362b48d954e6ac275143 SHA512 1c5709825c8b2c13cbed0310658959ecee164c930bc9e2447618a0894598138b9a549d20509c32a5c23ce99e40438df38f9e170cf656ce993d819f365490a180 +DIST nftables-0.9.9.tar.bz2 922624 BLAKE2B 8de2709576a26ca84a8d694f7cb06cad2bb2fb4671ba21ffc32c0d5997e8124ae7cd794dafddf4db48d8a49c280b48b07d2a31b6c18f6647fdb67cfe7f065b61 SHA512 dfdd3ffc0ffc1742ca0494a3f8fac1c7b2fe942849e60d33fc3cb8a51e27bd39e1ccfeda2195191377a32bb5363ea244f4c3e71b4a6d930f33bf87e17a534fab EBUILD nftables-0.9.8.ebuild 4284 BLAKE2B 0a6590396f7bdbca4cef9ea000e3a42a009a353e907d381edfe56dfb77e3e6e0f7f23d91dd24a0efb80f39a43cf2553ca9ec2c73533d06d565dad4401137329f SHA512 f43a20b08b71e572eecf0004d3cfa824fa26ca1e461a09b3f2e99fd018a4f7ad05e1c6088e3cd2aec695166058663035cad7097bed2e3084ce155880bed68bdd -EBUILD nftables-9999.ebuild 4492 BLAKE2B 05cc4045e8fae502ed295d4a3adbf64011804f7e4644164f2154cc2cf60d3449c4dbc4bd2cf24ed31d728a70ffc1ae68f85ae2b1e1e833af72597709cb2a65df SHA512 49925a64a3c4e0c4585e78a368884439e86281e2350129f66cd5b7dc952d515c4b4e007e6d2cd1bdb436cc888949e5139863e1eb99cd352844b5727693aed88f +EBUILD nftables-0.9.9.ebuild 4552 BLAKE2B 422edb387e09cf89938256e3486ce44f29fee32dfcee9a9f1ad7af3c9be0f1d128c4827f40046682b5a8c76046c5a075b9a5f77ba461f4a37425f2bfd973b63c SHA512 6a6c42f9fa7f2209f5134d8147775134e870ea9362f13c0a5d2ed5a81c255003bf052cb8ffc7c43a528ef2e08922bb1757b44f4f2e608cb1f639498cd9f01ed9 +EBUILD nftables-9999.ebuild 4552 BLAKE2B 5e51010ba1bfbc0bee8011033550d456ee17b36498e90043dd1cc4a8d13c31ff6ce38ccf23cb0549a6d93b261b763ef090aa2cb6aae5cddd9636817fea9e9bde SHA512 d5a9d95ae862dd2dcce238f1b5837d26d9f9f39f888c3bdb96bf3e34ef9e66d70d40e9968f6c34032e5ce7bc787466fbd9280328c446b58dccd8547cedb176ca MISC metadata.xml 932 BLAKE2B 1d75a3e5a7d7416bc86d9f85bb2ca62d33a78017d773d2984b7f9666a0f615ac41cdbdab58f63f612a2b95e498fe8a785a1dce0e4be188446c197a3d96bbecd5 SHA512 8845820c9c3be773a1b8dbbf24eeb1db7327722f4710c473112b4450265bdedbd8b0284cb6ba87e915596cdc1d608e573920f19116f06fe6a1fa167e8d0e23d5 diff --git a/net-firewall/nftables/nftables-0.9.9.ebuild b/net-firewall/nftables/nftables-0.9.9.ebuild new file mode 100644 index 000000000000..8a0d67aa9831 --- /dev/null +++ b/net-firewall/nftables/nftables-0.9.9.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit autotools linux-info python-r1 systemd + +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" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +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.0:0= + gmp? ( dev-libs/gmp:0= ) + json? ( dev-libs/jansson:= ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + 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" +) + +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}/skels@' \ + -i files/nftables/Makefile.am || die + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/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_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[@]}" +} + +src_compile() { + default + + if use python; then + python_foreach_impl python_make + 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 + python_foreach_impl python_make install + python_foreach_impl python_optimize + 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-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild index 71361f791e99..23f5268432b4 100644 --- a/net-firewall/nftables/nftables-9999.ebuild +++ b/net-firewall/nftables/nftables-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools linux-info python-r1 systemd @@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then " else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi LICENSE="GPL-2" @@ -52,6 +52,10 @@ REQUIRED_USE=" libedit? ( !readline ) " +PATCHES=( + "${FILESDIR}/${PN}-0.9.8-slibtool.patch" +) + python_make() { emake \ -C py \ diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest index 61e77c62b430..b62e76134ad5 100644 --- a/net-firewall/nufw/Manifest +++ b/net-firewall/nufw/Manifest @@ -5,5 +5,5 @@ AUX nufw-2.2.22-var-run.patch 1438 BLAKE2B 259d96d3a7386ac30f4ca7a88ecb0a4714b04 AUX nufw-conf.d 122 BLAKE2B 3263b28a9a783f35920a30cb022fe86b8a0fdc05b45c5a191e53c0b201ca38da9fe9eeda82866cf69dc760e0ff2fcd0264ee17f53f03a6077b63d9fcbd2dd1f0 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb AUX nufw-init.d 273 BLAKE2B 00827d4cf93b484c6563b7bccc4020e9de0e8f2652eb29f9b1a64dfb4333b7e04b370f977a43a8f9af4b680d62e658a7779822c6671059e83a5ceea7f1872f5e SHA512 7f8b16532ae74b6aae8a9c7ef4a7509b66253f03a47c8ee521163a35db525e8c25b091289e10337307906a27e0aba558bd2a28dc0b91cbc09ce17ba78002d0e1 DIST nufw-2.2.22.tar.bz2 597491 BLAKE2B 4c3092aeaced237ceb9faa16cff275938de23cdca31d2d6f6406238a0fe75ad15468f91a80b1d6e0bfc6dac520b6331ee19a1d95a006d591b891b91aad6caa8b SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee -EBUILD nufw-2.2.22-r3.ebuild 2688 BLAKE2B 2b2168c01f03af056dcc4b27ae564cfd800dc5c2e15bec516f0b8bf77cacbe4f0d4bf3b3e34926bc27f165eafacb7823206cc18685cea08b83ac41b2560016ed SHA512 01a664972a87b50c0548b9256de7bab33d57c993d50de5c252287662370f6ee6a05ffaa2b1b72185ac473daa52ec431bb4bf05fbd93fe4917ed63b2773611bbc +EBUILD nufw-2.2.22-r3.ebuild 2701 BLAKE2B c7bb93df4e851e4adcfb809ce1dd06dce0fe43bd9c64cc6e366371fdf721a4dc7286e271aab6c7541fcce2673c752a4b504e44cc1a2d4f1f529e85cf6ddcde06 SHA512 75f4f61e3d502220c77fa69997eb5337bf3a19ea64da68cf744c6c2197a4627ef3ebf99cfe4d96e477b3980772be3381423b78e5fb6a5f11a61dc53d98b4d1f4 MISC metadata.xml 639 BLAKE2B 5949c30f493d0cb89581785cb440fefff80a3c204b7d2c0fc41606c4306cd39048403a339a15126d4b870b008dcab2e78132f64e85fdb6652f0677dd9a7cf74b SHA512 5fb1a59d891ebadc0df099810c33a229dd2e446b0e2b25caa0aabfe3f89ac1dcd278aae322f9e2493428f1699a93d0db80a820d8b8a44abbf17bf5a271e59071 diff --git a/net-firewall/nufw/nufw-2.2.22-r3.ebuild b/net-firewall/nufw/nufw-2.2.22-r3.ebuild index 76129b5fbf52..d8bbd19926f2 100644 --- a/net-firewall/nufw/nufw-2.2.22-r3.ebuild +++ b/net-firewall/nufw/nufw-2.2.22-r3.ebuild @@ -4,7 +4,7 @@ EAPI=6 SSL_CERT_MANDATORY=1 -inherit autotools flag-o-matic ltprune multilib pam ssl-cert +inherit autotools flag-o-matic multilib pam ssl-cert DESCRIPTION="An enterprise grade authenticating firewall based on netfilter" HOMEPAGE="http://www.nufw.org/" @@ -80,7 +80,7 @@ src_configure() { src_install() { default - prune_libtool_files + find "${ED}" -name '*.la' -delete || die newinitd "${FILESDIR}"/nufw-init.d nufw newconfd "${FILESDIR}"/nufw-conf.d nufw diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest index fd9072c6d695..012be2e94737 100644 --- a/net-firewall/ufw/Manifest +++ b/net-firewall/ufw/Manifest @@ -9,5 +9,5 @@ AUX ufw-2.initd 2611 BLAKE2B b6a75e023ad0efeeef168e7e074c716ec66f40d3bde9f99cf1a AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0593e59cc7f5b988f8545ddea37f19d9b40e870d743bea66edd7da1e3d2753b6edda8afa352 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7 DIST ufw-0.36.tar.gz 580338 BLAKE2B a7e07ac11539061a69bb83d45c0affc54793503b31c9e9f9f8b34fa890a3fe97682f9133102e74e5f6e1eb372a929cfc8619baa2cc9efc1dc289d9f4a1766efd SHA512 b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3 -EBUILD ufw-0.36.ebuild 5747 BLAKE2B 02a0bf893f4c3b5d1f437b28cf8e59f625a8503f40929cd9ec5f28f86936590ea5b005c2c01f496ae15a808fb2b09aad0fb736a853dddcb86b6f987ba7a8fb0b SHA512 9b82a3d19e749db4805d2a6d57944a0f79cb0f66e01040f06dbc028d6f02a9b67234235da451aa80356d18610cb2f2f59d056af57875eb1d303b981e88d3cb6a -MISC metadata.xml 897 BLAKE2B 8c44a779069d78a84e4b71049b1bd3164c2e54420bf26a658e65aee9ccca21cffb97af77be43ab1a95ce531c60a273a34df3e558bd3060618d48f3c957d6bccf SHA512 83653f1c6e09a82e2812e86c56f077fb330ae1bfc1fee93c7fb27a1d10ef2452a1a73fc05eda002e3bfdc7df0157a941af6dfb8a38b737d3d096bc4c92f3dd26 +EBUILD ufw-0.36.ebuild 5738 BLAKE2B a80f0aa915549bac3b8f3fd0c2f05556334f748e85499daf574afc94bdd16604e14252d753bc33a0c01fedce57c849a0d9053346245ae9ada4e528a61c74a241 SHA512 7542289ee43692d68688703c5a294552446ce23ecc46035468e6815c3dfcb8a6153cfa92f52a516c6375ae6f984254617ebced346fb7dc83415c7d6d0fa3dd45 +MISC metadata.xml 921 BLAKE2B 67f2350bbad8f0db2558ebded4b488d5c1a95be58acde43deee0710eab71ca80a4bf76c8b0308a3c20dfadb7f6359f06ab7659f4e164242e959ac0f7e6bf2881 SHA512 629e91645533e3ab966a3624385104fce256f86f8bcd3903bb69e9441b14bc6ea50469e59fbc7cd0e2254b76cbc6939d3e1994b841dc18d5e80dd33201933e61 diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml index daef610907ec..88d478c5668e 100644 --- a/net-firewall/ufw/metadata.xml +++ b/net-firewall/ufw/metadata.xml @@ -19,6 +19,7 @@ for managing netfilter, as well as an easy to use command-line interface for manipulating the firewall. + ufw diff --git a/net-firewall/ufw/ufw-0.36.ebuild b/net-firewall/ufw/ufw-0.36.ebuild index 13a5a8a3636a..ca3e55bb0fef 100644 --- a/net-firewall/ufw/ufw-0.36.ebuild +++ b/net-firewall/ufw/ufw-0.36.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) DISTUTILS_IN_SOURCE_BUILD=1 DISTUTILS_USE_SETUPTOOLS=no @@ -18,8 +18,6 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86" IUSE="examples ipv6" -DEPEND="" - RDEPEND=">=net-firewall/iptables-1.4[ipv6?] !