From f61eb310342a3dfddf38368a9495e356c921e346 Mon Sep 17 00:00:00 2001 From: chen-jan Date: Tue, 30 May 2023 17:01:13 +0800 Subject: [PATCH] Remove unused -t option in dbcheck.c (cherry picked from commit 5e6f400b199d5447c007c41cbb896a1083fd4042) --- ...t-option-in-dbcheck.c-fixes-bug-2453.patch | 25 +++++++++++++++++++ bacula.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch diff --git a/0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch b/0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch new file mode 100644 index 0000000..c3a41e6 --- /dev/null +++ b/0001-Remove-unused-t-option-in-dbcheck.c-fixes-bug-2453.patch @@ -0,0 +1,25 @@ +From 5a064f40a393193d057bd5a6d649ff4102aad742 Mon Sep 17 00:00:00 2001 +From: Kern Sibbald +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 set debug level to \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 + diff --git a/bacula.spec b/bacula.spec index af4cad8..93bc9cf 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 9.4.4 -Release: 5 +Release: 6 Summary: Cross platform network backup for Linux, Unix, Mac and Windows License: AGPLv3 with exceptions URL: http://www.bacula.org @@ -19,6 +19,7 @@ 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 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 @@ -313,6 +314,9 @@ fi %{_mandir}/man* %changelog +* Tue May 30 2023 chenchen - 9.4.4-6 +- Remove unused -t option in dbcheck.c + * Fri Apr 15 2022 xu_ping - 9.4.4-5 - Fix configure error -- Gitee