From e64bdc9d7e4bf82a134d0980c50415540353b5ec Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 4 Nov 2023 18:20:08 +0100 Subject: [PATCH 1/2] keyutils: Update version from 1.5.11 to 1.6.3 Update version and change download URL to kernel.org. The new version contans a pkgconfig file, which is required by, for example, bcachefs-tools. --- keyutils.be0 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/keyutils.be0 b/keyutils.be0 index 435647de5..6757c004a 100755 --- a/keyutils.be0 +++ b/keyutils.be0 @@ -1,16 +1,13 @@ #!/usr/bin/env beesh -# BEE_VERSION keyutils-1.5.11-2 +# BEE_VERSION keyutils-1.6.3-0 # path /sbin/request-key is harcoded into the kernel in security/keys/request_key.c # EPREFIX= -#SRCURL[0]="https://people.redhat.com/~dhowells/keyutils/keyutils-${PKGVERSION}.tar.bz2" -#ERROR: The certificate of ‘people.redhat.com’ is not trusted. -#ERROR: The certificate of ‘people.redhat.com’ doesn't have a known issuer. - -SRCURL[0]="https://beehive.molgen.mpg.de/bcc0984181572461850a37c39f8b167a/keyutils-1.5.11.tar.bz2" +#SRCURL[0]="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/6b70b2b381c1b6d9adfaf66d5d3e7c00/keyutils-1.6.3.tar.gz" # PATCHURL+=() From d16b58c15c82f94ad08f31643d00fa6808263a95 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 4 Nov 2023 18:28:59 +0100 Subject: [PATCH 2/2] keyutils: Install to /usr When we use EPREFIX=, libkeyutils.pc is created in /lib/pkgconfig instead of /usr/lib/pkgconfig where it is searched for. So return to the default EPREFIX (/usr). A link or symlink /sbin/request-key --> /usr/sbin/requestk-key needs to be installed when this package is updated. We don't do this from this package, because that would be obsolete when we do the usr-merge and the package would needed to be updated again. --- keyutils.be0 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyutils.be0 b/keyutils.be0 index 6757c004a..f5274173b 100755 --- a/keyutils.be0 +++ b/keyutils.be0 @@ -2,10 +2,6 @@ # BEE_VERSION keyutils-1.6.3-0 -# path /sbin/request-key is harcoded into the kernel in security/keys/request_key.c -# -EPREFIX= - #SRCURL[0]="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/6b70b2b381c1b6d9adfaf66d5d3e7c00/keyutils-1.6.3.tar.gz"