From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77D88158042 for ; Sun, 20 Oct 2024 11:15:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EAE3E0844; Sun, 20 Oct 2024 11:15:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 727CCE0844 for ; Sun, 20 Oct 2024 11:15:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F17433BEED for ; Sun, 20 Oct 2024 11:15:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 884AD1ACF for ; Sun, 20 Oct 2024 11:15:16 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1729422870.a647e010c175db37a70b28802580935b0913dcd7.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/files/, app-backup/bacula/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bacula/bacula-15.0.2.ebuild app-backup/bacula/files/bacula-drop-which.patch X-VCS-Directories: app-backup/bacula/files/ app-backup/bacula/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: a647e010c175db37a70b28802580935b0913dcd7 X-VCS-Branch: master Date: Sun, 20 Oct 2024 11:15:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5213227a-1df5-4539-973c-f2a1a7b6c5a5 X-Archives-Hash: 51e97bc990d4114ecca9d0a06f59d08e commit: a647e010c175db37a70b28802580935b0913dcd7 Author: Thomas Beierlein gentoo org> AuthorDate: Sun Oct 20 11:14:30 2024 +0000 Commit: Thomas Beierlein gentoo 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 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)