From 630b29d4d7023231bcc3fe87e1c66779185b39da Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 12:45:31 +0100 Subject: [PATCH 1/6] autofs: Remove patch already commented out --- autofs.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/autofs.be0 b/autofs.be0 index 240a1a4e3..e31f5d157 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -15,7 +15,6 @@ SRCURL[0]="https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-${PKGVERSIO ## 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/autofs-5.0.8-fix-task-manager-not-getting-signaled-without-changelog.patch") PATCHURL+=("/src/mariux/patches/autofs-5.0.8-reduce-syslog-noise.patch") PATCHURL+=("/src/mariux/patches/autofs-0001-Fix-usage-of-unitialized-pointer.patch") From 143cc49685a7c152e3b619b5b160aef5347d448c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 12:45:44 +0100 Subject: [PATCH 2/6] autofs: Update version from 5.1.3 to 5.1.7 --- autofs.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autofs.be0 b/autofs.be0 index e31f5d157..725706eac 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION autofs-5.1.3-4 +# BEE_VERSION autofs-5.1.7-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.) From f481ac38aa41759901a0a4a7ea1e6bf2b83d3ed4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 12:46:29 +0100 Subject: [PATCH 3/6] autofs: Remove obsolete "syslog noise" patch With version 5.1.7, the patch is no longer required, as the "remaining" messages are now logged with debug level. Remove obsolete patch. --- autofs.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/autofs.be0 b/autofs.be0 index 725706eac..0f7b08b32 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -15,7 +15,6 @@ SRCURL[0]="https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-${PKGVERSIO ## 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/autofs-5.0.8-reduce-syslog-noise.patch") PATCHURL+=("/src/mariux/patches/autofs-0001-Fix-usage-of-unitialized-pointer.patch") ############################################################################### From 8fdea03444cda7a5e954020247792a4b596bb67e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 12:51:55 +0100 Subject: [PATCH 4/6] autofs: Update patch for version 5.1.7 --- autofs.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autofs.be0 b/autofs.be0 index 0f7b08b32..6e4a501a3 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -15,7 +15,7 @@ SRCURL[0]="https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-${PKGVERSIO ## 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/autofs-0001-Fix-usage-of-unitialized-pointer.patch") +PATCHURL+=("/src/mariux/patches/autofs-5.1.7-Fix-usage-of-unitialized-pointer.patch") ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not From 5ab87b1035d3b3abdbea4384bab8100a850de9d5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 13:00:18 +0100 Subject: [PATCH 5/6] autofs: Remove obsolete post-install cleanup With the current version, the "make install" no longer installed the files, which we needed to clean up. So remove the mee_install() overwrite. --- autofs.be0 | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/autofs.be0 b/autofs.be0 index 6e4a501a3..da0773520 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -61,18 +61,9 @@ mee_build() { bee_build DEBUG=1 DONTSTRIP=1 } -mee_install() { - bee_install - cd $D - rm etc/auto.* - rm etc/autofs_ldap_auth.conf - rm etc/init.d/autofs - rmdir etc/init.d - rmdir run - mv etc/autofs.conf etc/autofs.conf.template - rm etc/sysconfig/autofs - rmdir etc/sysconfig -} +#mee_install() { +# bee_install "${@}" +#} ## by default this may be 'make install DESTDIR="${D}"' From 6a93b7b23dbb6c14c96515e4523386193b2850f9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 4 Mar 2021 13:04:44 +0100 Subject: [PATCH 6/6] autofs: Revert to no-debug build --- autofs.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autofs.be0 b/autofs.be0 index da0773520..7be5f1cf2 100755 --- a/autofs.be0 +++ b/autofs.be0 @@ -57,9 +57,9 @@ mee_configure() { bee_configure --enable-ignore-busy } -mee_build() { - bee_build DEBUG=1 DONTSTRIP=1 -} +#mee_build() { +# bee_build "${@}" +#} #mee_install() { # bee_install "${@}"