Skip to content

Commit 9b63891

Browse files
krnowakkrnowak
authored
Merge pull request #1394 from flatcar/krnowak/net-libs-automation
Add net-libs packages under automation
2 parents 79ad746 + ed0ee13 commit 9b63891

33 files changed

+429
-932
lines changed

‎.github/workflows/portage-stable-packages-list

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,19 @@ net-firewall/ipset
356356
net-fs/cifs-utils
357357

358358
net-libs/gnutls
359+
net-libs/http-parser
359360
net-libs/libmicrohttpd
361+
net-libs/libmnl
362+
net-libs/libnetfilter_conntrack
363+
net-libs/libnetfilter_cthelper
364+
net-libs/libnetfilter_cttimeout
365+
net-libs/libnetfilter_queue
366+
net-libs/libnfnetlink
360367
net-libs/libnftnl
361368
net-libs/libnsl
362369
net-libs/libpcap
363370
net-libs/libslirp
371+
net-libs/libssh2
364372
net-libs/nghttp2
365373
net-libs/rpcsvc-proto
366374

‎changelog/updates/2023-11-15-net-libs-automation.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- libmnl ([1.0.5](https://git.netfilter.org/libmnl/log/?h=libmnl-1.0.5))
2+
- libnetfilter_conntrack ([1.0.9](https://git.netfilter.org/libnetfilter_conntrack/log/?h=libnetfilter_conntrack-1.0.9))
3+
- libnetfilter_cthelper ([1.0.1](https://git.netfilter.org/libnetfilter_cthelper/log/?id=8cee0347cc6969c39bb64000dfaa676a8f9e30f0))
4+
- libnetfilter_cttimeout ([1.0.1](https://git.netfilter.org/libnetfilter_cttimeout/log/?id=068d36d6291f53a0a609ab1f695aa06e94ce3d30))
5+
- libnfnetlink ([1.0.2](https://git.netfilter.org/libnfnetlink/log/?h=libnfnetlink-1.0.2))

‎sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
=net-libs/gnutls-3.8.0 ~arm64
6464

6565
# Keep versions on both arches in sync.
66-
=net-libs/libnetfilter_cthelper-1.0.0-r1 ~arm64
67-
=net-libs/libnetfilter_cttimeout-1.0.0-r1 ~arm64
66+
=net-libs/libnetfilter_cthelper-1.0.1-r1 ~arm64
67+
=net-libs/libnetfilter_cttimeout-1.0.1 ~arm64
6868

6969
# Required to allow us to override the sftp subsystem in sshd config.
7070
=net-misc/openssh-9.4_p1 ~amd64 ~arm64

‎sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r1.ebuild renamed to ‎sdk_container/src/third_party/portage-stable/net-libs/http-parser/http-parser-2.9.4-r2.ebuild

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

4-
EAPI=7
5-
inherit toolchain-funcs multilib-minimal
4+
EAPI=8
5+
6+
inherit toolchain-funcs
67

78
DESCRIPTION="HTTP request/response parser for C"
89
HOMEPAGE="https://github.com/nodejs/http-parser"
@@ -12,26 +13,26 @@ LICENSE="MIT"
1213
# 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
1314
# to set subslot in 2.9.3, we want to provoke another rebuild
1415
SLOT="0/2.9.4"
15-
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
16+
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
1617

1718
PATCHES=(
1819
"${FILESDIR}"/${P}-non-x86-test.patch
1920
)
2021

21-
src_prepare() {
22-
default
22+
src_configure() {
2323
tc-export CC AR
24-
multilib_copy_sources
2524
}
2625

27-
multilib_src_compile() {
26+
src_compile() {
2827
emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
2928
}
3029

31-
multilib_src_test() {
30+
src_test() {
3231
emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
3332
}
3433

35-
multilib_src_install() {
34+
src_install() {
3635
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
36+
37+
einstalldocs
3738
}

‎sdk_container/src/third_party/portage-stable/net-libs/libmnl/Manifest

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
1+
DIST libmnl-1.0.5.tar.bz2 314791 BLAKE2B 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6 SHA512 16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f
2+
DIST libmnl-1.0.5.tar.bz2.sig 566 BLAKE2B 4454f969cbc21f86c12905eb80dd7237f368bbb30e38202ef114edf77806091cda164870e825aca4305a925077d181662724412f8475866c7fbe2572b0b1da50 SHA512 bb75ae3b5520d8b9372d70da7c1a27fa3d8e50a26a05fe56397dead4d7d5ad4003e6e576becd1200a5c9ed42fe5a97273acc8c50f1fd3181688f0d0b8c607dfc

‎sdk_container/src/third_party/portage-stable/net-libs/libmnl/libmnl-1.0.4.ebuild

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎sdk_container/src/third_party/portage-stable/net-libs/libmnl/libmnl-1.0.5.ebuild

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright 1999-2023 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
7+
inherit verify-sig
8+
9+
DESCRIPTION="Minimalistic netlink library"
10+
HOMEPAGE="https://netfilter.org/projects/libmnl/"
11+
SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
12+
verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
13+
14+
LICENSE="LGPL-2.1"
15+
SLOT="0/0.2.0"
16+
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
17+
IUSE="examples"
18+
19+
DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
20+
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
21+
22+
src_install() {
23+
default
24+
25+
find "${ED}" -name '*.la' -delete || die
26+
27+
if use examples; then
28+
find examples/ -name 'Makefile*' -delete || die
29+
dodoc -r examples/
30+
docompress -x /usr/share/doc/${PF}/examples
31+
fi
32+
}

‎sdk_container/src/third_party/portage-stable/net-libs/libmnl/metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2+
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
33
<pkgmetadata>
44
<maintainer type="project">
55
<email>netmon@gentoo.org</email>

‎sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/Manifest

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

‎sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9-configure-clang16.patch

Lines changed: 16 additions & 0 deletions
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+

0 commit comments

Comments
 (0)