[gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/, app-backup/bacula/

["Thomas Beierlein" <tomjbe@gentoo.org>]

commit:     a647e010c175db37a70b28802580935b0913dcd7
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 11:14:30 2024 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 11:14:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a647e010

app-backup/bacula: Drop reliance on 'which' command

Closes: https://bugs.gentoo.org/940692
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/bacula-15.0.2.ebuild          |  3 +++
 app-backup/bacula/files/bacula-drop-which.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app-backup/bacula/bacula-15.0.2.ebuild b/app-backup/bacula/bacula-15.0.2.ebuild
index d5c84855a449..5b3556d73298 100644
--- a/app-backup/bacula/bacula-15.0.2.ebuild
+++ b/app-backup/bacula/bacula-15.0.2.ebuild
@@ -184,6 +184,9 @@ src_prepare() {
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
 	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
 
+	# drop reliance on installed 'which' program (bug #940692)
+	eapply "${FILESDIR}"/${PN}-drop-which.patch
+
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
 	# It is only needed by autoconf and gives errors during elibtoolize.

diff --git a/app-backup/bacula/files/bacula-drop-which.patch b/app-backup/bacula/files/bacula-drop-which.patch
new file mode 100644
index 000000000000..0c34ddabbf61
--- /dev/null
+++ b/app-backup/bacula/files/bacula-drop-which.patch
@@ -0,0 +1,12 @@
+diff --git a/scripts/getgitcommit b/scripts/getgitcommit
+index 6897091..d82a7e5 100755
+--- a/scripts/getgitcommit
++++ b/scripts/getgitcommit
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-GIT=$(which git)
++GIT=$(command -v git)
+ if [ "x$GIT" != "x" ]
+ then
+    COMMIT=$(git log --pretty=format:%h -n 1 2>/dev/null)