Compare commits
10 Commits
21b73f6f94
...
cbe5e4d56d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbe5e4d56d | ||
|
|
7905d9e984 | ||
|
|
b8a7224ffd | ||
|
|
c5b6976b0b | ||
|
|
dfd32a1745 | ||
|
|
fc8f182ce3 | ||
|
|
18f102b9f3 | ||
|
|
6c08fea3f2 | ||
|
|
7aa0f189fa | ||
|
|
95194aea90 |
BIN
bacula-13.0.3.tar.gz
Normal file
BIN
bacula-13.0.3.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
23
bacula-stop-the-service-and-the-process-exits-normally.patch
Normal file
23
bacula-stop-the-service-and-the-process-exits-normally.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
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");
|
||||||
|
}
|
||||||
41
bacula.spec
41
bacula.spec
@ -2,12 +2,12 @@
|
|||||||
%global username bacula
|
%global username bacula
|
||||||
|
|
||||||
Name: bacula
|
Name: bacula
|
||||||
Version: 9.4.4
|
Version: 13.0.3
|
||||||
Release: 3
|
Release: 1
|
||||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||||
License: AGPLv3 with exceptions
|
License: AGPLv3 with exceptions
|
||||||
URL: http://www.bacula.org
|
URL: http://www.bacula.org
|
||||||
Source0: https://www.bacula.org/download/10072/%{name}-%{version}.tar.gz
|
Source0: https://sourceforge.net/projects/bacula/files/bacula/%{version}/%{name}-%{version}.tar.gz
|
||||||
Source6: bacula.logrotate
|
Source6: bacula.logrotate
|
||||||
Source10: bacula-fd.service
|
Source10: bacula-fd.service
|
||||||
Source11: bacula-dir.service
|
Source11: bacula-dir.service
|
||||||
@ -18,7 +18,7 @@ Source17: bacula-sd.sysconfig
|
|||||||
Patch0001: bacula-sqlite-priv.patch
|
Patch0001: bacula-sqlite-priv.patch
|
||||||
Patch0002: bacula-seg-fault.patch
|
Patch0002: bacula-seg-fault.patch
|
||||||
Patch0003: bacula-autoconf.patch
|
Patch0003: bacula-autoconf.patch
|
||||||
|
Patch0004: bacula-stop-the-service-and-the-process-exits-normally.patch
|
||||||
BuildRequires: desktop-file-utils perl-generators sed autoconf automake lzo-devel zlib-devel
|
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: gcc gcc-c++ glibc-devel ImageMagick libacl-devel libstdc++-devel libxml2-devel
|
||||||
BuildRequires: libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel
|
BuildRequires: libcap-devel ncurses-devel openssl-devel readline-devel sqlite-devel
|
||||||
@ -95,15 +95,7 @@ Provides check_bacula support for Nagios.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%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
|
find updatedb -type f | xargs chmod -x
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -119,6 +111,7 @@ export PATH="$PATH:%{_qt5_bindir}"
|
|||||||
--with-sqlite3 \
|
--with-sqlite3 \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--disable-conio \
|
--disable-conio \
|
||||||
|
--disable-docker-plugin \
|
||||||
--disable-rpath \
|
--disable-rpath \
|
||||||
--with-postgresql \
|
--with-postgresql \
|
||||||
--enable-readline \
|
--enable-readline \
|
||||||
@ -147,7 +140,9 @@ export PATH="$PATH:%{_qt5_bindir}"
|
|||||||
--with-subsys-dir=%{_localstatedir}/lock/subsys \
|
--with-subsys-dir=%{_localstatedir}/lock/subsys \
|
||||||
--with-working-dir=%{_localstatedir}/spool/bacula \
|
--with-working-dir=%{_localstatedir}/spool/bacula \
|
||||||
|
|
||||||
%disable_rpath
|
# 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
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
%make_build -C examples/nagios/check_bacula
|
%make_build -C examples/nagios/check_bacula
|
||||||
@ -259,7 +254,10 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %attr(640,root,root)
|
%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf %attr(640,root,root)
|
||||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,root)
|
%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,root)
|
||||||
%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
|
%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
|
||||||
|
%config(noreplace) %{_sysconfdir}/bacula/bacula-tray-monitor.conf %attr(640,root,root)
|
||||||
%config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %attr(640,root,bacula)
|
%config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %attr(640,root,bacula)
|
||||||
|
|
||||||
|
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%{_unitdir}/bacula-sd.service
|
%{_unitdir}/bacula-sd.service
|
||||||
%{_unitdir}/bacula-dir.service
|
%{_unitdir}/bacula-dir.service
|
||||||
@ -318,6 +316,21 @@ fi
|
|||||||
%{_mandir}/man*
|
%{_mandir}/man*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 28 2023 xu_ping <707078654@qq.com> - 13.0.3-1
|
||||||
|
- Upgrade version to 13.0.3
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 xu_ping <707078654@qq.com> - 13.0.1-2
|
||||||
|
- Disable docker-plugin to fix build error.
|
||||||
|
|
||||||
|
* Sat Feb 04 2023 wenchaofan <349464272@qq.com> - 13.0.1-1
|
||||||
|
- Update to 13.0.1 version
|
||||||
|
|
||||||
|
* 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.4.4-3
|
||||||
- Modify Source0 Url
|
- Modify Source0 Url
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user