Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-backup/bacula/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-backup/bacula/files')
-rw-r--r--app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch12
-rw-r--r--app-backup/bacula/files/bacula-15.0.2-fix-static.patch (renamed from app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch)14
-rw-r--r--app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch67
-rw-r--r--app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch15
-rw-r--r--app-backup/bacula/files/bacula-fix-sonames-new.patch37
-rw-r--r--app-backup/bacula/files/bacula-fix-sonames.patch36
-rw-r--r--app-backup/bacula/files/fix_slibtool.patch67
-rw-r--r--app-backup/bacula/files/fix_tray_monitor.patch15
-rw-r--r--app-backup/bacula/files/newscripts/bacula-dir.initd4
-rw-r--r--app-backup/bacula/files/newscripts/bacula-fd.initd3
-rw-r--r--app-backup/bacula/files/newscripts/bacula-sd.initd4
-rw-r--r--app-backup/bacula/files/tray-monitor-pro.patch15
12 files changed, 216 insertions, 73 deletions
diff --git a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
deleted file mode 100644
index e076cd6478cc..000000000000
--- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix file not found error during make depend
---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200
-+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200
-@@ -194,7 +194,7 @@
- @$(MV) Makefile Makefile.bak
- @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-- @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
-+ @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
- @if test -f Makefile ; then \
- $(RMF) Makefile.bak; \
- else \
diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch
index 1f32cd224f01..57963a271bba 100644
--- a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch
+++ b/app-backup/bacula/files/bacula-15.0.2-fix-static.patch
@@ -40,24 +40,24 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS)
bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
-- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch b/app-backup/bacula/files/bacula-15.0.2-fix_slibtool.patch
new file mode 100644
index 000000000000..96eddbc5fb46
--- /dev/null
+++ b/app-backup/bacula/files/bacula-15.0.2-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) $(ZSTD_LIBS) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) $(ZSTD_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/bacula/files/bacula-9.6.x-fix-race-condition.patch b/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
deleted file mode 100644
index 4862bcece0ef..000000000000
--- a/app-backup/bacula/files/bacula-9.6.x-fix-race-condition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/dird/dird.c.orig 2021-01-19 15:25:16.233573546 -0500
-+++ src/dird/dird.c 2021-01-19 15:26:23.884070798 -0500
-@@ -1263,11 +1263,11 @@
- }
- if (catalog->db_driver) {
- /* To copy dbdriver field into "CAT" catalog resource class (local)
- * from dbdriver in "BDB" catalog DB Interface class (global)
- */
-- bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len);
-+ bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len+1);
- }
- }
-
- if (!db || !db_open_database(NULL, db)) {
- Pmsg2(000, _("Could not open Catalog \"%s\", database \"%s\".\n"),
diff --git a/app-backup/bacula/files/bacula-fix-sonames-new.patch b/app-backup/bacula/files/bacula-fix-sonames-new.patch
new file mode 100644
index 000000000000..9a3abedb7d66
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fix-sonames-new.patch
@@ -0,0 +1,37 @@
+# Fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+#
+# Actual libtool needs a patch to accept '-soname' command line switch,
+# otherwise it will ignored.
+# slibtool in contrast responds with error and is not easy to patch.
+#
+# Solution here drops the '-soname' switch and uses patchelf program to
+# fix the SONAME after the library is build.
+diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in
+index d30cc75..9f87798 100644
+--- a/src/cats/Makefile.in
++++ b/src/cats/Makefile.in
+@@ -135,17 +135,21 @@ libbaccats.la: Makefile cats_null.lo
+ libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
+ @echo "Making $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
++ $(MYSQL_LIBS)
++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-mysql-$(LIBBACCATS_LT_RELEASE).so
+
+ libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
+ @echo "Making $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
++ $(POSTGRESQL_LIBS)
++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-postgresql-$(LIBBACCATS_LT_RELEASE).so
+
+ libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
+ @echo "Making $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+- -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
++ $(SQLITE_LIBS)
++ patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-sqlite3-$(LIBBACCATS_LT_RELEASE).so
++
+ #libbaccats-dbi.la: Makefile $(DBI_LOBJS)
+ # @echo "Making $@ ..."
+ # $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9a37fb..000000000000
--- a/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh 2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh 2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -shared only do dynamic linking of libtool libraries
- -shrext SUFFIX override the standard shared library file extension
-+ -soname SONAME override the standard shared object name
- -static do not do any dynamic linking of uninstalled libtool libraries
- -static-libtool-libs
- do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- prev=
- continue
- ;;
-+ soname)
-+ soname_spec="$arg"
-+ prev=
-+ continue
-+ ;;
- weak)
- func_append weak_libs " $arg"
- prev=
-@@ -5741,6 +5747,11 @@
- continue
- ;;
-
-+ -soname)
-+ prev=soname
-+ continue
-+ ;;
-+
- -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
-
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/bacula/files/fix_tray_monitor.patch b/app-backup/bacula/files/fix_tray_monitor.patch
new file mode 100644
index 000000000000..1d3999c4f4f1
--- /dev/null
+++ b/app-backup/bacula/files/fix_tray_monitor.patch
@@ -0,0 +1,15 @@
+# original code calls 'qmake' and 'make clean' for tray-monitor configuration twice
+# resuting in a Makefile without install rule for binary
+#
+# see bug #915605
+--- configure.orig 2023-11-14 12:01:38.738557240 +0000
++++ configure 2023-11-14 12:02:13.845743964 +0000
+@@ -35067,8 +35067,6 @@
+ rm -rf moc32 obj32 moc64 obj64 ui32 ui64
+ $QMAKE
+ ${MAKE:-make} clean
+- $QMAKE
+- ${MAKE:-make} clean
+ cd ${BUILD_DIR}
+ fi
+
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
index fdcfc7ef2b65..df76a70ca3ee 100644
--- a/app-backup/bacula/files/newscripts/bacula-dir.initd
+++ b/app-backup/bacula/files/newscripts/bacula-dir.initd
@@ -1,8 +1,10 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+
command=/usr/sbin/bacula-dir
command_args="${DIR_OPTIONS}"
+# make sure the following line matches the portnumber from bacula-dir.conf
pidfile=/var/run/bacula-dir.9101.pid
depend() {
diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd
index fe6a8815b9fd..5063df0f9198 100644
--- a/app-backup/bacula/files/newscripts/bacula-fd.initd
+++ b/app-backup/bacula/files/newscripts/bacula-fd.initd
@@ -1,9 +1,10 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command=/usr/sbin/bacula-fd
command_args="${FD_OPTIONS}"
+# make sure the following line matches the portnumber from bacula-fd.conf
pidfile=/var/run/bacula-fd.9102.pid
depend() {
diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd
index 07facefbb4a4..15aa6d1c6205 100644
--- a/app-backup/bacula/files/newscripts/bacula-sd.initd
+++ b/app-backup/bacula/files/newscripts/bacula-sd.initd
@@ -1,8 +1,10 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+
command=/usr/sbin/bacula-sd
command_args="${SD_OPTIONS}"
+# make sure the following line matches the portnumber from bacula-sd.conf
pidfile=/var/run/bacula-sd.9103.pid
depend() {
diff --git a/app-backup/bacula/files/tray-monitor-pro.patch b/app-backup/bacula/files/tray-monitor-pro.patch
new file mode 100644
index 000000000000..2781903cbb9f
--- /dev/null
+++ b/app-backup/bacula/files/tray-monitor-pro.patch
@@ -0,0 +1,15 @@
+# Build of tray-monitor should respect LDFLAGS and CFLAGS
+--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2023-11-16 16:25:31.840100695 +0100
++++ src/qt-console/tray-monitor/tray-monitor.pro.in 2023-11-16 16:26:26.453913247 +0100
+@@ -41,8 +41,9 @@
+ QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
+-QMAKE_CXXFLAGS += -DTRAY_MONITOR
+-QMAKE_CFLAGS += -DTRAY_MONITOR
++QMAKE_CXXFLAGS += @CXXFLAGS@ -DTRAY_MONITOR
++QMAKE_CFLAGS += @CFLAGS@ -DTRAY_MONITOR
++QMAKE_LFLAGS += @LDFLAGS@
+
+ INSTALLS = bins confs
+