diff --git a/changelog/updates/2024-02-23-keyutils.md b/changelog/updates/2024-02-23-keyutils.md new file mode 100644 index 0000000000..870ede4bf6 --- /dev/null +++ b/changelog/updates/2024-02-23-keyutils.md @@ -0,0 +1 @@ +- keyutils ([1.6.3](https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=cb3bb194cca88211cbfcdde2f10c0f43c3fb8ec3) (includes [1.6.2](https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=454f80f537e5d1aad506599b6776e4cc1cf5f0f2))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest index 2d430658d3..a4690bb301 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/Manifest @@ -1 +1 @@ -DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2 +DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch deleted file mode 100644 index e783ec699c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 16 Nov 2018 12:37:29 +0100 -Subject: [PATCH] fix regexp match against `file /proc/$$/exe` for -fPIE bash - -Now that bash is built with PIE enabled, keyutils' check for endianness -fails because file no longer returns "executable", but instead returns -"shared object" for file << 5.33 and "pie executable" for file >= 5.33. ---- - tests/toolbox.inc.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh -index 0ce6db0..712c5bd 100644 ---- a/tests/toolbox.inc.sh -+++ b/tests/toolbox.inc.sh -@@ -13,10 +13,10 @@ - echo === $OUTPUTFILE === - - endian=`file -L /proc/$$/exe` --if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null -+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null - then - endian=BE --elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null -+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null - then - endian=LE - else --- -2.19.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch deleted file mode 100644 index f68d7d111a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Hide - -> grep: /etc/rpm: No such file or directory -> grep: /usr/lib/rpm: No such file or directory - -errors. - -Bug: https://bugs.gentoo.org/656446 - ---- keyutils-1.6.1/Makefile -+++ keyutils-1.6.1/Makefile -@@ -267,7 +267,7 @@ - ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) - - BUILDID := .local --dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm)) -+dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null)) - release3:= $(word 2,$(shell grep ^Release: $(SPECFILE))) - release2:= $(subst %{?dist},$(dist),$(release3)) - release1:= $(subst %{?buildid},$(BUILDID),$(release2)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch new file mode 100644 index 0000000000..3fb659712a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/760633 + +From 41077f8901b642d36b63f94b0fc62377a07fc0b2 Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Tue, 4 Jan 2022 03:51:10 +0200 +Subject: [PATCH] Makefile: only run rpmspec if it exists + +keyutils is built on many distros which do not use rpm like +Gentoo, ChromeOS or Arch. Older versions of bash silently +ignored the fact that rpmspec was missing, but newer bash +like v5.1 issue a new error: + +/bin/sh: line 1: rpmspec: command not found + +This happens every time the Makefile is parsed, including +for a simple "make" invocation or "make install" even if +a rpm package is not desired. + +Arch Linux simply ignores this new error but Gentoo and +ChromeOS fail because portage actively monitors the build +log for errors like this. See bug report [1]. + +Fix this by calling rpmspec only if it exists. + +[1] https://bugs.gentoo.org/760633 + +Signed-off-by: Adrian Ratiu +--- a/Makefile ++++ b/Makefile +@@ -285,7 +285,7 @@ SRCBALL := rpmbuild/SOURCES/$(TARBALL) + ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) + + BUILDID := .local +-rpmver0 := $(shell rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)") ++rpmver0 := $(shell if which rpmspec >/dev/null 2>&1; then rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)"; fi) + rpmver1 := $(word 1,$(rpmver0)) + rpmver2 := $(subst ., ,$(rpmver1)) + rpmver3 := $(lastword $(rpmver2)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.3.ebuild similarity index 87% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.3.ebuild index 7fd949a2f9..e9c4abb077 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/keyutils-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s LICENSE="GPL-2 LGPL-2.1" SLOT="0/1.9" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="static static-libs test" RESTRICT="!test? ( test )" @@ -20,11 +20,10 @@ RDEPEND="" DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" PATCHES=( - "${FILESDIR}"/${PN}-1.6-endian-check-1.patch "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch - "${FILESDIR}"/${PN}-1.6.1-silence-rpm-check.patch #656446 "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch + "${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch ) MAKEOPTS+=" ETCDIR=/usr/share/keyutils" @@ -65,11 +64,6 @@ src_prepare() { # The lsb check is useless, so avoid spurious command not found messages. sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die - # All the test files are bash, but try to execute via `sh`. - sed -i -r \ - -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \ - tests/{Makefile*,*.sh} || die - find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die # Some tests call the kernel which calls userspace, but that will # run the install keyutils rather than the locally compiled one, # so disable round trip tests. @@ -79,7 +73,7 @@ src_prepare() { } multilib_src_compile() { - tc-export AR CC + tc-export AR CC CXX sed -i \ -e "1iRPATH = $(usex static -static '')" \ -e '/^C.*FLAGS/s|:=|+=|' \ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/metadata.xml index 0b1a8dcd2f..f16b3424c6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/keyutils/metadata.xml @@ -8,6 +8,9 @@ base-system@gentoo.org Gentoo Base System + + cpe:/a:keyutils_project:keyutils + Reflect ABI compatibility for libkeyutils.so.