gentoo auto-resync : 24:11:2022 - 13:10:39

5 files changed, 221 insertions, 0 deletions

diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 7a865ea8ad8c..84c8abcaff0e 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,3 +1,6 @@
+AUX conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch 1255 BLAKE2B 67c2e85fdb408669ac26cc7aa4b83aa68f5737d340e99559b2eaa803231450672dc346b10f1c48192c119bf3dc00bf6901da60e46472703ddcc14fa9dfa87b7f SHA512 cf62f80f2a2a8cf2c3ce6a1f017dff9d5e2eb023de33a05975233ab3565080662e3752c447e92b85c85eea8b2d7e7709578edbd8210911766c0ee20eb2a28347
+AUX conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch 522 BLAKE2B f4105ae41d6e22942f9486bf87f5de72919c7972bd0a6fdbb5f084b72e32b5fc3e49e817e87c927ae702ad5bc198fc608ad256a906628bf40068c9b2854442b7 SHA512 e7e77ee06e23bc0b354f24c31796e63603f8daa36558b338f408b31b6b52b3fc9cca6d7c645cc42ceb3a5edd643c428a1cd52cf4992f174f845ea2add1afd340
+AUX conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch 1240 BLAKE2B adf5ed3528d0196544b498b284ece55f05c93b09e617e4a3062baa82660b2a981877bed496d9f42c5289a476ce60efac5285fa0b886a8e86a1a595f1248193b4 SHA512 4f8b6039b6f9d7d5fe1cd09a00ff7c2ca51932ebad6c7f06bcdec4be358f272c50dd380215d58629335a6dee1914ef0ad7b9b55bfa148d7885c102ae88ec5157
 AUX conntrack-tools-1.4.5-rpc.patch 1555 BLAKE2B d92009c2bc4de820956ad2d7459a19cde970356aff4e960e3c17808a28a76483a104df7beaf437dfa30b124d5a2b90bd41db27b4b3b76ab57c3dd2e8bf6bad5f SHA512 55cf7451c3e36e414c8bdc43c46b235259f259b0f7c0b5a11d6543438308ed74621b363ae157160634d00bf45d6115e06badc06848951157facec6b8d496026c
 AUX conntrackd.confd-r2 441 BLAKE2B 5898c470f1d99beb47d01c9215c8e3da2e624455f65c3c41e77dbf26db3ebfa4624ac6556098f303c4f4588e093b7f94ae29921b1a6cdc4a881060eaf0dc425c SHA512 3d72d56d44094593f6ff1eac421fe6a4f0d20450ce698c175adf1b18a859b1a24c7120fa60431b2a00da62ae3749c4619106c8e93fb8fc763ceefc26a82d2ed2
 AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c529d8f7a624f742ca66f4692b683f3283b79f000589bdab7f83598130e4ca1a0ae2bed9afce80ec78d00c8 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe
@@ -9,5 +12,6 @@ DIST conntrack-tools-1.4.7.tar.bz2 539688 BLAKE2B 42a3cacf8a32a5b8b688a9fd68f660
 DIST conntrack-tools-1.4.7.tar.bz2.sig 566 BLAKE2B c513cd59d9aeb76bb33bb8c4e0d25c46b6303a9d3f3e359e20248e2d8dd2822777056e217c12da9005ee075036ea05a74dd1ed9f22a44b7d4745ff6917bda15b SHA512 5a2bcc6da792544029ddf0d3a4caf019b215907e66d491e5d98a4f1189fc9c03ec8aad5ad22166799c5f0c81273284cb757e9368c9d9d3049bc49da47c037e05
 EBUILD conntrack-tools-1.4.5.ebuild 2190 BLAKE2B 49e4d6cf2f37939da6d577c6de370d6a68e391a5c57c7f84a5d002befb231560d6e443d5070d0ccde1f888bcae67d9185d93aac4acfcc0dc4ae6359f49509f09 SHA512 7cdf3820923462eab080ab8c2b5ede6d3f4dd08247343aa7e0bcfdb0ed4f1e95538c1ea10a1d427470ce27df652f44bdcc9d1dfee1436adc3b51a5bf123c6e97
 EBUILD conntrack-tools-1.4.6-r1.ebuild 2420 BLAKE2B ed7d870025713656b0282edef43ca4726692391ce31d32cb67b3928efeb2b70b7411d7bf0a605b88a3a30247e5815362f17ede5cba364c26af1bc886bae8b3a8 SHA512 1210b788427d377a68d94a078c2785572a6f6e74ebb1fa7a37bbbb93b4878222455dd13c62abfff33bc7411960ae7d4c48d346a61f7280855a5139fd23c368b2
+EBUILD conntrack-tools-1.4.7-r1.ebuild 2743 BLAKE2B cd70071a4fe5efa3c3401da196b9f01c18eecd891bd9de758ec69b51c378a760d81aa403b8c0e45467648a3cd9ed1cca16848b4aeaaba6029d0b1c89c5b0129a SHA512 df9e06c5cf7571861b273926ee27150b3b5c09e7fd6e9af69324051153fff6d24e3697abd18bef45cf4a356b45e1a5207af2142eb59f43626dafcc5ddc09e904
 EBUILD conntrack-tools-1.4.7.ebuild 2427 BLAKE2B d28a26c3c44d76ca7b047914265982e29dc7f3cf7eefeea4a2889d3cdb7258c33c176c9a1c9a65af15c4cb44ae79c54f08aeecc1e720fe040b9703e796e363d6 SHA512 692370ef5bc94b2f72ff2f57e494a96343b7b7fe9ceb9f39bbc6dbb4c296dacf457d08a54dd231d0bc599a16e06baa4784bf57ab9cca31fe24033c47f8172685
 MISC metadata.xml 1049 BLAKE2B 614eabcf8632ae879993c98ee216cb785f3695072029c272a1a86dff2066eabc3e69ec80cea0537e988b1c3f9256235935f45c7b62883d61dedd29786edcbe3c SHA512 74e3be48453d718aeaafb63d1a5c15a35dfb2adf62721f59c2896c7f80fd607a042ed166d275bc7d523de0b5bae4c310d77eec649fbc7ec50fa7d5c9919ec56f
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..07701cad4d77
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit autotools linux-info systemd verify-sig
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="https://conntrack-tools.netfilter.org"
+SRC_URI="https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2
+	verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc +cthelper +cttimeout systemd"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3
+	>=net-libs/libnetfilter_conntrack-1.0.9
+	>=net-libs/libnetfilter_queue-1.0.2
+	>=net-libs/libnfnetlink-1.0.1
+	net-libs/libtirpc
+	cthelper? (
+		>=net-libs/libnetfilter_cthelper-1.0.0
+	)
+	cttimeout? (
+		>=net-libs/libnetfilter_cttimeout-1.0.0
+	)
+	systemd? (
+		>=sys-apps/systemd-227
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	verify-sig? ( sec-keys/openpgp-keys-netfilter )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
+	"${FILESDIR}"/${PN}-1.4.5-0002-Fix-Wstrict-prototypes.patch
+	"${FILESDIR}"/${PN}-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		die "${PN} requires at least 2.6.18 kernel version"
+	fi
+
+	# netfilter core team has changed some option names with kernel 2.6.20
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="~NF_CT_NETLINK"
+	fi
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
+
+	check_extra_config
+
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
+		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
+			"are not set when one at least should be."
+}
+
+src_prepare() {
+	default
+
+	# bug #474858
+	sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
+
+	# Drop once Clang 16 patches merged (implicit func decl, etc)
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cthelper) \
+		$(use_enable cttimeout) \
+		$(use_enable systemd)
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc/manual
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/conntrackd.initd-r3 conntrackd
+	newconfd "${FILESDIR}"/conntrackd.confd-r2 conntrackd
+
+	insinto /etc/conntrackd
+	doins doc/stats/conntrackd.conf
+
+	systemd_dounit "${FILESDIR}"/conntrackd.service
+
+	dodoc -r doc/sync doc/stats AUTHORS TODO
+	use doc && dodoc doc/manual/${PN}.html
+}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
new file mode 100644
index 000000000000..bc9bd8d3a13d
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
@@ -0,0 +1,28 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From a450f6374dc1b0296578599adf77f9ac025fab85 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:51:23 +0000
+Subject: [PATCH 1/3] Makefile.am: don't suppress various warnings
+
+These will become fatal with Clang 16 and GCC 14 anyway, but let's
+address the real problem (followup commit).
+
+We do have to keep one wrt yyerror() & const char* though, but
+the issue is contained to the code Bison generates.
+
+Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -60,8 +60,8 @@ if HAVE_SYSTEMD
+ conntrackd_SOURCES += systemd.c
+ endif
+ 
+-# yacc and lex generate dirty code
+-read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls -Wno-sign-compare
++# yacc and lex generate dirty code (issue is in yyerror() wrt const char* vs. char*)
++read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-incompatible-pointer-types -Wno-discarded-qualifiers
+ 
+ conntrackd_LDADD = ${LIBMNL_LIBS} ${LIBNETFILTER_CONNTRACK_LIBS} \
+ 		   ${libdl_LIBS} ${LIBNFNETLINK_LIBS}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch
new file mode 100644
index 000000000000..e170ec07ba0a
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch
@@ -0,0 +1,19 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From 11965f7020fbadcc9784daf598687841e96ef3fe Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:52:01 +0000
+Subject: [PATCH 2/3] Fix -Wstrict-prototypes
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/network.c
++++ b/src/network.c
+@@ -113,7 +113,7 @@ void nethdr_track_update_seq(uint32_t seq)
+ 	STATE_SYNC(last_seq_recv) = seq;
+ }
+ 
+-int nethdr_track_is_seq_set()
++int nethdr_track_is_seq_set(void)
+ {
+ 	return local_seq_set;
+ }
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..eb34f4ffd4e4
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
@@ -0,0 +1,56 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From a6df37777fc47c2473a13501c17eb3cbbf922ec1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:57:37 +0000
+Subject: [PATCH 3/3] Fix -Wimplicit-function-declaration
+
+Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/read_config_lex.l
++++ b/src/read_config_lex.l
+@@ -21,6 +21,7 @@
+ 
+ #include <string.h>
+ 
++#include "log.h"
+ #include "conntrackd.h"
+ #include "read_config_yy.h"
+ %}
+@@ -174,7 +175,7 @@ notrack		[N|n][O|o][T|t][R|r][A|a][C|c][K|k]
+ %%
+ 
+ int
+-yywrap()
++yywrap(void)
+ {
+ 	return 1;
+ }
+--- a/src/read_config_yy.y
++++ b/src/read_config_yy.y
+@@ -31,14 +31,25 @@
+ #include "cidr.h"
+ #include "helper.h"
+ #include "stack.h"
++#include "log.h"
++
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
+ #include <sched.h>
+ #include <dlfcn.h>
++
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
+ 
+ extern char *yytext;
+ extern int   yylineno;
+ 
++int yylex (void);
++int yyerror (char *msg);
++void yyrestart (FILE *input_file);
++
+ struct ct_conf conf;
+ 
+ static void __kernel_filter_start(void);