From 9032ea998f6c9aa21d53afb5274b5af0e5c5e6d5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 25 May 2024 22:47:08 +0200 Subject: [PATCH 1/6] krb5: Updgrade version from 1.16.2 to 1.21.2 --- krb5.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krb5.be0 b/krb5.be0 index f38eced35..9541fe5eb 100755 --- a/krb5.be0 +++ b/krb5.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION krb5-1.16.2-0 +# BEE_VERSION krb5-1.21.2-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,7 +9,8 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://web.mit.edu/kerberos/dist/krb5/${PKGVERSION[2]}/krb5-${PKGVERSION}.tar.gz" +#SRCURL[0]="https://kerberos.org/dist/krb5/${PKGVERSION[2]}/krb5-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/97d5f3a48235c53f6d537c877290d2af/krb5-1.21.2.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 8a6f6dd5cddaf5a3d2b5bbb347d52d4c23ff121b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 27 May 2024 08:57:52 +0200 Subject: [PATCH 2/6] krb5: Disarm ksu --- krb5.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/krb5.be0 b/krb5.be0 index 9541fe5eb..fd3896d6b 100755 --- a/krb5.be0 +++ b/krb5.be0 @@ -58,9 +58,10 @@ mee_configure() { # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install + chmod a-s ${D}/usr/bin/ksu # we don't need this. +} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From dc669c8a762e8c3921f733723333430f3683a208 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 27 May 2024 10:31:23 +0200 Subject: [PATCH 3/6] libtirpc: Update version from 1.3.1 to 1.3.4 --- libtirpc.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libtirpc.be0 b/libtirpc.be0 index b8d0b42de..d246bec05 100755 --- a/libtirpc.be0 +++ b/libtirpc.be0 @@ -1,9 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION libtirpc-1.3.1-1 +# BEE_VERSION libtirpc-1.3.4-0 -# SRCURL[0]="https://sourceforge.net/projects/libtirpc/files/libtirpc/${PKGVERSION}/libtirpc-${PKGVERSION}.tar.bz2/download" -SRCURL[0]="https://beehive.molgen.mpg.de/f222e258c129c6da2f8f9cfe7f1ed745/libtirpc-1.3.1.tar.bz2" +#SRCURL[0]="https://downloads.sourceforge.net/libtirpc/libtirpc-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/375dbe7ceb2d0300d173fb40321b49b6/libtirpc-1.3.4.tar.bz2" # PATCHURL+=() From 67bdb369223c0d2da0a83f9573176e80c9ed5b5c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 25 May 2024 22:50:04 +0200 Subject: [PATCH 4/6] nfs-utils: Update version from 2.5.4 to 2.6.4 --- nfs-utils.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nfs-utils.be0 b/nfs-utils.be0 index e25d50edb..db55badcf 100755 --- a/nfs-utils.be0 +++ b/nfs-utils.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION nfs-utils-2.5.4-1 +# BEE_VERSION nfs-utils-2.6.4-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,13 +9,13 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://sourceforge.net/projects/nfs/files/nfs-utils/${PKGVERSION}/nfs-utils-${PKGVERSION}.tar.gz/download" +SRCURL[0]="https://www.kernel.org/pub/linux/utils/nfs-utils/${PKGVERSION}/nfs-utils-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL+=(/src/mariux/patches/nfs-utils-Add-sec-mariux.patch) +PATCHURL+=(/src/mariux/patches/nfs-utils-2.6.4-Add-sec-mariux.patch) ############################################################################### ## Uncomment the next statement, if the software may not be able to be built From f55c137da227991ea21a67e864e67c880d18cb45 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 27 May 2024 10:44:02 +0200 Subject: [PATCH 5/6] nfs-utils: Add configure option --with-systemd Add --with-systemd to configure to install the sytstemd unit files into /usr/lib/systemd/system/. --- nfs-utils.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/nfs-utils.be0 b/nfs-utils.be0 index db55badcf..e98b03acc 100755 --- a/nfs-utils.be0 +++ b/nfs-utils.be0 @@ -49,6 +49,7 @@ build_in_sourcedir mee_configure() { bee_configure \ + --with-systemd \ --enable-svcgss } From 94cc48b45b8568d1695c7b7fd931ba8514a2e2e2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 26 Jun 2024 09:47:30 +0200 Subject: [PATCH 6/6] nfs-utils: Add disable-sbin-override Avoid the warning [BEE] WARNING: system and image files named '/sbin' differ [BEE] image : directory [BEE] system: symbolic link to /usr/sbin using --disable-sbin-override Don't force nfsdcltrack and mount helpers into /sbin: always honour --sbindir --- nfs-utils.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/nfs-utils.be0 b/nfs-utils.be0 index e98b03acc..4a25cd370 100755 --- a/nfs-utils.be0 +++ b/nfs-utils.be0 @@ -49,6 +49,7 @@ build_in_sourcedir mee_configure() { bee_configure \ + --disable-sbin-override \ --with-systemd \ --enable-svcgss }