diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/Manifest index 5e9abfb7ca..7d15cac6bc 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/Manifest @@ -1,4 +1,4 @@ -DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c -DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f DIST libnetfilter_conntrack-1.1.0.tar.xz 340332 BLAKE2B e1f8342b4edcbd81ab9995c9ac37818006c710f890b85120e5225936163d8ac24b5a487b468cb9f98cf3c86ab3534e1a9fc866b06633c82eb9bd81d0caf2ffa1 SHA512 5435f45b61e4e13b63b4a39f0c34fb0b59d2eed1e5dc182bc91369b72df54f5a555c111223f4f4a786a2c47dd5c6efd97205b8dca2f522e28d9d54035f928882 DIST libnetfilter_conntrack-1.1.0.tar.xz.sig 566 BLAKE2B ed377a2e9cf3a02f47f79c0066b333ccea6eb7fe826cd37b4b0f6d57224d62ba131157016d984ccab6b02be654c47a12b04bce0c2e7de3f935f483b1ae388dea SHA512 b3125d49976d2475e942f74bb3e57632b6643af6f65ea394a71d091759723d4f1220c6cd6116a7820e2c91069883898ad84e9c77355328e71b47906db8501cbe +DIST libnetfilter_conntrack-1.1.1.tar.xz 313396 BLAKE2B 5b49c2b27b268fdce964767dc7ef1c87edeadcee4102103bc7045e98d27675b41a03dd707fceb53ea14e73951273398231d04e9f72f138911158c7d55d2135f5 SHA512 47b7e1c187c9d1ec52777ba08d636a8178f811816b7d5eae28ef7680e2d4516428445572e655a2b60e8f3af1c6788268cfa16532e4a2ba761f8ba55bb3969870 +DIST libnetfilter_conntrack-1.1.1.tar.xz.sig 566 BLAKE2B 968a2277ecb66e80b2ffb4945cb15d0a333bf313286e04af9903515db7389f6015ce8f1ce9e2124bb4f8544c686d6a7cc365c557ae3534ef0f0bd4a76535ccf7 SHA512 0488e2a08da43c1e3df15a6d907846f2857211820fc010004953abe9dfa9d659d7b13ac87af92b00810c69feec85552e2f3f0e59c756d56e26540806795e5389 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch deleted file mode 100644 index 7bb4a34765..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugzilla.netfilter.org/show_bug.cgi?id=1654 ---- a/configure.ac -+++ b/configure.ac -@@ -55,9 +55,9 @@ int main() - struct in6_addr addr6; - char buf[128]; - if (inet_ntop(AF_INET6, &addr6, buf, 128) == 0 && errno == EAFNOSUPPORT) -- exit(1); -+ return 1; - else -- exit(0); -+ return 0; - } - ]])],[ AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6, 1, [Define to 1 if inet_ntop supports IPv6.]) - diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch deleted file mode 100644 index e1ce87df4e..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824 - -From: Robert Marko -Date: Thu, 24 Feb 2022 15:01:11 +0100 -Subject: conntrack: fix build with kernel 5.15 and musl - -Currently, with kernel 5.15 headers and musl building is failing with -redefinition errors due to a conflict between the kernel and musl headers. - -Musl is able to suppres the conflicting kernel header definitions if they -are included after the standard libc ones, however since ICMP definitions -were moved into a separate internal header to avoid duplication this has -stopped working and is breaking the builds. - -It seems that the issue is that which contains the UAPI -suppression defines is included in the internal.h header and not in the -proto.h which actually includes the kernel ICMP headers and thus UAPI -supression defines are not present. - -Solve this by moving the include before the ICMP kernel -includes in the proto.h - -Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") -Signed-off-by: Robert Marko -Signed-off-by: Florian Westphal ---- a/include/internal/internal.h -+++ b/include/internal/internal.h -@@ -14,7 +14,6 @@ - #include - #include - #include --#include - - #include - #include ---- a/include/internal/proto.h -+++ b/include/internal/proto.h -@@ -2,6 +2,7 @@ - #define _NFCT_PROTO_H_ - - #include -+#include - #include - #include - -cgit v1.2.3 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.1.1.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.1.1.ebuild index 292e0aef72..7bdd9249c6 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.1.1.ebuild @@ -1,32 +1,31 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools linux-info verify-sig +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +inherit flag-o-matic linux-info toolchain-funcs verify-sig DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table" HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/" -SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2 - verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )" +SRC_URI=" + https://www.netfilter.org/projects/${PN}/files/${P}.tar.xz + verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.xz.sig ) +" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -RDEPEND=">=net-libs/libmnl-1.0.3 - >=net-libs/libnfnetlink-1.0.0" +RDEPEND=" + >=net-libs/libmnl-1.0.3 + >=net-libs/libnfnetlink-1.0.0 +" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-netfilter )" - -DOCS=( README ) - -PATCHES=( - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${PN}-1.0.9-configure-clang16.patch -) +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-netfilter ) +" pkg_setup() { linux-info_pkg_setup @@ -45,11 +44,11 @@ pkg_setup() { check_extra_config } -src_prepare() { - default +src_configure() { + # https://gcc.gnu.org/PR103374 + tc-is-gcc && filter-flags '-ftrivial-auto-var-init=pattern' - # autoreconf only for clang 16 configure patch - eautoreconf + default } src_install() {