Merge pull request #2214 from flatcar/krnowak/rest-automation

Put rest of the packages in portage-stable under automation

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

@@ -479,13 +479,18 @@ media-libs/libpng
 
 net-analyzer/openbsd-netcat
 net-analyzer/netperf
+net-analyzer/tcpdump
 net-analyzer/traceroute
 
+net-dialup/lrzsz
+net-dialup/minicom
+
 net-dns/bind-tools
 net-dns/c-ares
 net-dns/dnsmasq
 net-dns/libidn2
 
+net-firewall/conntrack-tools
 net-firewall/ipset
 
 net-fs/cifs-utils
@@ -596,9 +601,7 @@ sys-block/parted
 sys-block/thin-provisioning-tools
 
 sys-boot/efibootmgr
-# Updating to 3.0.17 breaks building of sys-boot/shim.
-#
-# sys-boot/gnu-efi
+sys-boot/gnu-efi
 sys-boot/mokutil
 
 sys-devel/bc
@@ -673,14 +676,19 @@ sys-process/tini
 virtual/acl
 virtual/dev-manager
 virtual/editor
+virtual/krb5
 virtual/libc
 virtual/libcrypt
 virtual/libelf
+virtual/libiconv
+virtual/libintl
+virtual/libudev
 virtual/libusb
 virtual/man
 virtual/openssh
 virtual/os-headers
 virtual/package-manager
+virtual/pager
 virtual/perl-Carp
 virtual/perl-Data-Dumper
 virtual/perl-Encode
@@ -692,11 +700,16 @@ virtual/perl-Getopt-Long
 virtual/perl-IO
 virtual/perl-Unicode-Collate
 virtual/pkgconfig
+virtual/resolvconf
 virtual/rust
 virtual/service-manager
 virtual/ssh
 virtual/tmpfiles
+virtual/udev
 
 x11-base/xorg-proto
 
 x11-libs/pixman
+
+x11-misc/makedepend
+x11-misc/shared-mime-info

changelog/updates/2024-08-08-rest-automation.md

@@ -0,0 +1,3 @@
+- conntrack-tools ([1.4.8](https://lwn.net/Articles/945927/))
+- dev: minicom ([2.9](https://salsa.debian.org/minicom-team/minicom/-/releases/2.9))
+- tcpdump ([4.99.4](https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99.4/CHANGES))

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

@@ -83,7 +83,7 @@ dev-util/catalyst ~amd64 ~arm64
 =net-analyzer/netperf-2.7.0_p20210121 ~amd64 ~arm64
 
 # Keep versions on both arches in sync.
-=net-firewall/conntrack-tools-1.4.6-r1 ~arm64
+=net-firewall/conntrack-tools-1.4.8 ~arm64
 
 # Required for addressing CVE-2023-0361, CVE-2023-5981, CVE-2024-0567,
 # CVE-2024-0553, CVE-2024-28834 and CVE-2024-28835.

sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force

@@ -6,3 +6,7 @@ sys-apps/systemd sysv-utils vanilla
 
 # dbus without systemd conflicts with systemd
 sys-apps/dbus systemd
+
+# use systemd as udev implementation
+virtual/libudev systemd
+virtual/udev systemd

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/Manifest

@@ -1,2 +1,2 @@
-DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
-DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
+DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
+DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch

@@ -0,0 +1,22 @@
+https://github.com/the-tcpdump-group/tcpdump/pull/1068
+
+From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 27 Jul 2023 08:31:53 +0100
+Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE
+
+This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms.
+
+Bug: https://bugs.gentoo.org/911176
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
+ fi
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_LBL_C_INLINE
+-
++AC_SYS_LARGEFILE
+ AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
+
+ case "$host_os" in

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch

@@ -0,0 +1,22 @@
+https://github.com/the-tcpdump-group/tcpdump/pull/1068
+
+From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 27 Jul 2023 08:31:53 +0100
+Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE
+
+This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms.
+
+Bug: https://bugs.gentoo.org/911176
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
+ fi
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_C_INLINE
+-
++AC_SYS_LARGEFILE
+ AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
+
+ case "$host_os" in

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/metadata.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild → sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -13,13 +13,11 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
@@ -28,10 +26,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="+drop-root +smi +ssl +samba suid test"
 REQUIRED_USE="test? ( samba )"
-
 RESTRICT="!test? ( test )"
-# Assorted failures: bug #768498
-#RESTRICT="test"
 
 RDEPEND="
 	>=net-libs/libpcap-1.10.1
@@ -42,7 +37,7 @@ RDEPEND="
 	)
 	smi? ( net-libs/libsmi )
 	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
+		>=dev-libs/openssl-0.9.6m:=
 	)
 	suid? (
 		acct-group/pcap
@@ -63,6 +58,7 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
+	"${FILESDIR}"/${PN}-4.99.4-lfs.patch
 )
 
 src_prepare() {

sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -13,22 +13,20 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="+drop-root +smi +ssl +samba suid test"
 REQUIRED_USE="test? ( samba )"
-
-# Assorted failures: bug #768498
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libpcap-1.10.1
@@ -39,7 +37,7 @@ RDEPEND="
 	)
 	smi? ( net-libs/libsmi )
 	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
+		>=dev-libs/openssl-0.9.6m:=
 	)
 	suid? (
 		acct-group/pcap
@@ -60,6 +58,7 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-libdir.patch
+	"${FILESDIR}"/${PN}-9999-lfs.patch
 )
 
 src_prepare() {

sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/Manifest

@@ -1 +1,2 @@
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
+DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4

sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch

@@ -0,0 +1,27 @@
+https://src.fedoraproject.org/rpms/lrzsz/blob/c23247c9c7604aec31d49ed1b238622835f575e2/f/lrzsz-socklen.patch
+
+Use socklen_t as the length of the socket address (which is a bit of
+an anachronism, considering the rest of the sources).  The previous
+code des not work on 64-bit big-endian architectures.
+
+--- a/src/tcp.c
++++ b/src/tcp.c
+@@ -56,7 +56,7 @@ tcp_server (char *buf)
+ 	struct sockaddr_in s;
+ 	struct sockaddr_in t;
+ 	int on=1;
+-	size_t len;
++	socklen_t len;
+
+ 	if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+ 		error(1,errno,"socket");
+@@ -91,7 +91,7 @@ tcp_accept (int d)
+ {
+ 	int so;
+ 	struct  sockaddr_in s;
+-	size_t namelen;
++	socklen_t namelen;
+ 	int num=0;
+
+ 	namelen = sizeof(s);
+

sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch

@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/898970
+--- a/configure.in
++++ b/configure.in
+@@ -186,7 +186,8 @@ AC_CACHE_VAL(lrzsz_cv_sys_ftime_ok,
+ #include <sys/types.h>
+ #include <sys/timeb.h>
+ #include <stdio.h>
+-main ()
++#include <stdlib.h>
++int main (void)
+ {
+   struct timeb s, slast;
+   int c = 0;

sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch

@@ -0,0 +1,25 @@
+This package does not contain the m4 macros from gettext, so if gettext is not
+installed the macros are lost when running eautoreconf.
+
+Embed the required m4 files and add the directory to configure.ac.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,6 +5,7 @@
+ noinst_SCRIPTS=systype
+ PR=@PACKAGE@-@VERSION@
+ CLEAN_FILES=fastcheck.done
++AC_CONFIG_MACRO_DIR=-I m4
+
+ dist-hook:
+ 	mkdir $(distdir)/debian
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,7 @@
+ AC_INIT(src/crctab.c)
+ AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+ AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_MACRO_DIR([m4])
+
+
+ dnl AC_C_CROSS is in AC_PROG_CC since 2.12

sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch

@@ -0,0 +1,23 @@
+https://src.fedoraproject.org/rpms/lrzsz/blob/rawhide/f/lrzsz-0.12.20.patch
+https://bugs.gentoo.org/797247
+
+diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c
+--- lrzsz-0.12.20/src/zm.c	Tue Dec 29 09:48:38 1998
++++ lrzsz-0.12.20.new/src/zm.c	Tue Oct  8 12:46:58 2002
+@@ -431,10 +431,12 @@
+ 	VPRINTF(3,("zsdata: %lu %s", (unsigned long) length, 
+ 		Zendnames[(frameend-ZCRCE)&3]));
+ 	crc = 0;
+-	do {
+-		zsendline(*buf); crc = updcrc((0377 & *buf), crc);
+-		buf++;
+-	} while (--length>0);
++
++	for( ; length; length--) {
++	  zsendline(*buf); crc = updcrc((0377 & *buf), crc);
++	  buf++;
++	}
++
+ 	xsendline(ZDLE); xsendline(frameend);
+ 	crc = updcrc(frameend, crc);
+