Merge pull request #822 from flatcar/sayan/weekly-update-04052023

Automate updates of system packages: sys-apps/*
flatcar · Jun 15, 2023 · 87d6a33 · 87d6a33
2 parents 9b26d33 + 7a91ee6
commit 87d6a33
Show file tree

Hide file tree

Showing 151 changed files with 6,941 additions and 1,581 deletions.
diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list
@@ -350,20 +350,46 @@ profiles
 
 sys-apps/acl
 sys-apps/attr
+sys-apps/coreutils
+sys-apps/debianutils
 sys-apps/diffutils
 sys-apps/dtc
+sys-apps/ethtool
 sys-apps/file
 sys-apps/findutils
 sys-apps/gawk
 sys-apps/gentoo-functions
 sys-apps/gptfdisk
+sys-apps/grep
+sys-apps/groff
 sys-apps/help2man
+sys-apps/hwdata
 sys-apps/i2c-tools
+sys-apps/iproute2
 sys-apps/iucode_tool
+sys-apps/kbd
+sys-apps/kexec-tools
+sys-apps/kmod
 sys-apps/less
+sys-apps/lshw
+sys-apps/makedev
+sys-apps/man-db
+sys-apps/man-pages
+sys-apps/man-pages-posix
+sys-apps/miscfiles
+sys-apps/net-tools
+sys-apps/nvme-cli
+sys-apps/pciutils
 sys-apps/portage
+sys-apps/pv
+sys-apps/sandbox
 sys-apps/sed
+sys-apps/semodule-utils
+sys-apps/smartmontools
 sys-apps/texinfo
+sys-apps/usbutils
+sys-apps/util-linux
+sys-apps/which
 
 sys-devel/autoconf
 sys-devel/autoconf-archive

diff --git a/changelog/updates/2023-05-04-package-updates-sys-apps.md b/changelog/updates/2023-05-04-package-updates-sys-apps.md
@@ -0,0 +1,17 @@
+- coreutils ([9.1](https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS?h=v9.1))
+- debianutils ([5.7](https://metadata.ftp-master.debian.org/changelogs//main/d/debianutils/debianutils_5.7-0.4_changelog))
+- ethtool ([6.2](https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS?h=v6.2))
+- grep ([3.8](http://savannah.gnu.org/forum/forum.php?forum_id=10227))
+- hwdata ([0.367](https://github.com/vcrhonek/hwdata/releases/tag/v0.367))
+- iproute ([6.2](https://lwn.net/Articles/923952/))
+- kbd ([2.5.1](https://github.com/legionus/kbd/releases/tag/v2.5.1))
+- kexec-tools ([2.0.24](https://github.com/horms/kexec-tools/releases/tag/v2.0.24))
+- kmod ([30](https://lwn.net/Articles/899526/))
+- nvme-cli ([2.3](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.3))
+- pciutils ([3.9.0](https://github.com/pciutils/pciutils/releases/tag/v3.9.0))
+- sed ([4.9](https://lists.gnu.org/archive/html/info-gnu/2022-11/msg00001.html))
+- smartmontools ([7.3](https://github.com/smartmontools/smartmontools/releases/tag/RELEASE_7_3))
+- usbutils ([015](https://github.com/gregkh/usbutils/blob/79b796f945ea7d5c2b0e2a74f9b8819cb7948680/NEWS))
+- util-linux ([2.38.1](https://github.com/util-linux/util-linux/releases/tag/v2.38.1))
+- SDK: man-db ([2.11.2](https://gitlab.com/man-db/man-db/-/tags/2.11.2))
+- SDK: man-pages ([6.03](https://lore.kernel.org/lkml/[email protected]/T/))
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
@@ -25,7 +25,7 @@
 =sys-apps/checkpolicy-3.1 ~arm64
 
 =sys-apps/policycoreutils-3.1-r3 ~arm64
-=sys-apps/kexec-tools-2.0.22 ~arm64
+=sys-apps/kexec-tools-2.0.24 ~arm64
 
 =sys-apps/semodule-utils-3.1 ~arm64
 

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -29,9 +29,6 @@
 # To keep the same version on both arches
 =sys-fs/multipath-tools-0.9.4-r1 ~amd64
 
-# Keep iproute in sync with kernel version.
-=sys-apps/iproute2-5.15.0 ~amd64 ~arm64
-
 # FIPS support is still being tested
 =sys-fs/cryptsetup-2.4.3-r1 ~amd64 ~arm64
 
@@ -48,3 +45,4 @@
 =sys-libs/liburing-2.1-r2 ~amd64 ~arm64
 
 =app-crypt/adcli-0.9.2 ~amd64 ~arm64
+=sys-apps/nvme-cli-2.4-r2 ~amd64 ~arm64
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest
@@ -1,3 +1,9 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
+DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
+DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
+DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
+DIST coreutils-9.2.tar.xz 5773008 BLAKE2B 026e01718d79dd95bf645088d395584cbd422bb318f414a6ad325aea5deeec7aecb63217c1ce8231e81dd3b6fee1c85c60616c57ef8e2e1d0b9d764fa5a68908 SHA512 7e3108fefba4ef995cc73c64ac5f4e09827a44649a97ddd624eb61d67ce82da5ed6dc8c0f79d3e269f5cdb7d43877a61ef5b93194dd905bec432a7e31f9f479c
+DIST coreutils-9.2.tar.xz.sig 833 BLAKE2B 225f6ea9d6c2a2b0e47093b6c10d648b8d847daf0733eeb779eb01cffde47f67b3328bdfb214298d669689f5de76f3c64384a6471dfc4ccc3a238bfc1943e654 SHA512 4219f3103d829841a11bf1fe42ae277a44347e555fbbaf48e5e87cce48deb96753cb6d25f2571b88685a164acb9f016ff7ea02346b799ce954599fa0124ef070
+DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
+DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	)
 "
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"

diff --git a/...ys-apps/coreutils/coreutils-9.0-r1.ebuild → ...ys-apps/coreutils/coreutils-9.1-r2.ebuild b/...ys-apps/coreutils/coreutils-9.0-r1.ebuild → ...ys-apps/coreutils/coreutils-9.1-r2.ebuild
@@ -1,30 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintianers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
 
-inherit flag-o-matic python-any-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{9..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-PATCH="${PN}-8.30-patches-01"
+MY_PATCH="${PN}-9.0_p20220409-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	!vanilla? (
-		mirror://gentoo/${PATCH}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-	)"
 
-LICENSE="GPL-3"
+if [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).193-54bec"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
 	caps? ( sys-libs/libcap )
 	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
 	xattr? ( sys-apps/attr[static-libs] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
 	selinux? ( sys-libs/libselinux )
@@ -42,6 +57,7 @@ BDEPEND="
 		dev-util/strace
 		${PYTHON_DEPS}
 	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
 "
 RDEPEND+="
 	hostname? ( !sys-apps/net-tools[hostname] )
@@ -58,61 +74,29 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
-pkg_pretend() {
-	if has_version "<sys-fs/zfs-9999" ; then
-		einfo "Checking for running ZFS module version"
-
-		local kmodv minver
-		kmodv="$(grep kmod <(zfs -V 2>/dev/null))"
-		# Convert zfs-kmod-2.1.1-r3-gentoo -> 2.1.1-r3
-		kmodv="${kmodv//zfs-kmod-}"
-		kmodv="${kmodv%%-gentoo}"
-
-		minver="$(ver_cut 2 ${kmodv})"
-		local diemsg=$(cat <<-EOF
-			Attempted installation of ${P} on unsupported version of zfs-kmod!
-			Please reboot to a newer version of zfs-kmod first:
-			zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3
-			Using ${P} with running version of zfs-kmod of can
-			lead to data loss while using cp command on some configurations.
-			See https://github.com/openzfs/zfs/issues/11900 for details.
-		EOF
-		)
-
-		case "${minver}" in
-			# 2.0.x
-			0)
-				ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}"
-				;;
-			# 2.1.x
-			1)
-				ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}"
-				;;
-			# 0.8.x/9999
-			*)
-				# We can't really cover this case realistically
-				# 9999 is too hard to check and 0.8.x isn't being supported anymore.
-				;;
-		esac
-	fi
-
-}
-
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
 	fi
 }
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_prepare() {
 	local PATCHES=(
 		# Upstream patches
-		"${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
+		"${FILESDIR}"/${P}-fix-rename-simple-backups.patch
 	)
 
 	if ! use vanilla ; then
 		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
 	fi
 
 	default
@@ -150,6 +134,7 @@ src_configure() {
 		$(use_enable multicall single-binary)
 		$(use_enable xattr)
 		$(use_with gmp libgmp)
+		$(use_with openssl)
 	)
 
 	if use gmp ; then
@@ -216,8 +201,7 @@ src_test() {
 	addwrite /dev/full
 	#export RUN_EXPENSIVE_TESTS="yes"
 	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
+	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
 }
 
 src_install() {