gentoo auto-resync : 15:11:2023 - 16:36:08

6 files changed, 74 insertions, 3 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ca8ff71fa718..4acf606ff41e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 89b76d3e0541..aa5fdbc64ef2 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -9,6 +9,7 @@ AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27
 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
+AUX fix_slibtool.patch 3842 BLAKE2B 7ff68035ebe84ecb3dae562214be5ede22e86e868ed13d8c319a4bb2f9c366adcd47424d36d774c1e1d35de10a2991bca27a94badeef839be24e19aee53db5f0 SHA512 13855ede7f74ceea838bf5faa7635d331a7ecaa4f79ff15087bdf522c8527bdeac43ac1d273d0d86ed89dad1ed82164f73e4c0c7cc8adeea06b787dc6507e3c9
 AUX fix_tray_monitor.patch 432 BLAKE2B a4c011e439978c9d767ac3aa82cc7c110ec1f93fd74c9cb1cfe60dd29860b1c4268e934b34da46d319982765cf420438eef6332c0cc3f8e0ff3ec691251480f7 SHA512 afb95521926f498aa38b3fbe389ed8fd2cc0d3a4878b6f562becd8b9adc15b7db2ddbf195336aa913a82315b41229110a235cfe5ad038cb129332f59e6538804
 AUX newscripts/bacula-dir.initd 391 BLAKE2B 80cc13d6f946e5faad95774b3cc3f4575c28b826af618bb241a4acfafb01bace37e24dae4e90cabeeb2d0ac32a224ec27a69c6e4ae2502cb34113bd32df5208f SHA512 8364fe26ef042f03ac2e3868e577e28a8b9bc1de0e53391140696d91c5df78df456292ee359e12ddf371452305e1aaffaa391b1cb3482c6c8e17154259b3cc35
 AUX newscripts/bacula-fd.initd 324 BLAKE2B cfc134247570538fed3aa1a96e51a45704cd747bda65e5bcdc6461bbcea27634909675a9c46eb3f00607c5ac8afdb481ca8ce1cd80e006bf00b59e78db58c750 SHA512 9c998c0deafe2882edbbd2ddd7e9bdc0f6cae3752a0e0f875d2350cf8eda20fb5bdb6781d1a57303cf4ebf8e719bdd7396fb0fed81726d752d035c82f26cc5cf
@@ -21,5 +22,5 @@ EBUILD bacula-11.0.6-r5.ebuild 12403 BLAKE2B 7c57abed3f2c581d9d0fd5158644096f095
 EBUILD bacula-11.0.6-r6.ebuild 12516 BLAKE2B b66af558175a9d985a28806df4e2cdc4425e4cb27a2ea4b818e7c624064ccd6f3279a94958df5e39f469987e7bd626bd3173935d53359aae98d79d3f86a5ce03 SHA512 32261ea7a73e5825770441cf7451781dab4f7641b7a8d47d6f9f90ea673f32b6a957516c70e1d62a4bb99f0cd23ce267c65b52389e01165149e32b71d0c5b2fa
 EBUILD bacula-13.0.2-r2.ebuild 12409 BLAKE2B e7908c30254dbb8b6f978a6a667ba5998169c7c26c6b70b59cbc279761e53bfefd6b290e513c0b21a6cf9f6fe081d3d7b4254f921158176bf57902978f8a367f SHA512 42d54f0eddae231319de7b62d1257dde2d154b3fe9117115f6863e3000635d92e8f45d69a8c73adafe8ce09f17385d452b9ed8ed435fa7c8b52c1516f8532aa6
 EBUILD bacula-13.0.3-r1.ebuild 12457 BLAKE2B da85f64e6f386cd93240336fede27599b3511ced789d848b32e511e26aecc5068e6755de9e4c34f3de24069228b5de4a19c1b7ea2bc58e4cbc20a1fbdc3468f2 SHA512 d28586b5cd9cbdd5a83a5087b198449eb40049073427ddd2ac62a5c3d8e15215add7f0281173302ec4665103d39e70708e06d7c889cbbe39f47e890e6951f94f
-EBUILD bacula-13.0.3-r2.ebuild 12859 BLAKE2B 9e9e82b9df345a14ea614faef3a6155f6a9f5f60257a6992ec3ea57643dfb9c721f076e97032ce41b3789d64ac188515622bc4f2dd77d10de0d7aad736886d9f SHA512 c09df86339b7cc66e7bc8ac599d2af8712845d44789a2a5e94216de5e33e199544e387f6b9f343ce46c2aefd5fef81972e137a166396d10f7a69283961b7af94
+EBUILD bacula-13.0.3-r2.ebuild 12969 BLAKE2B d31d2773665e3e6b5c637fb873f459302c9e5297b823979078bf760c0ffb199a6882fc59c8393367127c556af60bc8e97e49f8dc3754e55ca0bd9e50d9784d52 SHA512 5ebf1286fb11b929a740108cc7f0d27766158d7349eeb4bdb363d1864839875b923a83bd5514fe60a07c59e768d77b25e3a65aaf761f22b8c3a83a0aa157c9c8
 MISC metadata.xml 747 BLAKE2B bae193fb0ae5e5e92b0b6e935691f19235a230b0a7e69083aeb344db0e451ca55f16c9f3c163eab390621ab266e0f7f7ee1e75eff69589b2de0c730d2cf0d965 SHA512 df7c2a1296cb7da96928de07347df04f741b8b91de72d39c002dda3e5c9564341a5bc73b60f68752a806175fd5709b35f1eb4ecf00e85e1237c4672c0b948557
diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild
index 215b36e4ef79..024d64df49ea 100644
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@@ -134,6 +134,9 @@ src_prepare() {
 	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
 	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
 
+	# correct library search path for slibtool usage (bug #914389)
+	eapply -p0 "${FILESDIR}/fix_slibtool.patch"
+
 	# do not strip binaries
 	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
 	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
diff --git a/app-backup/bacula/files/fix_slibtool.patch b/app-backup/bacula/files/fix_slibtool.patch
new file mode 100644
index 000000000000..e38448faa30c
--- /dev/null
+++ b/app-backup/bacula/files/fix_slibtool.patch
@@ -0,0 +1,67 @@
+# slibtool creates library in .libs directory but need -L. to find them
+# Bug #914389
+--- src/stored/Makefile.in.orig	2023-11-15 14:20:23.135630968 +0100
++++ src/stored/Makefile.in	2023-11-15 14:22:35.771246680 +0100
+@@ -267,7 +267,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \
+ 	  $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ 
+@@ -277,7 +277,7 @@
+            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcloud.o: bcloud.c
+@@ -286,7 +286,7 @@
+            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
+ 
+ bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
+ 
+ bls.o:	bls.c
+@@ -296,7 +296,7 @@
+ 
+ bls:	Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bextract.o: bextract.c
+@@ -306,7 +306,7 @@
+ 
+ bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bscan.o: bscan.c
+@@ -316,7 +316,7 @@
+ 
+ bscan:	Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+ 	   $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcopy.o: bcopy.c
+@@ -325,7 +325,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ bcopy:	Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ cloud_parts_test: Makefile cloud_parts.c
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
index c868511577f7..b6443c55214a 100644
--- a/app-backup/sarab/Manifest
+++ b/app-backup/sarab/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0.0-better-defaults-gentoo.patch 809 BLAKE2B 4c06df38ee68c612ebf671334d99c30d21bcea5bc16ad1b1e9c38e2824e503a12aa189f2aae254c991bf71de96244374ee1ef7ed180454905bba316705ed7676 SHA512 733484580782296c344d9c2ec69d4948359fef9c7513d9d481756c9f80fb4a369919dbbae01489dfba4b560d6c8077c755a31fcc74ba01f99148f3f63824fcee
 AUX README.gentoo 443 BLAKE2B 6a7eada85c0ae10ee4e186e3c8895e206dbccca941d5ae7b650907af450ba510adfabac76cc72b64d18fbaf3db5f9fa9f3c557f4890624f46fc6b5ab92699db2 SHA512 8eba4144634e324bf59adbcbf0dac44c7ed4ae5a89dde7f201da47dca55969d59040f0cf3ba9d632f22a92f7e3aa1d44c0d0be2061bd3facb9d3057267ebf7ae
 DIST sarab-1.0.0.tar.gz 24738 BLAKE2B b89a19f3b68345a4c0b7c70fe41d6a50fe99358167da797faa223549b70d7433a4d478b11f1de794e778f8e0537bca335333789176e14d3273d69a4071aa2a5c SHA512 246abd1893127a8aaf73537b9eb0d43921da37ddee97a02513916db2d6abdde6dd45715fbe56c53809c5442531e8172467de1b05af264a50054ecbecaa8d319f
-EBUILD sarab-1.0.0-r1.ebuild 967 BLAKE2B a19d635485371c271551625d963f4b31bc03a6c44f3a7c60480f90de611d02ba28d9b13008a2a4612feb3db55ce810483ed0db1423e59e76afc5c16482dc105a SHA512 e46fae757ccea1c5e17ebc0e823019fffbc747025c0596416e36d8bd0b1595f603207e0df8ae34cc6b1978629578b77530206081b07da77259466f245753614a
+EBUILD sarab-1.0.0-r1.ebuild 965 BLAKE2B 1d55b0b706dde1ae4700164f1399ce7e89930d081ef8f4ebe0d0d7b67118f965f42261384bd2f0715477e767f46a91a6b51368c07d34740dabf4a4e1615a9a31 SHA512 8209f31ad71dbbf7f739397c647bd6f4d7f3fe3350eb4f5582c901dcd22afdfdbae035fa9b45951a8a3061d5b7c1721a8a1dd4d4648ebf36738b9b51ceb9f8d4
 EBUILD sarab-1.0.0.ebuild 955 BLAKE2B dcf58aefc12cbbbbdcc76fcc1adbdff349d5282b348e54f477f22221b18ee207046b758c4219f26bf6d9c115e6e0c5902a6faf77b526afe70ad7c7c881a4aa6c SHA512 77e8deaac5fa43aead91a0a431ae9816e5e6b98db08815645ef4d901e74e7cd8fef7854daf6c6cba658e9a20f44b5695ae979644e1c3b7f6371045d8a35e7a9d
 MISC metadata.xml 554 BLAKE2B dbce471bab5234688583fe6ca7d11fb8f82a8ab3747f8e6274f7b1d728284c94bba33df0b10d83760f89175cc7034fc2e0b21c2698f2fcb8abe148321404b4ae SHA512 e65c593eaef63fd10667fe58ed358d77155bf96aae89f7a59ef2012b65535c4a53ddb6f4ace06b76692d4c33e848e8928d91b93b10ee8234e83b32c5ddbb26af
diff --git a/app-backup/sarab/sarab-1.0.0-r1.ebuild b/app-backup/sarab/sarab-1.0.0-r1.ebuild
index fe5e5dd83868..aca106f7760c 100644
--- a/app-backup/sarab/sarab-1.0.0-r1.ebuild
+++ b/app-backup/sarab/sarab-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-backup/dar