diff --git a/bacula-stop-the-service-and-the-process-exits-normally.patch b/bacula-stop-the-service-and-the-process-exits-normally.patch new file mode 100644 index 0000000000000000000000000000000000000000..a025025afc9882c397e7e97207e60d3c20742920 --- /dev/null +++ b/bacula-stop-the-service-and-the-process-exits-normally.patch @@ -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"); + } diff --git a/bacula.spec b/bacula.spec index 5d49bad2d1108d73a4d707ac4c5f7af86e7ca762..1fd24b7887910c29b350aad578e573e8bba61296 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,11 +3,11 @@ Name: bacula Version: 9.4.4 -Release: 2 +Release: 4 Summary: Cross platform network backup for Linux, Unix, Mac and Windows License: AGPLv3 with exceptions URL: http://www.bacula.org -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: https://www.bacula.org/download/10072/%{name}-%{version}.tar.gz Source6: bacula.logrotate Source10: bacula-fd.service Source11: bacula-dir.service @@ -18,7 +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 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 @@ -318,5 +318,11 @@ fi %{_mandir}/man* %changelog +* Mon Mar 8 2021 zhangjiapeng - 9.4.4-4 +- Stop the service and the process exits normally + +* Mon Sep 14 2020 Ge Wang - 9.4.4-3 +- Modify Source0 Url + * Thu Nov 21 2019 openEuler Buildteam - 9.4.4-2 - Package init diff --git a/bacula.yaml b/bacula.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7752f9b3a2c557c12021cdaf1191a6b569dcf743 --- /dev/null +++ b/bacula.yaml @@ -0,0 +1,4 @@ +version_control: git +src_repo: http://git.bacula.org/bacula.git +tag_prefix: "Release-" +seperator: "."