Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
cbe5e4d56d
!29 Upgrade version to 13.0.3
From: @cherry530 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
2023-09-28 07:36:47 +00:00
cherry530
7905d9e984 Upgrade version to 13.0.3
Signed-off-by: cherry530 <707078654@qq.com>
2023-09-28 14:54:04 +08:00
openeuler-ci-bot
b8a7224ffd
!28 Disable docker-plugin to fix ebs build error
From: @cherry530 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei
2023-07-22 03:25:57 +00:00
cherry530
c5b6976b0b disable docker
Signed-off-by: cherry530 <707078654@qq.com>
2023-07-22 11:09:42 +08:00
openeuler-ci-bot
dfd32a1745
!21 bacula在master进行升级,到13.0.1
From: @json-book 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
2023-04-04 06:17:37 +00:00
json_book
fc8f182ce3 update version to 13.0.1 2023-04-04 10:26:14 +08:00
openeuler-ci-bot
18f102b9f3
!16 修复mainline由于configure失败导致的编译失败
From: @cherry530 
Reviewed-by: @ruebb 
Signed-off-by: @ruebb
2022-04-22 08:29:00 +00:00
cherry530
6c08fea3f2 Fix configure error
Signed-off-by: cherry530 <xuping33@huawei.com>
2022-04-15 14:26:07 +08:00
openeuler-ci-bot
7aa0f189fa !7 [sync] PR-6: Stop the service and the process exits normally
From: @openeuler-sync-bot
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-03-09 18:32:17 +08:00
jpzhang187
95194aea90 Stop the service and the process exits normally
(cherry picked from commit 95569bd8c04654013e2216b4fe1f99bae58c622e)
2021-03-09 09:47:53 +08:00
4 changed files with 50 additions and 14 deletions

BIN
bacula-13.0.3.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View 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");
}

View File

@ -2,12 +2,12 @@
%global username bacula
Name: bacula
Version: 9.4.4
Release: 3
Version: 13.0.3
Release: 1
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
License: AGPLv3 with exceptions
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
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
@ -95,15 +95,7 @@ Provides check_bacula support for Nagios.
%prep
%autosetup -p1
#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
sed -i -r 's/(hardcode_into_libs)=.*$/\1=no/' configure
find updatedb -type f | xargs chmod -x
%build
@ -119,6 +111,7 @@ export PATH="$PATH:%{_qt5_bindir}"
--with-sqlite3 \
--with-openssl \
--disable-conio \
--disable-docker-plugin \
--disable-rpath \
--with-postgresql \
--enable-readline \
@ -147,7 +140,9 @@ export PATH="$PATH:%{_qt5_bindir}"
--with-subsys-dir=%{_localstatedir}/lock/subsys \
--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 -C examples/nagios/check_bacula
@ -259,7 +254,10 @@ fi
%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/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)
%{_sbindir}/*
%{_unitdir}/bacula-sd.service
%{_unitdir}/bacula-dir.service
@ -318,6 +316,21 @@ fi
%{_mandir}/man*
%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
- Modify Source0 Url