diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..30e7f55a2e7788fdbff07f4448b728db5859fe0c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/bacula diff --git a/bacula-15.0.2.tar.gz b/bacula-15.0.2.tar.gz deleted file mode 100644 index 5ad636a5372dac3328f6a187bbfe344813e501e7..0000000000000000000000000000000000000000 Binary files a/bacula-15.0.2.tar.gz and /dev/null differ diff --git a/bacula-15.0.3.tar.gz b/bacula-15.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3363aa5138a606dfea6ce8726adbcfd95c9b4f4a --- /dev/null +++ b/bacula-15.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:294afd3d2eb9d5b71c3d0e88fdf19eb513bfdb843b28d35c0552e4ae062827a1 +size 6539212 diff --git a/bacula-compile-options.patch b/bacula-compile-options.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c8b4bcb9a10bf32534f94d60db91d130d43b081 --- /dev/null +++ b/bacula-compile-options.patch @@ -0,0 +1,166 @@ +diff -Naur bacula-15.0.2.old/autoconf/bacula-macros/db.m4 bacula-15.0.2/autoconf/bacula-macros/db.m4 +--- bacula-15.0.2.old/autoconf/bacula-macros/db.m4 2024-06-02 10:15:17.084968302 +0200 ++++ bacula-15.0.2/autoconf/bacula-macros/db.m4 2024-06-02 10:15:17.418968518 +0200 +@@ -102,7 +102,7 @@ + fi + DBI_INCLUDE=-I$DBI_INCDIR + if test x$use_libtool != xno; then +- DBI_LIBS="-R $DBI_LIBDIR -L$DBI_LIBDIR -ldbi" ++ DBI_LIBS="-L$DBI_LIBDIR -ldbi" + else + DBI_LIBS="-L$DBI_LIBDIR -ldbi" + fi +@@ -494,7 +494,7 @@ + elif test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ + -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then + if test x$use_libtool != xno; then +- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz" ++ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" + else + MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" + fi +@@ -625,7 +625,7 @@ + fi + MYSQL_INCLUDE=-I$MYSQL_INCDIR + if test x$use_libtool != xno; then +- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" ++ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + else + MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" + fi +@@ -715,7 +715,7 @@ + fi + INGRES_INCLUDE=-I$INGRES_INCDIR + if test x$use_libtool != xno; then +- INGRES_LIBS="-R $INGRES_LIBDIR -L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" ++ INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" + else + INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" + fi +@@ -803,7 +803,7 @@ + fi + SQLITE_INCLUDE=-I$SQLITE_INCDIR + if test x$use_libtool != xno; then +- SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3" ++ SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3" + else + SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3" + fi +@@ -936,7 +936,7 @@ + + POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR + if test x$use_libtool != xno; then +- POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq" ++ POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" + else + POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" + fi +diff -Naur bacula-15.0.2.old/autoconf/configure.in bacula-15.0.2/autoconf/configure.in +--- bacula-15.0.2.old/autoconf/configure.in 2024-06-02 10:15:17.086968303 +0200 ++++ bacula-15.0.2/autoconf/configure.in 2024-06-02 10:15:17.418968518 +0200 +@@ -16,7 +16,7 @@ + cd ${BUILD_DIR} + AC_SUBST(BUILD_DIR) + AC_SUBST(TOP_DIR) +-AC_CONFIG_AUX_DIR(${BUILD_DIR}/autoconf) ++AC_CONFIG_AUX_DIR(autoconf) + AC_CONFIG_HEADERS(src/config.h:autoconf/config.h.in) + + dnl minimal Win32 stuff for "make clean" +@@ -238,7 +238,6 @@ + QMAKE_LIBTOOL="${BUILD_DIR}/libtool" + FD_PLUGIN_DIR="src/plugins/fd" + DIR_PLUGIN_DIR="src/plugins/dir" +- DLIB="-rpath \$(libdir)" + have_plugins=yes + else + DEFAULT_OBJECT_TYPE=".o" +@@ -3748,11 +3747,6 @@ + AC_DEFINE(FDLIBS) + + CFLAGS=${CFLAGS--O} +- +-if test x$have_gcc = xyes ; then +- CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" +- CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" +-fi + LDFLAGS=${LDFLAGS--O} + CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS" +diff -Naur bacula-15.0.2.old/autoconf/Make.common.in bacula-15.0.2/autoconf/Make.common.in +--- bacula-15.0.2.old/autoconf/Make.common.in 2024-06-02 10:15:17.084968302 +0200 ++++ bacula-15.0.2/autoconf/Make.common.in 2024-06-02 10:15:17.419968519 +0200 +@@ -39,7 +39,7 @@ + mandir = @mandir@ + manext = 8 + +-NO_ECHO = @ ++NO_ECHO = + + # Tools & program stuff + CC = @CC@ +@@ -77,12 +77,12 @@ + DEFAULT_ARCHIVE_TYPE = @DEFAULT_ARCHIVE_TYPE@ + DEFAULT_SHARED_OBJECT_TYPE = @DEFAULT_SHARED_OBJECT_TYPE@ + LIBTOOL = @BUILD_DIR@/libtool +-LIBTOOL_COMPILE = @LIBTOOL@ --silent --tag=CXX --mode=compile +-LIBTOOL_LINK = @LIBTOOL@ --silent --tag=CXX --mode=link +-LIBTOOL_INSTALL = @LIBTOOL@ --silent --tag=CXX --mode=install +-LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --silent --tag=CXX --finish --mode=install +-LIBTOOL_UNINSTALL = @LIBTOOL@ --silent --tag=CXX --mode=uninstall +-LIBTOOL_CLEAN = @LIBTOOL@ --silent --tag=CXX --mode=clean ++LIBTOOL_COMPILE = @LIBTOOL@ --tag=CXX --mode=compile ++LIBTOOL_LINK = @LIBTOOL@ --tag=CXX --mode=link ++LIBTOOL_INSTALL = @LIBTOOL@ --tag=CXX --mode=install ++LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --tag=CXX --finish --mode=install ++LIBTOOL_UNINSTALL = @LIBTOOL@ --tag=CXX --mode=uninstall ++LIBTOOL_CLEAN = @LIBTOOL@ --tag=CXX --mode=clean + + # Flags & libs + CFLAGS = @CFLAGS@ @OPENSSL_INC@ +diff -Naur bacula-15.0.2.old/src/qt-console/bat.pro.in bacula-15.0.2/src/qt-console/bat.pro.in +--- bacula-15.0.2.old/src/qt-console/bat.pro.in 2024-06-02 10:15:16.980968234 +0200 ++++ bacula-15.0.2/src/qt-console/bat.pro.in 2024-06-02 10:15:17.419968519 +0200 +@@ -23,8 +23,8 @@ + DEPENDPATH += . + INCLUDEPATH += .. . ./console ./restore ./select + LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@ +-LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link +-LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install ++LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link ++LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install + QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) + QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p + QMAKE_CLEAN += .libs/* bat +@@ -195,3 +195,8 @@ + QMAKE_EXTRA_TARGETS += depend + + TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts ++ ++QMAKE_CPPFLAGS += @CPPFLAGS@ ++QMAKE_CFLAGS += @CFLAGS@ ++QMAKE_CXXFLAGS += @CXXFLAGS@ ++QMAKE_LFLAGS += @LDFLAGS@ +diff -Naur bacula-15.0.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-15.0.2/src/qt-console/tray-monitor/tray-monitor.pro.in +--- bacula-15.0.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-06-02 10:15:16.983968236 +0200 ++++ bacula-15.0.2/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-06-02 10:15:17.419968519 +0200 +@@ -36,8 +36,8 @@ + DEPENDPATH += . + INCLUDEPATH += ../.. . + QMAKE_CC = $(CXX) +-LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link +-LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install ++LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link ++LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install + 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 +@@ -69,3 +69,8 @@ + INCLUDEPATH += $$JOURNAL_DIR + + TRANSLATIONS += ts/tm_fr.ts ts/tm_de.ts ts/tm_ja.ts ++ ++QMAKE_CPPFLAGS += @CPPFLAGS@ ++QMAKE_CFLAGS += @CFLAGS@ ++QMAKE_CXXFLAGS += @CXXFLAGS@ ++QMAKE_LFLAGS += @LDFLAGS@ diff --git a/bacula-fix-linkage.patch b/bacula-fix-linkage.patch new file mode 100644 index 0000000000000000000000000000000000000000..bf7b638213fd27acea5039e79c559390e4a6dfba --- /dev/null +++ b/bacula-fix-linkage.patch @@ -0,0 +1,142 @@ +diff --git a/Makefile.in b/Makefile.in +index 94ebf8d..7a3d053 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -135,9 +135,11 @@ installdirs: + chgrp $(dir_group) $(DESTDIR)$(logdir); \ + fi + +-install: installdirs install-plugins ++install: installdirs install-libs install-plugins + @for I in $(doc_files) ; do $(INSTALL_DATA) $$I $(DESTDIR)${docdir}; done +- @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done ++ ++install-libs: ++ @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) install || exit 1); done + + uninstall: + @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done +@@ -166,7 +168,7 @@ uninstall-autostart-fd: + uninstall-autostart-sd: + (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) + +-install-plugins: ++install-plugins: install-libs + @for I in ${pluginsdirs}; \ + do echo "==> Plugin directory $$I" ; \ + $(MAKE) DESTDIR=$(DESTDIR) -C $$I install ; done +diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in +index 44bec65..54c5854 100644 +--- a/src/cats/Makefile.in ++++ b/src/cats/Makefile.in +@@ -125,28 +125,28 @@ libbaccats.a: $(LIBBACCATS_OBJS) + $(AR) rc $@ $(LIBBACCATS_OBJS) + $(RANLIB) $@ + +-libbacsql.la: Makefile $(LIBBACSQL_LOBJS) ++libbacsql.la: Makefile $(LIBBACSQL_LOBJS) libbaccats.la $(basedir)/findlib/libbacfind.la + @echo "Making $@ ..." +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS) libbaccats.la $(basedir)/findlib/libbacfind.la + + libbaccats.la: Makefile cats_null.lo + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_null.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) + +-libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) ++libbaccats-mysql.la: Makefile $(MYSQL_LOBJS) libbacsql.la + @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) ++ -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS) libbacsql.la + +-libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) ++libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS) libbacsql.la + @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) ++ -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS) libbacsql.la + +-libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) ++libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS) libbacsql.la + @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) ++ -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS) libbacsql.la + #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) \ +@@ -208,8 +208,8 @@ libtool-install: all + $(MKDIR) $(DESTDIR)$(libdir) + $(RMF) $(DESTDIR)$(libdir)/libbacsql-*.so $(DESTDIR)$(libdir)/libbacsql.la + $(RMF) $(DESTDIR)$(libdir)/libbaccats-*.so $(DESTDIR)$(libdir)/libbaccats.la +- $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacsql.la $(DESTDIR)$(libdir) + $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats.la $(DESTDIR)$(libdir) ++ $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacsql.la $(DESTDIR)$(libdir) + for db_type in @DB_BACKENDS@; do \ + $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \ + done +diff --git a/src/findlib/Makefile.in b/src/findlib/Makefile.in +index 4932755..11a4aa9 100644 +--- a/src/findlib/Makefile.in ++++ b/src/findlib/Makefile.in +@@ -60,9 +60,9 @@ libbacfind.a: $(LIBBACFIND_OBJS) + $(AR) rc $@ $(LIBBACFIND_OBJS) + $(RANLIB) $@ + +-libbacfind.la: Makefile $(LIBBACFIND_LOBJS) ++libbacfind.la: Makefile $(LIBBACFIND_LOBJS) $(basedir)/lib/libbac.la + @echo "Making $@ ..." +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) $(basedir)/lib/libbac.la + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 355a1fb..c36b6cb 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -129,9 +129,9 @@ libbaccfg.a: $(LIBBACCFG_OBJS) + $(AR) rc $@ $(LIBBACCFG_OBJS) + $(RANLIB) $@ + +-libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) ++libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) libbac.la + @echo "Making $@ ..." +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) libbac.la $(OPENSSL_LIBS) $(LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +diff --git a/src/plugins/fd/Makefile b/src/plugins/fd/Makefile +index 088f02a..a7e4941 100644 +--- a/src/plugins/fd/Makefile ++++ b/src/plugins/fd/Makefile +@@ -73,8 +73,8 @@ example-plugin-fd.la: Makefile example-plugin-fd$(DEFAULT_OBJECT_TYPE) + bpipe-fd.lo: bpipe-fd.c ${FDDIR}/fd_plugins.h + $(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I../.. -I${FDDIR} -c bpipe-fd.c + +-bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_OBJECT_TYPE) +- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared bpipe-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version ++bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_OBJECT_TYPE) ../../lib/libbaccfg.la ++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared bpipe-fd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version ../../lib/libbaccfg.la + + test-bpipe-fd.c: bpipe-fd.c + cp -f bpipe-fd.c test-bpipe-fd.c +diff --git a/src/stored/Makefile.in b/src/stored/Makefile.in +index aa08da4..9e1b1cc 100644 +--- a/src/stored/Makefile.in ++++ b/src/stored/Makefile.in +@@ -193,10 +193,10 @@ libbacsd.a: $(LIBBACSD_OBJS) + $(AR) rc $@ $(LIBBACSD_OBJS) + $(RANLIB) $@ + +-libbacsd.la: Makefile $(LIBBACSD_LOBJS) ++libbacsd.la: Makefile $(LIBBACSD_LOBJS) $(basedir)/lib/libbac.la + @echo "Making $@ ..." + $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ \ +- $(LIBBACSD_LOBJS) \ ++ $(LIBBACSD_LOBJS) $(basedir)/lib/libbac.la \ + -export-dynamic -rpath $(libdir) -release $(LIBBACSD_LT_RELEASE) + + # diff --git a/bacula.spec b/bacula.spec index add01fe1f338ec4217017209e8ccad8b4f3f19eb..7801b95107ffa282017efe3920aef6654501a853 100644 --- a/bacula.spec +++ b/bacula.spec @@ -2,7 +2,7 @@ %global username bacula Name: bacula -Version: 15.0.2 +Version: 15.0.3 Release: 1 Summary: Cross platform network backup for Linux, Unix, Mac and Windows License: AGPLv3 with exceptions @@ -19,6 +19,8 @@ Patch0001: bacula-sqlite-priv.patch Patch0002: bacula-seg-fault.patch Patch0003: bacula-autoconf.patch Patch0004: bacula-stop-the-service-and-the-process-exits-normally.patch +Patch0005: bacula-fix-linkage.patch +Patch0006: bacula-compile-options.patch BuildRequires: desktop-file-utils perl-generators sed autoconf automake lzo-devel zlib-devel BuildRequires: gcc gcc-c++ glibc-devel ImageMagick libacl-devel libstdc++-devel libxml2-devel BuildRequires: libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel @@ -54,7 +56,6 @@ Obsoletes: bacula-storage-postgresql < 5.2.0 bacula-console < %{version Provides: bacula-console-bat = %{version}-%{release} bacula-traymonitor = %{version}-%{release} Obsoletes: bacula-console-bat < %{version}-%{release} bacula-traymonitor < %{version}-%{release} Requires: mt-st mtx dejavu-lgc-sans-fonts -Requires(pre): shadow-utils Requires(postun): shadow-utils %{?systemd requires} @@ -98,6 +99,11 @@ Provides check_bacula support for Nagios. sed -i -r 's/(hardcode_into_libs)=.*$/\1=no/' configure find updatedb -type f | xargs chmod -x +# Create a sysusers.d config file +cat >bacula.sysusers.conf </dev/null || groupadd -g %uid -r %username &>/dev/null || : -getent passwd %username >/dev/null || useradd -u %uid -r -s /sbin/nologin \ - -d /var/spool/bacula -M -c 'Bacula Backup System' -g %username %username &>/dev/null || : -exit 0 +%ldconfig_scriptlets common %post common /usr/sbin/alternatives --install %{_libdir}/libbaccats.so libbaccats.so %{_libdir}/libbaccats-mysql.so 50 @@ -242,7 +244,6 @@ fi %systemd_postun_with_restart bacula-fd.service %files common -%defattr(-,root,root) %doc SUPPORT ReleaseNotes %doc updatedb examples/sample-query.sql %license LICENSE COPYING COPYRIGHT LICENSE-FAQ LICENSE-FOSS @@ -272,6 +273,7 @@ fi %{_datadir}/pixmaps/bat_icon.png %{_datadir}/applications/bat.desktop %{_datadir}/applications/bacula-tray-monitor.desktop +%{_sysusersdir}/bacula.conf %exclude %{_sbindir}/bfdjson %exclude %{_sbindir}/bacula-fd %exclude %{_libdir}/libbac.so @@ -282,14 +284,12 @@ fi %exclude %{_libdir}/libbaccats-%{version}.so %files logwatch -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf %config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf %{_sysconfdir}/logwatch/scripts/services/bacula %{_sysconfdir}/logwatch/scripts/shared/applybaculadate %files client -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf %attr(640,root,root) %{_sbindir}/bfdjson @@ -298,7 +298,6 @@ fi %{_libdir}/bacula/bpipe-fd.so %files devel -%defattr(-,root,root) %{_includedir}/bacula %{_libdir}/libbac.so %{_libdir}/libbacsd.so @@ -307,15 +306,17 @@ fi %{_libdir}/libbacfind.so %files -n nagios-plugins-bacula -%defattr(-,root,root) %{_libdir}/nagios/plugins/check_bacula %files help -%defattr(-,root,root) %doc AUTHORS ChangeLog README README.AIX SUPPORT VERIFYING -%{_mandir}/man* +%{_mandir}/man?/* %changelog +* Fri Apr 04 2025 Funda Wang - 15.0.3-1 +- Upgrade version to 15.0.3 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Tue Oct 22 2024 xu_ping <707078654@qq.com> - 15.0.2-1 - Upgrade version to 15.0.2