mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 15:41:04 +02:00
sys-apps/keyutils: Drop duplicated package
We already have sys-apps/keyutils in overlay. Possibly it would need an update or maybe a rework to move it back to portage-stable.
This commit is contained in:
Krzesimir Nowak
parent
07f5c3fa69
commit
033fddbd0c
@ -1 +0,0 @@
|
||||
DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
|
||||
@ -1,51 +0,0 @@
|
||||
disable tests that mess with system wide settings
|
||||
|
||||
https://bugs.gentoo.org/519062
|
||||
|
||||
--- keyutils-1.5.10/tests/bugzillas/bz1031154/runtest.sh
|
||||
+++ keyutils-1.5.10/tests/bugzillas/bz1031154/runtest.sh
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
echo "++++ BEGINNING TEST" >$OUTPUTFILE
|
||||
|
||||
+if false ; then
|
||||
+
|
||||
# we need a reference time to scan the audit log from so as not to pick up old
|
||||
# results from this test.
|
||||
base_date=`date +"%x@%X"`
|
||||
@@ -97,6 +99,10 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+else
|
||||
+marker "Gentoo: skipping test due to system wide modifications"
|
||||
+fi
|
||||
+
|
||||
echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
|
||||
|
||||
# --- then report the results in the database ---
|
||||
|
||||
https://bugs.gentoo.org/522050
|
||||
|
||||
--- keyutils-1.5.10/tests/keyctl/padd/useradd/runtest.sh
|
||||
+++ keyutils-1.5.10/tests/keyctl/padd/useradd/runtest.sh
|
||||
@@ -40,6 +40,8 @@
|
||||
marker "UNLINK KEY"
|
||||
unlink_key $keyid @s
|
||||
|
||||
+if false ; then
|
||||
+
|
||||
if [ $skip_root_required = 0 ] && {
|
||||
[ $OSDIST = RHEL ] && ! version_less_than $OSRELEASE 6.6 ||
|
||||
keyutils_at_or_later_than 1.5.6 ;
|
||||
@@ -85,6 +87,10 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+else
|
||||
+marker "Gentoo: skipping test due to system wide modifications"
|
||||
+fi
|
||||
+
|
||||
echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
|
||||
|
||||
# --- then report the results in the database ---
|
||||
@ -1,43 +0,0 @@
|
||||
sent upstream
|
||||
|
||||
From 1f15000ad21c301a51f7746eb561659348060f45 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@chromium.org>
|
||||
Date: Wed, 25 Jan 2017 14:06:55 -1000
|
||||
Subject: [PATCH keyutils] add extern C markings to header file for C++ users
|
||||
|
||||
If people try to use keyutils from C++ code, the header doesn't work
|
||||
properly because the compiler mangles the keyutils symbols. Add the
|
||||
right extern markings so it works out of the box.
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
keyutils.h | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/keyutils.h b/keyutils.h
|
||||
index a69fa7aaa11d..d50d19d3e929 100644
|
||||
--- a/keyutils.h
|
||||
+++ b/keyutils.h
|
||||
@@ -15,6 +15,10 @@
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
extern const char keyutils_version_string[];
|
||||
extern const char keyutils_build_string[];
|
||||
|
||||
@@ -180,4 +184,8 @@ extern int recursive_session_key_scan(recursive_key_scanner_t func, void *data);
|
||||
extern key_serial_t find_key_by_type_and_desc(const char *type, const char *desc,
|
||||
key_serial_t destringid);
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif /* KEYUTILS_H */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From d1a02ed81c86fe7140f93b9a160fbb53be148446 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Fri, 16 Nov 2018 12:39:12 +0100
|
||||
Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 33a451e..845b8fe 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
|
||||
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
|
||||
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
|
||||
mkdir -p $(DESTDIR)$(USRLIBDIR)
|
||||
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
sed \
|
||||
-e 's,@VERSION\@,$(VERSION),g' \
|
||||
-e 's,@prefix\@,$(PREFIX),g' \
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
https://bugs.gentoo.org/760633
|
||||
|
||||
From 41077f8901b642d36b63f94b0fc62377a07fc0b2 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Ratiu <adrian.ratiu@collabora.com>
|
||||
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 <adrian.ratiu@collabora.com>
|
||||
--- 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))
|
||||
@ -1,76 +0,0 @@
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=c076dff259e99d84d3822b4d2ad7f3f66532f411
|
||||
|
||||
From c076dff259e99d84d3822b4d2ad7f3f66532f411 Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Reichl <preichl@redhat.com>
|
||||
Date: Tue, 20 Dec 2022 14:13:29 +0100
|
||||
Subject: test: Fix test expectation based on kernel config
|
||||
|
||||
Some test results are dependent on the kernel configuration option
|
||||
CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE.
|
||||
|
||||
Check the kernel configuration file for its presence and expect appropriate
|
||||
test results.
|
||||
|
||||
Function has_kernel_config is based on its xfstsests counterpart.
|
||||
|
||||
Signed-off-by: Pavel Reichl <preichl@redhat.com>
|
||||
Signed-off-by: David Howells <dhowells@redhat.com>
|
||||
--- a/tests/features/builtin_trusted/runtest.sh
|
||||
+++ b/tests/features/builtin_trusted/runtest.sh
|
||||
@@ -33,7 +33,11 @@ expect_error EACCES
|
||||
create_key --fail user a a $stk
|
||||
expect_error EOPNOTSUPP
|
||||
create_key --fail user a a $blk
|
||||
-expect_error EACCES
|
||||
+if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then
|
||||
+ expect_error EOPNOTSUPP
|
||||
+else
|
||||
+ expect_error EACCES
|
||||
+fi
|
||||
|
||||
# Try adding a key to the keyrings
|
||||
marker "TRY ADDING ASYMMETRIC KEYS"
|
||||
@@ -89,7 +93,11 @@ expect_error EACCES
|
||||
create_key --fail -x asymmetric "" "$x509" $stk
|
||||
expect_error ENOKEY
|
||||
create_key --fail -x asymmetric "" "$x509" $blk
|
||||
-expect_error EACCES
|
||||
+if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then
|
||||
+ expect_error EOPNOTSUPP
|
||||
+else
|
||||
+ expect_error EACCES
|
||||
+fi
|
||||
|
||||
echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
|
||||
|
||||
--- a/tests/prepare.inc.sh
|
||||
+++ b/tests/prepare.inc.sh
|
||||
@@ -4,6 +4,26 @@
|
||||
includes=${BASH_SOURCE[0]}
|
||||
includes=${includes%/*}/
|
||||
|
||||
+# Check if currently running kernel has option set
|
||||
+function has_kernel_config()
|
||||
+{
|
||||
+ local option=$1
|
||||
+ local uname=$(uname -r)
|
||||
+ local config_list="$KCONFIG_PATH
|
||||
+ /lib/modules/$uname/build/.config
|
||||
+ /boot/config-$uname
|
||||
+ /lib/kernel/config-$uname"
|
||||
+
|
||||
+ for config in $config_list; do
|
||||
+ [ ! -f $config ] && continue
|
||||
+ grep -qE "^${option}=[my]" $config
|
||||
+ return
|
||||
+ done
|
||||
+
|
||||
+ echo "Failed to find kernel configuration file"
|
||||
+ return false
|
||||
+}
|
||||
+
|
||||
# --- need to run in own session keyring
|
||||
watch_fd=0
|
||||
if [ "$1" != "--inside-test-session" ]
|
||||
--
|
||||
cgit 1.2.3-korg
|
||||
@ -1,116 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs linux-info multilib-minimal
|
||||
|
||||
DESCRIPTION="Linux Key Management Utilities"
|
||||
HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git"
|
||||
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0/1.9"
|
||||
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 )"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
|
||||
"${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
|
||||
"${FILESDIR}"/${P}-tests.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# To prevent a failure in test phase and false positive bug reports
|
||||
# we are enforcing the following options because testsuite expects
|
||||
# that these options are available. I.e. testsuite only decides based
|
||||
# on kernel version which tests will be called, no feature checking.
|
||||
if use test ; then
|
||||
CONFIG_CHECK="KEYS"
|
||||
ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
|
||||
|
||||
if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
|
||||
ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
|
||||
fi
|
||||
|
||||
if kernel_is -ge 4 7 ; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
|
||||
ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
|
||||
fi
|
||||
else
|
||||
CONFIG_CHECK="~KEYS"
|
||||
ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
|
||||
|
||||
if kernel_is -ge 4 7 ; then
|
||||
CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
|
||||
ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
|
||||
fi
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# The lsb check is useless, so avoid spurious command not found messages.
|
||||
sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || 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.
|
||||
rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
tc-export AR CC CXX
|
||||
sed -i \
|
||||
-e "1iRPATH = $(usex static -static '')" \
|
||||
-e '/^C.*FLAGS/s|:=|+=|' \
|
||||
-e 's:-Werror::' \
|
||||
-e '/^BUILDFOR/s:=.*:=:' \
|
||||
-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
|
||||
-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
|
||||
-e "s: /: ${EPREFIX}/:g" \
|
||||
-e '/^NO_ARLIB/d' \
|
||||
Makefile || die
|
||||
|
||||
# We need the static lib in order to statically link programs.
|
||||
if use static ; then
|
||||
export NO_ARLIB=0
|
||||
# Hack the progs to depend on the static lib instead.
|
||||
sed -i \
|
||||
-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
|
||||
Makefile || die
|
||||
else
|
||||
export NO_ARLIB=$(usex static-libs 0 1)
|
||||
fi
|
||||
emake
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# Execute the locally compiled code rather than the
|
||||
# older versions already installed in the system.
|
||||
LD_LIBRARY_PATH=${BUILD_DIR} \
|
||||
PATH="${BUILD_DIR}:${PATH}" \
|
||||
emake test
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
# Possibly undo the setting for USE=static (see src_compile).
|
||||
export NO_ARLIB=$(usex static-libs 0 1)
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc README
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>robbat2@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:keyutils_project:keyutils</remote-id>
|
||||
</upstream>
|
||||
<slots>
|
||||
<subslots>Reflect ABI compatibility for libkeyutils.so.</subslots>
|
||||
</slots>
|
||||
</pkgmetadata>
|
||||
Loading…
x
Reference in New Issue
Block a user