packages/bacula
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:3105175e8a065e7a43c50b2f86f60eef78b23db2
Branches Tags
packages:main
..
compare: packages:71fed0d738a6798de98d349adadb2913c8322b45
Branches Tags
packages:main

No commits in common. "3105175e8a065e7a43c50b2f86f60eef78b23db2" and "71fed0d738a6798de98d349adadb2913c8322b45" have entirely different histories.
3105175e8a ... 71fed0d738

4 changed files with 12 additions and 93 deletions
Show Stats Expand all files Collapse all files

25
0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch
View File

@ -1,25 +0,0 @@
From 5a064f40a393193d057bd5a6d649ff4102aad742 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 2 May 2020 11:18:11 +0200
Subject: [PATCH] Remove unused -t option in dbcheck.c -- fixes bug #2453
reference: https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/5a064f40a393193d057bd5a6d649ff4102aad742
---
bacula/src/tools/dbcheck.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/tools/dbcheck.c b/src/tools/dbcheck.c
index b7ee37106..1257adbed 100644
--- a/src/tools/dbcheck.c
+++ b/src/tools/dbcheck.c
@@ -104,7 +104,6 @@ PROG_COPYRIGHT
" -d <nn> set debug level to <nn>\n"
" -dt print a timestamp in debug output\n"
" -f fix inconsistencies\n"
-" -t test if client library is thread-safe\n"
" -v verbose\n"
" -? print this message\n"
"\n", 2002, "", VERSION, BDATE);
--
2.33.0

23
bacula-stop-the-service-and-the-process-exits-normally.patch
View File

@ -1,23 +0,0 @@
diff --git a/src/lib/signal.c b/src/lib/signal.c
index cdb9824..1712d25 100644
--- a/src/lib/signal.c
+++ b/src/lib/signal.c
@@ -138,7 +138,7 @@ extern "C" void signal_handler(int sig)
already_dead++;
/* Don't use Emsg here as it may lock and thus block us */
if (sig == SIGTERM || sig == SIGINT) {
- syslog(LOG_DAEMON|LOG_ERR, "Shutting down Bacula service: %s ...\n", my_name);
+ syslog(LOG_DAEMON|LOG_INFO, "Shutting down Bacula service: %s ...\n", my_name);
} else {
fprintf(stderr, _("Bacula interrupted by signal %d: %s\n"), sig, get_signal_name(sig));
syslog(LOG_DAEMON|LOG_ERR,
@@ -274,6 +274,9 @@ extern "C" void signal_handler(int sig)
}
#endif
+ if (sig == SIGTERM || sig == SIGINT) {
+ exit_handler(0);
+ }
exit_handler(sig);
Dmsg0(500, "Done exit_handler\n");
}

33
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula
Version: 9.4.4
Release: 7
Release: 3
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
License: AGPLv3 with exceptions
URL: http://www.bacula.org
@ -18,9 +18,7 @@ Source17: bacula-sd.sysconfig
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: 0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch
Patch0006: fix-add-the-compilation-option-pie.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
@ -98,7 +96,14 @@ Provides check_bacula support for Nagios.
%prep
%autosetup -p1
sed -i -r 's/(hardcode_into_libs)=.*$/\1=no/' configure
#cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
pushd autoconf
sed -i -r 's/(hardcode_into_libs)=.*$/\1=no/' libtool/libtool.m4
aclocal -I bacula-macros/ -I gettext-macros/ -I libtool/
popd
autoconf -I autoconf/ -o configure autoconf/configure.in
find updatedb -type f | xargs chmod -x
%build
@ -142,9 +147,7 @@ export PATH="$PATH:%{_qt5_bindir}"
--with-subsys-dir=%{_localstatedir}/lock/subsys \
--with-working-dir=%{_localstatedir}/spool/bacula \
#Remove RPATH
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%disable_rpath
%make_build
%make_build -C examples/nagios/check_bacula
@ -315,19 +318,7 @@ fi
%{_mandir}/man*
%changelog
* Mon Jun 05 2023 wu lei <wu_lei@hoperun.com> - 9.4.4-7
- Add PIE flags
* Tue May 30 2023 chenchen <chen_aka_jan@163.com> - 9.4.4-6
- Remove unused -t option in dbcheck.c
* Fri Apr 15 2022 xu_ping <xuping33@h-partners.com> - 9.4.4-5
- Fix configure error
* Mon Mar 8 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 9.4.4-4
- Stop the service and the process exits normally
* Mon Sep 14 2020 Ge Wang <wangge20@huawei.com> - 9.4.4-3
* Mon Sep 14 2020 Ge Wang <wangge20@huawei.com> - 9.44-3
- Modify Source0 Url
* Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.4.4-2

24
fix-add-the-compilation-option-pie.patch
View File

@ -1,24 +0,0 @@
diff -Nur a/src/qt-console/bat.pro.in b/src/qt-console/bat.pro.in
--- a/src/qt-console/bat.pro.in 2023-06-05 16:36:20.200951580 +0800
+++ b/src/qt-console/bat.pro.in 2023-06-05 16:37:07.576951580 +0800
@@ -26,7 +26,7 @@
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
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) -fPIE -Wl,-pie
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
QMAKE_CLEAN += .libs/* bat
diff -Nur a/src/qt-console/tray-monitor/tray-monitor.pro.in b/src/qt-console/tray-monitor/tray-monitor.pro.in
--- a/src/qt-console/tray-monitor/tray-monitor.pro.in 2023-06-05 16:36:20.208951580 +0800
+++ b/src/qt-console/tray-monitor/tray-monitor.pro.in 2023-06-05 16:37:53.676951580 +0800
@@ -37,7 +37,7 @@
INCLUDEPATH += ../.. .
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) -fPIE -Wl,-pie
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
QMAKE_CXXFLAGS += -DTRAY_MONITOR