Skip to content

Commit d1a788e

Browse files
committed
net-libs/libnetfilter_conntrack: Sync with Gentoo
It's from Gentoo commit 78213a89b4a602460bf81ba5fab8eed561091ade.
1 parent cc37bfe commit d1a788e

File tree

5 files changed

+84
-49
lines changed

5 files changed

+84
-49
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
21
DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c
2+
DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
https://bugzilla.netfilter.org/show_bug.cgi?id=1654
2+
--- a/configure.ac
3+
+++ b/configure.ac
4+
@@ -55,9 +55,9 @@ int main()
5+
struct in6_addr addr6;
6+
char buf[128];
7+
if (inet_ntop(AF_INET6, &addr6, buf, 128) == 0 && errno == EAFNOSUPPORT)
8+
- exit(1);
9+
+ return 1;
10+
else
11+
- exit(0);
12+
+ return 0;
13+
}
14+
]])],[ AC_MSG_RESULT(yes)
15+
AC_DEFINE_UNQUOTED(HAVE_INET_NTOP_IPV6, 1, [Define to 1 if inet_ntop supports IPv6.])
16+

sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild

Lines changed: 0 additions & 43 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Copyright 1999-2023 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
inherit autotools linux-info verify-sig
7+
8+
DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
9+
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
10+
SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
11+
verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
12+
13+
LICENSE="GPL-2"
14+
SLOT="0"
15+
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
16+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
17+
18+
RDEPEND=">=net-libs/libmnl-1.0.3
19+
>=net-libs/libnfnetlink-1.0.0"
20+
DEPEND="${RDEPEND}"
21+
BDEPEND="virtual/pkgconfig
22+
verify-sig? ( sec-keys/openpgp-keys-netfilter )"
23+
24+
DOCS=( README )
25+
26+
PATCHES=(
27+
"${FILESDIR}"/${P}-musl.patch
28+
"${FILESDIR}"/${PN}-1.0.9-configure-clang16.patch
29+
)
30+
31+
pkg_setup() {
32+
linux-info_pkg_setup
33+
34+
if kernel_is lt 2 6 18 ; then
35+
die "${PN} requires at least 2.6.18 kernel version"
36+
fi
37+
38+
# netfilter core team has changed some option names with kernel 2.6.20
39+
if kernel_is lt 2 6 20 ; then
40+
CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
41+
else
42+
CONFIG_CHECK="~NF_CT_NETLINK"
43+
fi
44+
45+
check_extra_config
46+
}
47+
48+
src_prepare() {
49+
default
50+
51+
# autoreconf only for clang 16 configure patch
52+
eautoreconf
53+
}
54+
55+
src_install() {
56+
default
57+
58+
find "${ED}" -name '*.la' -delete || die
59+
}

sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.ebuild

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
# Copyright 1999-2022 Gentoo Authors
1+
# Copyright 1999-2023 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=8
55

6-
inherit linux-info
6+
inherit linux-info verify-sig
77

88
DESCRIPTION="Programming interface (API) to the in-kernel connection tracking state table"
99
HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_conntrack/"
10-
SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
10+
SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
11+
verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
1112

1213
LICENSE="GPL-2"
1314
SLOT="0"
14-
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
15+
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
16+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
1517

1618
RDEPEND=">=net-libs/libmnl-1.0.3
1719
>=net-libs/libnfnetlink-1.0.0"
1820
DEPEND="${RDEPEND}"
19-
BDEPEND="virtual/pkgconfig"
21+
BDEPEND="virtual/pkgconfig
22+
verify-sig? ( sec-keys/openpgp-keys-netfilter )"
2023

2124
DOCS=( README )
2225

0 commit comments

Comments
 (0)