gentoo auto-resync : 21:10:2024 - 04:04:33

3 files changed, 17 insertions, 1 deletions

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index b9ad70b4c88a..0b0956f51acb 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -7,6 +7,7 @@ AUX bacula-11.0.2-fix-static.patch 3752 BLAKE2B c910fa044c79f0f50abf5ac86b9f3448
 AUX bacula-15.0.2-fix-static.patch 3830 BLAKE2B 79328ae40d94f88f8769e93f72cbd9cf1c66c332f28126260d46ae76f9271ca2535cbb8839a2f6c8430209e30cf8176a96e691ff80a7683d2a6d845d24a497f0 SHA512 a667f5ea4a86d8f2b0d77f44e08a98dc6e25c0ef257a3aa314f9971174ad7b2fd2d5e2ccc4baea607667b6637ae903be60d3dbe0eeca5fd0afbbaa90e2603dcb
 AUX bacula-15.0.2-fix_slibtool.patch 3868 BLAKE2B 34186137dbeb183118b573ebd574ff6463e5280363df3ce2898d7e4a9570b196eddcbf85312ce7a7969ff75e86b6dacc526eddad92b010863af58683959151c5 SHA512 9c041e4841a7ff789a97c88135a646d41cc0e6bc658eebee866888fe6781ea0eedc39acff100e703ec047a8212f60d03b398a1e845f2937bb1b3906f372ea5cf
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
+AUX bacula-drop-which.patch 298 BLAKE2B dcfc9231ec10940d87bddbf9b99d9a07076f70bd6429994c84a34004a90fca9b62d24a1f2538b525db3a26b74c48b4b44ac22145bb27e1f03497299a76ef93dd SHA512 405d6a85ecf38997bee9715fc7156adabb3ba9978829c3827421b6e4e9eadff9b9accb656ac682f1714be98b396daa00b29eb64c41a45cf99aed200aeceb3949
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
 AUX bacula-fix-sonames-new.patch 2090 BLAKE2B 1d181464b599fbb40b5d463b17b6364dc144bb82071e1a3454f30d6f60c8679f738b59dccbc01a73cc14f882997ca5dae438ba2d3d7d1ea20ac148e1da3e2e9c SHA512 c9f6ec30c15f22fc57bed05ed387f99102bc234d50de4762785ec17c4ef3a68d8f560c3878e5843dc3bf1b2680b41f9990dcc89a3c238760deeb5fd95ed5d50a
 AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
@@ -21,5 +22,5 @@ DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80
 DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2 SHA512 71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3
 EBUILD bacula-13.0.3-r2.ebuild 13179 BLAKE2B 3164969c3f2c5ba04a499c4282a15afaa6bf2afb82d309b5431b75dd1992fb500dd9fe859611e524d8271ba420091eef1468738c04d697ad6a40e2db0999f887 SHA512 e5e7f2671925994fb41e1ec430fc1ca76521ae6b8675f4ecb7383a5f191eaa3d42a7730d4e71daa41716eb07245530c5586108110b806e03e63772f5a04fc2a5
 EBUILD bacula-13.0.4.ebuild 13181 BLAKE2B 98d8ed281cf63236d00eb7524a03361b7aaa563ea6228ef2c5ad19a42b74d551f02c5323d09105759e336375a541e4583a3ae5b326a808bb9e68c8de8467fe36 SHA512 306744e6b7734564305100c4d0bf568a2043873e54f1b77b40a0e81977f9d88146fe0d3e68e0a78e4c93d279bc813f700698be77a087bd7165772ffe3e4b963c
-EBUILD bacula-15.0.2.ebuild 13194 BLAKE2B ffdd60fac23fcab88d2e223e031b3c1ea0f92a30bdea754e291a873eac949429c9f6bf7bb708ef1a7e2fc60b0dfa8a6b35da146c8de35cb161779b7aaa652846 SHA512 a279beeeb67d80058cb86fb0cd6edc6278ab55b9eb85f4e89f595d3690e639e5ebf5ac6504ed92c22506a6b710fe56ff36f98c97e327a235040c45650aad0154
+EBUILD bacula-15.0.2.ebuild 13300 BLAKE2B 1cb02cd837b3ed36a7b843f1a27ae89f4e244c883b7a8826fda0325b85409a6004dc220e6d107a2339efe057b21a2d73d8314ed0c4fec2b98c6000cc1aafff21 SHA512 6c6b098f9a5ae807a20b5d192ae829416c56d90c1f841ba99ee40ff7ffab4866476baeec5d7917a761a4f73e16e6dae86d65fb5799661931ceb9b47364fe5c7a
 MISC metadata.xml 747 BLAKE2B bae193fb0ae5e5e92b0b6e935691f19235a230b0a7e69083aeb344db0e451ca55f16c9f3c163eab390621ab266e0f7f7ee1e75eff69589b2de0c730d2cf0d965 SHA512 df7c2a1296cb7da96928de07347df04f741b8b91de72d39c002dda3e5c9564341a5bc73b60f68752a806175fd5709b35f1eb4ecf00e85e1237c4672c0b948557
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)