From 0a8bf1947b52b3abef3588f6ce69b1c4bcec89ac Mon Sep 17 00:00:00 2001 From: David Fan Date: Mon, 1 Jul 2024 09:26:43 +0000 Subject: [PATCH] bacula package is retired on branch c10s for CS-2311 --- .gitignore | 64 ---- README.Redhat | 90 ----- bacula-autoconf.patch | 35 -- bacula-compile-options.patch | 166 --------- bacula-desktop.patch | 23 -- bacula-dir.service | 13 - bacula-dir.sysconfig | 9 - bacula-director.xml | 6 - bacula-docker-plugin.patch | 27 -- bacula-fd.service | 14 - bacula-fd.sysconfig | 21 -- bacula-install.patch | 137 ------- bacula-non-free-code.patch | 696 ----------------------------------- bacula-openssl.patch | 43 --- bacula-scripts.patch | 12 - bacula-sd.service | 13 - bacula-sd.sysconfig | 9 - bacula-seg-fault.patch | 21 -- bacula-storage.xml | 6 - bacula-traceback-man.patch | 23 -- dead.package | 1 + 21 files changed, 1 insertion(+), 1428 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.Redhat delete mode 100644 bacula-autoconf.patch delete mode 100644 bacula-compile-options.patch delete mode 100644 bacula-desktop.patch delete mode 100644 bacula-dir.service delete mode 100644 bacula-dir.sysconfig delete mode 100644 bacula-director.xml delete mode 100644 bacula-docker-plugin.patch delete mode 100644 bacula-fd.service delete mode 100644 bacula-fd.sysconfig delete mode 100644 bacula-install.patch delete mode 100644 bacula-non-free-code.patch delete mode 100644 bacula-openssl.patch delete mode 100644 bacula-scripts.patch delete mode 100644 bacula-sd.service delete mode 100644 bacula-sd.sysconfig delete mode 100644 bacula-seg-fault.patch delete mode 100644 bacula-storage.xml delete mode 100644 bacula-traceback-man.patch create mode 100644 dead.package diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 57a1611..0000000 --- a/.gitignore +++ /dev/null @@ -1,64 +0,0 @@ -bacula-5.0.2.tar.gz -bacula-docs-5.0.2.tar.bz2 -bacula-5.0.3.tar.gz -bacula-docs-5.0.3.tar.bz2 -/bacula-5.2.2.tar.gz -/bacula-docs-5.2.2.tar.bz2 -/bacula-5.2.3.tar.gz -/bacula-docs-5.2.3.tar.bz2 - -/bacula-5.2.4.tar.gz -/bacula-5.2.5.tar.gz -/bacula-5.2.6.tar.gz -/bacula-5.2.7.tar.gz -/bacula-5.2.8.tar.gz -/bacula-5.2.9.tar.gz -/bacula-5.2.10.tar.gz -/bacula-5.2.11.tar.gz -/bacula-5.2.12.tar.gz -/bacula-5.2.13.tar.gz -/bacula-7.0.0.tar.gz -/bacula-7.0.1.tar.gz -/bacula-7.0.2.tar.gz -/bacula-7.0.3.tar.gz -/bacula-7.0.4.tar.gz -/bacula-7.0.5.tar.gz -/bacula-7.2.0.tar.gz -/bacula-7.4.0.tar.gz -/bacula-7.4.1.tar.gz -/bacula-7.4.2.tar.gz -/bacula-7.4.3.tar.gz -/bacula-7.4.4.tar.gz -/bacula-7.4.5.tar.gz -/bacula-7.4.6.tar.gz -/bacula-7.4.7.tar.gz -/bacula-9.0.0.tar.gz -/bacula-9.0.1.tar.gz -/bacula-9.0.2.tar.gz -/bacula-9.0.3.tar.gz -/bacula-9.0.4.tar.gz -/bacula-9.0.5.tar.gz -/bacula-9.0.6.tar.gz -/bacula-9.0.7.tar.gz -/bacula-9.0.8.tar.gz -/bacula-9.2.1.tar.gz -/bacula-9.4.0.tar.gz -/bacula-9.4.1.tar.gz -/bacula-9.4.2.tar.gz -/bacula-9.4.3.tar.gz -/bacula-9.4.4.tar.gz -/bacula-9.6.2.tar.gz -/bacula-9.6.3.tar.gz -/bacula-9.6.5.tar.gz -/bacula-9.6.6.tar.gz -/bacula-9.6.7.tar.gz -/bacula-11.0.0.tar.gz -/bacula-11.0.1.tar.gz -/bacula-11.0.2.tar.gz -/bacula-11.0.3.tar.gz -/bacula-11.0.5.tar.gz -/bacula-11.0.6.tar.gz -/bacula-13.0.0.tar.gz -/bacula-13.0.1.tar.gz -/bacula-13.0.2.tar.gz -/bacula-13.0.3.tar.gz diff --git a/README.Redhat b/README.Redhat deleted file mode 100644 index d6c1403..0000000 --- a/README.Redhat +++ /dev/null @@ -1,90 +0,0 @@ -======== Features - -- Standard components: director, storage, client, docs, bconsole. -- Graphical components: bat, bacula-tray-monitor. -- Tab completion for bconsole. -- Nagios plugin. -- HTML/PDF docs. -- Quick start guides. -- File Daemon bpipe-fd plugin. -- POSIX.1e capabilities for File Daemon. -- GZIP/LZO compression. -- Static uid/gid of 133 (see "setup" package). -- SQL libraries needed only by Director and Storage daemons. -- SQL backend management through the alternatives system. - -======== Quick start - -Please look at the following files for a quick start with the various database -backends: - -- quickstart_mysql.txt -- quickstart_postgresql.txt -- quickstart_sqlite3.txt - -======== PostgreSQL, MySQL and SQLite databases - -Bacula director supports different databases backends, if you want to switch -away from the default PostgreSQL one you need to change the "libbaccats" (the -catalogue library) symlink to the real library. - -To change to a different backend, issue the following command: - -# alternatives --config libbaccats.so - -There are 3 programs which provide 'libbaccats.so'. - - Selection Command ------------------------------------------------ - 1 /usr/lib64/libbaccats-mysql.so - 2 /usr/lib64/libbaccats-sqlite3.so -*+ 3 /usr/lib64/libbaccats-postgresql.so - -Enter to keep the current selection[+], or type selection number: 1 - -There is NO need to edit any part in the Bacula Director configuration; for the -purposes of the database creation steps, the bacula-dir.conf configuration file -can be left at their default values. - -======== Switiching between PostgreSQL, MySQL and SQLite backends - -To switch the configured backend to another one, follow the above procedure. -Again, there's no need to edit the Bacula Director configuration file; the -catalog resource can be left as is. - -Importing and exporting data between the various database formats is up to the -user. If the database will be re-initialized from scratch, follow the quick -start guides mentioned above. - -======== Upgrading from old Redhat releases - -When upgrading from old Redhat releases, the "bacula-libs-sql" package takes -care of making the appropriate selection for the database backend based on what -was previously configured on the old system. - -The default permissions in the "/etc/bacula" folder have changed; please perform -the following commands for restoring the permissions for the correct operation -of the daemons. - -# chown -R root:root /etc/bacula -# chmod 755 /etc/bacula -# chmod 640 /etc/bacula/* -# chgrp bacula /etc/bacula/bacula-dir.conf /etc/bacula/query.sql - -All the files that are part of the Director configuration (included with @) must -of course have the same permissions as the main configuration file. - -======== Documentation - -To see all the available documentation in both HTML and PDF formats, please -install the "bacula-docs" package. - -======== Granting user access to the console - -The console configuration files are normally readable only by root for security -reasons. If you need to grant access to a specific user or group of users to -the consoles, you can adjust the ACLs on the configuration files. For example: - -# setfacl -m u:user:r /etc/bacula/bconsole.conf /etc/bacula/bat.conf - -This way the user 'user' can open the console without superuser privileges. diff --git a/bacula-autoconf.patch b/bacula-autoconf.patch deleted file mode 100644 index 0cfe4c8..0000000 --- a/bacula-autoconf.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur bacula-7.0.4.old/autoconf/ltmain.sh bacula-7.0.4/autoconf/ltmain.sh ---- bacula-7.0.4.old/autoconf/ltmain.sh 2014-07-24 17:43:23.085243360 +0200 -+++ bacula-7.0.4/autoconf/ltmain.sh 2014-07-24 17:45:12.505330842 +0200 -@@ -2429,6 +2429,7 @@ - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension -+ -soname SONAME override the standard shared object name - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries -@@ -5434,6 +5435,11 @@ - prev= - continue - ;; -+ soname) -+ soname_spec="$arg" -+ prev= -+ continue -+ ;; - weak) - func_append weak_libs " $arg" - prev= -@@ -5754,6 +5760,11 @@ - continue - ;; - -+ -soname) -+ prev=soname -+ continue -+ ;; -+ - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that diff --git a/bacula-compile-options.patch b/bacula-compile-options.patch deleted file mode 100644 index 70e3540..0000000 --- a/bacula-compile-options.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -Naur bacula-13.0.0.old/autoconf/bacula-macros/db.m4 bacula-13.0.0/autoconf/bacula-macros/db.m4 ---- bacula-13.0.0.old/autoconf/bacula-macros/db.m4 2022-07-13 15:03:38.205154215 +0200 -+++ bacula-13.0.0/autoconf/bacula-macros/db.m4 2022-07-13 15:03:43.486275326 +0200 -@@ -102,7 +102,7 @@ - fi - DBI_INCLUDE=-I$DBI_INCDIR - if test x$use_libtool != xno; then -- DBI_LIBS="-R $DBI_LIBDIR -L$DBI_LIBDIR -ldbi" -+ DBI_LIBS="-L$DBI_LIBDIR -ldbi" - else - DBI_LIBS="-L$DBI_LIBDIR -ldbi" - fi -@@ -494,7 +494,7 @@ - elif test -f $MYSQL_LIBDIR/libmysqlclient_r.a \ - -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then - if test x$use_libtool != xno; then -- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz" -+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" - else - MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz" - fi -@@ -625,7 +625,7 @@ - fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test x$use_libtool != xno; then -- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" -+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" - else - MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt" - fi -@@ -715,7 +715,7 @@ - fi - INGRES_INCLUDE=-I$INGRES_INCDIR - if test x$use_libtool != xno; then -- INGRES_LIBS="-R $INGRES_LIBDIR -L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" -+ INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" - else - INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" - fi -@@ -803,7 +803,7 @@ - fi - SQLITE_INCLUDE=-I$SQLITE_INCDIR - if test x$use_libtool != xno; then -- SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3" -+ SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3" - else - SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3" - fi -@@ -936,7 +936,7 @@ - - POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR - if test x$use_libtool != xno; then -- POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq" -+ POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" - else - POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" - fi -diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/configure.in ---- bacula-13.0.0.old/autoconf/configure.in 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/configure.in 2022-07-13 15:03:43.489275395 +0200 -@@ -16,7 +16,7 @@ - cd ${BUILD_DIR} - AC_SUBST(BUILD_DIR) - AC_SUBST(TOP_DIR) --AC_CONFIG_AUX_DIR(${BUILD_DIR}/autoconf) -+AC_CONFIG_AUX_DIR(autoconf) - AC_CONFIG_HEADERS(src/config.h:autoconf/config.h.in) - - dnl minimal Win32 stuff for "make clean" -@@ -217,7 +217,6 @@ - QMAKE_LIBTOOL="${BUILD_DIR}/libtool" - FD_PLUGIN_DIR="src/plugins/fd" - DIR_PLUGIN_DIR="src/plugins/dir" -- DLIB="-rpath \$(libdir)" - have_plugins=yes - else - DEFAULT_OBJECT_TYPE=".o" -@@ -3508,11 +3507,6 @@ - AC_DEFINE(FDLIBS) - - CFLAGS=${CFLAGS--O} -- --if test x$have_gcc = xyes ; then -- CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" -- CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti" --fi - LDFLAGS=${LDFLAGS--O} - CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS" -diff -Naur bacula-13.0.0.old/autoconf/Make.common.in bacula-13.0.0/autoconf/Make.common.in ---- bacula-13.0.0.old/autoconf/Make.common.in 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/Make.common.in 2022-07-13 15:03:43.490275418 +0200 -@@ -39,7 +39,7 @@ - mandir = @mandir@ - manext = 8 - --NO_ECHO = @ -+NO_ECHO = - - # Tools & program stuff - CC = @CC@ -@@ -75,12 +75,12 @@ - DEFAULT_ARCHIVE_TYPE = @DEFAULT_ARCHIVE_TYPE@ - DEFAULT_SHARED_OBJECT_TYPE = @DEFAULT_SHARED_OBJECT_TYPE@ - LIBTOOL = @BUILD_DIR@/libtool --LIBTOOL_COMPILE = @LIBTOOL@ --silent --tag=CXX --mode=compile --LIBTOOL_LINK = @LIBTOOL@ --silent --tag=CXX --mode=link --LIBTOOL_INSTALL = @LIBTOOL@ --silent --tag=CXX --mode=install --LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --silent --tag=CXX --finish --mode=install --LIBTOOL_UNINSTALL = @LIBTOOL@ --silent --tag=CXX --mode=uninstall --LIBTOOL_CLEAN = @LIBTOOL@ --silent --tag=CXX --mode=clean -+LIBTOOL_COMPILE = @LIBTOOL@ --tag=CXX --mode=compile -+LIBTOOL_LINK = @LIBTOOL@ --tag=CXX --mode=link -+LIBTOOL_INSTALL = @LIBTOOL@ --tag=CXX --mode=install -+LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --tag=CXX --finish --mode=install -+LIBTOOL_UNINSTALL = @LIBTOOL@ --tag=CXX --mode=uninstall -+LIBTOOL_CLEAN = @LIBTOOL@ --tag=CXX --mode=clean - - # Flags & libs - CFLAGS = @CFLAGS@ @OPENSSL_INC@ -diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-console/bat.pro.in ---- bacula-13.0.0.old/src/qt-console/bat.pro.in 2022-07-13 15:03:38.149152930 +0200 -+++ bacula-13.0.0/src/qt-console/bat.pro.in 2022-07-13 15:03:43.490275418 +0200 -@@ -23,8 +23,8 @@ - DEPENDPATH += . - INCLUDEPATH += .. . ./console ./restore ./select - 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 -+LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link -+LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += .libs/* bat -@@ -195,3 +195,8 @@ - QMAKE_EXTRA_TARGETS += depend - - TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts -+ -+QMAKE_CPPFLAGS += @CPPFLAGS@ -+QMAKE_CFLAGS += @CFLAGS@ -+QMAKE_CXXFLAGS += @CXXFLAGS@ -+QMAKE_LFLAGS += @LDFLAGS@ -diff -Naur bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in ---- bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-13 15:03:38.166153320 +0200 -+++ bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-13 15:03:43.491275441 +0200 -@@ -36,8 +36,8 @@ - DEPENDPATH += . - INCLUDEPATH += ../.. . - QMAKE_CC = $(CXX) --LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link --LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install -+LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link -+LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor -@@ -69,3 +69,8 @@ - INCLUDEPATH += $$JOURNAL_DIR - - TRANSLATIONS += ts/tm_fr.ts ts/tm_de.ts ts/tm_ja.ts -+ -+QMAKE_CPPFLAGS += @CPPFLAGS@ -+QMAKE_CFLAGS += @CFLAGS@ -+QMAKE_CXXFLAGS += @CXXFLAGS@ -+QMAKE_LFLAGS += @LDFLAGS@ diff --git a/bacula-desktop.patch b/bacula-desktop.patch deleted file mode 100644 index e4464d8..0000000 --- a/bacula-desktop.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in ---- bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:11:40.976119619 +0200 -+++ bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:16:52.055851377 +0200 -@@ -5,6 +5,5 @@ - Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/bacula-tray-monitor.conf - Terminal=false - Type=Application --Encoding=UTF-8 - X-Desktop-File-Install-Version=0.3 --Categories=System;Application;Utility;X-Red-Hat-Base; -+Categories=System;Utility; -diff -Naur bacula-9.6.5.old/scripts/bat.desktop.in bacula-9.6.5/scripts/bat.desktop.in ---- bacula-9.6.5.old/scripts/bat.desktop.in 2020-07-24 09:11:40.976119619 +0200 -+++ bacula-9.6.5/scripts/bat.desktop.in 2020-07-24 09:17:21.178294361 +0200 -@@ -5,7 +5,6 @@ - Exec=@sbindir@/bat -c @sysconfdir@/bat.conf - Terminal=false - Type=Application --Encoding=UTF-8 - StartupNotify=true - X-Desktop-File-Install-Version=0.3 --Categories=System;Application;Utility;X-Red-Hat-Base; -+Categories=System;Utility; diff --git a/bacula-dir.service b/bacula-dir.service deleted file mode 100644 index f7bd48e..0000000 --- a/bacula-dir.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Bacula Director -Documentation=man:bacula-dir(8) -After=network.target nss-lookup.target - -[Service] -Environment=CONFIG=/etc/bacula/bacula-dir.conf -EnvironmentFile=-/etc/sysconfig/bacula-dir -ExecStart=/usr/sbin/bacula-dir -f $OPTS -c $CONFIG -u $DIR_USER -g $DIR_GROUP -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/bacula-dir.sysconfig b/bacula-dir.sysconfig deleted file mode 100644 index 4250591..0000000 --- a/bacula-dir.sysconfig +++ /dev/null @@ -1,9 +0,0 @@ -# User and group for bacula director -# If no user is set bacula will run as root - -DIR_USER=bacula -DIR_GROUP=bacula - -# Useful for debugging -# -# OPTS="-d 200" diff --git a/bacula-director.xml b/bacula-director.xml deleted file mode 100644 index f83f169..0000000 --- a/bacula-director.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Bacula Director - Bacula Director, the central brain of Bacula. You need the bacula-director package installed for this option to be useful. - - diff --git a/bacula-docker-plugin.patch b/bacula-docker-plugin.patch deleted file mode 100644 index cb06696..0000000 --- a/bacula-docker-plugin.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/configure.in ---- bacula-13.0.0.old/autoconf/configure.in 2022-07-08 14:53:19.765602625 +0200 -+++ bacula-13.0.0/autoconf/configure.in 2022-07-08 14:54:32.972908546 +0200 -@@ -3404,20 +3404,9 @@ - ] - ) - if test x$support_docker = xyes -o x$support_docker = xauto; then -- AC_CHECK_PROG(docker_bin, docker, yes, no, "/usr/bin/") -- if test x$docker_bin = xyes; then -- support_docker=yes -- FD_PLUGIN_DIR="${FD_PLUGIN_DIR} src/plugins/fd/docker" -- FD_PLUGIN_INSTALL="${FD_PLUGIN_INSTALL} install-docker" -- else -- if test x$support_docker = xyes; then -- echo " " -- echo "You enabled a Docker Plugin build but 'docker' command not found." -- echo " " -- exit 1 -- fi -- support_docker=no -- fi -+ support_docker=yes -+ FD_PLUGIN_DIR="${FD_PLUGIN_DIR} src/plugins/fd/docker" -+ FD_PLUGIN_INSTALL="${FD_PLUGIN_INSTALL} install-docker" - fi - - dnl kubernetes Plugin diff --git a/bacula-fd.service b/bacula-fd.service deleted file mode 100644 index 2724c4b..0000000 --- a/bacula-fd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Bacula File Daemon -Documentation=man:bacula-fd(8) -After=network.target nss-lookup.target - -[Service] -Environment=CONFIG=/etc/bacula/bacula-fd.conf -EnvironmentFile=-/etc/sysconfig/bacula-fd -ExecStart=/usr/sbin/bacula-fd -f $OPTS -c $CONFIG -u $FD_USER -g $FD_GROUP -IOSchedulingClass=idle -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/bacula-fd.sysconfig b/bacula-fd.sysconfig deleted file mode 100644 index 09cae26..0000000 --- a/bacula-fd.sysconfig +++ /dev/null @@ -1,21 +0,0 @@ -# User and group for bacula client -# If no user is set bacula will run as root - -FD_USER=root -FD_GROUP=root - -# Useful for debugging -# -# OPTS="-d 200" - - -# Set the following options if you want to run bacula-fd with ReadAll -# capabilities after UID/GID switch. -# -# This allows the File Daemon to keep root read but drop write permission. -# This, however, has the side effect of disabling backups of extended -# attributes because this requires super user privileges. -# -# OPTS="-k" -# FD_USER="bacula" -# FD_GROUP="bacula" diff --git a/bacula-install.patch b/bacula-install.patch deleted file mode 100644 index 3eda6e3..0000000 --- a/bacula-install.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur bacula-13.0.0.old/autoconf/config.rpath bacula-13.0.0/autoconf/config.rpath ---- bacula-13.0.0.old/autoconf/config.rpath 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/config.rpath 2022-07-13 15:43:05.223631146 +0200 -@@ -555,7 +555,7 @@ - - # Flag to hardcode \$libdir into a binary during linking. - # This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" -+hardcode_libdir_flag_spec="" - - # Whether we need a single -rpath flag with a separated argument. - hardcode_libdir_separator="$hardcode_libdir_separator" -diff -Naur bacula-13.0.0.old/examples/nagios/check_bacula/Makefile.in bacula-13.0.0/examples/nagios/check_bacula/Makefile.in ---- bacula-13.0.0.old/examples/nagios/check_bacula/Makefile.in 2022-07-13 15:03:38.216154467 +0200 -+++ bacula-13.0.0/examples/nagios/check_bacula/Makefile.in 2022-07-20 12:39:13.750123318 +0200 -@@ -72,7 +72,8 @@ - (cd $(srcdir); $(RMF) Makefile) - - install: all -- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula -+ $(MKDIR) $(DESTDIR)$(libdir)/nagios/plugins -+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(libdir)/nagios/plugins/check_bacula - - uninstall: - (cd $(DESTDIR)$(sbindir); $(RMF) check_bacula) -diff -Naur bacula-13.0.0.old/scripts/logwatch/logfile.bacula.conf.in bacula-13.0.0/scripts/logwatch/logfile.bacula.conf.in ---- bacula-13.0.0.old/scripts/logwatch/logfile.bacula.conf.in 2022-07-13 15:03:38.130152495 +0200 -+++ bacula-13.0.0/scripts/logwatch/logfile.bacula.conf.in 2022-07-20 12:39:13.751123337 +0200 -@@ -1,3 +1,3 @@ - # What actual file? Defaults to LogPath if not absolute path.... --LogFile = @logdir@/bacula.log -+LogFile = @logdir@/*.log - -diff -Naur bacula-13.0.0.old/scripts/Makefile.in bacula-13.0.0/scripts/Makefile.in ---- bacula-13.0.0.old/scripts/Makefile.in 2022-07-13 15:03:38.127152426 +0200 -+++ bacula-13.0.0/scripts/Makefile.in 2022-07-20 12:39:13.752123356 +0200 -@@ -67,7 +67,6 @@ - $(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \ - fi - $(INSTALL_SCRIPT) baculabackupreport $(DESTDIR)$(scriptdir)/baculabackupreport -- $(INSTALL_SCRIPT) bacula-tray-monitor.desktop $(DESTDIR)$(scriptdir)/bacula-tray-monitor.desktop - chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ - $(DESTDIR)$(scriptdir)/btraceback.dbx \ - $(DESTDIR)$(scriptdir)/btraceback.mdb -diff -Naur bacula-13.0.0.old/src/cats/make_sqlite3_tables.in bacula-13.0.0/src/cats/make_sqlite3_tables.in ---- bacula-13.0.0.old/src/cats/make_sqlite3_tables.in 2022-07-13 15:03:38.137152655 +0200 -+++ bacula-13.0.0/src/cats/make_sqlite3_tables.in 2022-07-20 12:39:13.753123374 +0200 -@@ -560,4 +560,5 @@ - echo "" - - chmod 640 ${db_name}.db -+chown bacula:bacula ${db_name}.db - exit 0 -diff -Naur bacula-13.0.0.old/src/dird/bacula-dir.conf.in bacula-13.0.0/src/dird/bacula-dir.conf.in ---- bacula-13.0.0.old/src/dird/bacula-dir.conf.in 2022-07-13 15:03:38.185153756 +0200 -+++ bacula-13.0.0/src/dird/bacula-dir.conf.in 2022-07-20 12:39:13.753123374 +0200 -@@ -18,7 +18,7 @@ - Director { # define myself - Name = @basename@-dir - DIRport = @dir_port@ # where we listen for UA connections -- QueryFile = "@scriptdir@/query.sql" -+ QueryFile = "@sysconfdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - Maximum Concurrent Jobs = 20 -diff -Naur bacula-13.0.0.old/src/dird/Makefile.in bacula-13.0.0/src/dird/Makefile.in ---- bacula-13.0.0.old/src/dird/Makefile.in 2022-07-13 15:03:38.185153756 +0200 -+++ bacula-13.0.0/src/dird/Makefile.in 2022-07-20 12:39:13.754123393 +0200 -@@ -126,11 +126,11 @@ - @if test "x${dir_group}" != "x"; then \ - chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ - fi -- @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ -+ @if test -f ${DESTDIR}${sysconfdir}/query.sql; then \ - echo " ==> Saving existing query.sql to query.sql.old"; \ -- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \ -+ $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \ - fi -- ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql -+ ${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql - @if test -f static-bacula-dir; then \ - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \ - fi -@@ -139,7 +139,7 @@ - uninstall: - (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson) - (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) -- (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) -+ (cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql) - - - -diff -Naur bacula-13.0.0.old/src/plugins/fd/docker/Makefile bacula-13.0.0/src/plugins/fd/docker/Makefile ---- bacula-13.0.0.old/src/plugins/fd/docker/Makefile 2022-07-13 15:03:38.182153687 +0200 -+++ bacula-13.0.0/src/plugins/fd/docker/Makefile 2022-07-20 12:39:36.651554865 +0200 -@@ -25,11 +25,11 @@ - - .c.lo: - @echo "Compiling $< ..." -- $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $< -+ $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(working_dir)\" -c $< - - %.lo: %.c %.h - @echo "Pattern compiling $< ..." -- $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(DESTDIR)$(working_dir)\" -c $(@:.lo=.c) -+ $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) $(CFLAGS) -I${SRCDIR} -I${FDDIR} -I${FDPLUGDIR} -I${LIBDIR} -DWORKDIR=\"$(working_dir)\" -c $(@:.lo=.c) - - docker-fd.la: Makefile $(DOCKEROBJ) $(PLUGINLIBDIR)/pluginlib.lo $(DOCKERSRCH) - @echo "Linking $(@:.la=.so) ..." -diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-console/bat.pro.in ---- bacula-13.0.0.old/src/qt-console/bat.pro.in 2022-07-20 12:39:07.881012727 +0200 -+++ bacula-13.0.0/src/qt-console/bat.pro.in 2022-07-20 12:39:13.755123412 +0200 -@@ -12,10 +12,10 @@ - - datarootdir = @datarootdir@ - bins.path = /$(DESTDIR)@sbindir@ --bins.files = bat -+bins.files = .libs/bat - confs.path = /$(DESTDIR)@sysconfdir@ - confs.commands = ./install_conf_file --help.path = /$(DESTDIR)@docdir@ -+help.path = /$(DESTDIR)@htmldir@ - help.files = help/*.html images/status.png images/mail-message-new.png - - TEMPLATE = app -diff -Naur bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in ---- bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-20 12:39:08.041015742 +0200 -+++ bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-20 12:39:13.756123431 +0200 -@@ -26,7 +26,7 @@ - - - bins.path = /$(DESTDIR)@sbindir@ --bins.files = bacula-tray-monitor -+bins.files = .libs/bacula-tray-monitor - confs.path = /$(DESTDIR)@sysconfdir@ - confs.commands = ./install_conf_file - diff --git a/bacula-non-free-code.patch b/bacula-non-free-code.patch deleted file mode 100644 index 3559a81..0000000 --- a/bacula-non-free-code.patch +++ /dev/null @@ -1,696 +0,0 @@ -diff -Naur bacula-13.0.0.old/src/lib/lib.h bacula-13.0.0/src/lib/lib.h ---- bacula-13.0.0.old/src/lib/lib.h 2022-07-08 14:50:02.281058244 +0200 -+++ bacula-13.0.0/src/lib/lib.h 2022-07-08 14:52:00.918190647 +0200 -@@ -57,7 +57,6 @@ - #include "fnmatch.h" - #endif - #include "md5.h" --#include "sha1.h" - #include "tree.h" - #include "watchdog.h" - #include "btimers.h" -diff -Naur bacula-13.0.0.old/src/lib/Makefile.in bacula-13.0.0/src/lib/Makefile.in ---- bacula-13.0.0.old/src/lib/Makefile.in 2022-07-08 14:50:02.285058315 +0200 -+++ bacula-13.0.0/src/lib/Makefile.in 2022-07-08 14:52:00.954191295 +0200 -@@ -40,7 +40,7 @@ - flist.h fnmatch.h guid_to_name.h htable.h lex.h \ - lib.h lz4.h md5.h mem_pool.h message.h \ - openssl.h plugins.h protos.h queue.h rblist.h \ -- runscript.h rwlock.h serial.h sellist.h sha1.h sha2.h \ -+ runscript.h rwlock.h serial.h sellist.h sha2.h \ - smartall.h status.h tls.h tree.h var.h \ - waitq.h watchdog.h workq.h \ - parse_conf.h ini.h \ -@@ -57,7 +57,7 @@ - guid_to_name.c hmac.c jcr.c lex.c lz4.c alist.c dlist.c \ - md5.c message.c mem_pool.c openssl.c \ - plugins.c priv.c queue.c bregex.c bsockcore.c \ -- runscript.c rwlock.c scan.c sellist.c serial.c sha1.c sha2.c \ -+ runscript.c rwlock.c scan.c sellist.c serial.c sha2.c \ - signal.c smartall.c rblist.c tls.c tree.c \ - util.c var.c watchdog.c workq.c btimers.c \ - worker.c flist.c bcollector.c collect.c \ -@@ -299,22 +299,6 @@ - $(RMF) md5.o - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c - --sha1sum: Makefile libbac.la sha1.c -- $(RMF) sha1.o -- $(CXX) -DSHA1_SUM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ sha1.o $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS) -- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/ -- $(RMF) sha1.o -- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c -- --sha1_test: Makefile libbac.la sha1.c unittests.o -- $(RMF) sha1.o -- $(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c -- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ sha1.o unittests.o $(DLIB) -lbac -lm $(LIBS) -- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/ -- $(RMF) sha1.o -- $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c -- - bsnprintf_test: Makefile libbac.la bsnprintf.c unittests.o - $(RMF) bsnprintf.o - $(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) -Wno-format-truncation bsnprintf.c -@@ -411,7 +395,7 @@ - - clean: libtool-clean - @$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3 -- @$(RMF) rwlock_test md5sum sha1sum -+ @$(RMF) rwlock_test md5sum - - realclean: clean - @$(RMF) tags -diff -Naur bacula-13.0.0.old/src/lib/sha1.c bacula-13.0.0/src/lib/sha1.c ---- bacula-13.0.0.old/src/lib/sha1.c 2022-07-08 14:50:02.287058351 +0200 -+++ bacula-13.0.0/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,517 +0,0 @@ --/* -- * sha1.c -- * -- * Description: -- * This file implements the Secure Hashing Algorithm 1 as -- * defined in FIPS PUB 180-1 published April 17, 1995. -- * -- * The SHA-1, produces a 160-bit message digest for a given -- * data stream. It should take about 2**n steps to find a -- * message with the same digest as a given message and -- * 2**(n/2) to find any two messages with the same digest, -- * when n is the digest size in bits. Therefore, this -- * algorithm can serve as a means of providing a -- * "fingerprint" for a message. -- * -- * Portability Issues: -- * SHA-1 is defined in terms of 32-bit "words". This code -- * uses (included via "sha1.h" to define 32 and 8 -- * bit unsigned integer types. If your C compiler does not -- * support 32 bit unsigned integers, this code is not -- * appropriate. -- * -- * Caveats: -- * SHA-1 is designed to work with messages less than 2^64 bits -- * long. Although SHA-1 allows a message digest to be generated -- * for messages of any number of bits less than 2^64, this -- * implementation only works with messages with a length that is -- * a multiple of the size of an 8-bit character. -- * -- * See sha1.h for copyright -- */ -- --#include "sha1.h" -- --/* -- * Define the SHA1 circular left shift macro -- */ --#define SHA1CircularShift(bits,word) \ -- (((word) << (bits)) | ((word) >> (32-(bits)))) -- --/* Local Function Prototyptes */ --static void SHA1PadMessage(SHA1Context *); --static void SHA1ProcessMessageBlock(SHA1Context *); -- --/* -- * SHA1Init -- * -- * Description: -- * This function will initialize the SHA1Context in preparation -- * for computing a new SHA1 message digest. -- * -- * Parameters: -- * context: [in/out] -- * The context to reset. -- * -- * Returns: -- * sha Error Code. -- * -- */ --int SHA1Init(SHA1Context *context) --{ -- if (!context) -- { -- return shaNull; -- } -- -- context->Length_Low = 0; -- context->Length_High = 0; -- context->Message_Block_Index = 0; -- -- context->Intermediate_Hash[0] = 0x67452301; -- context->Intermediate_Hash[1] = 0xEFCDAB89; -- context->Intermediate_Hash[2] = 0x98BADCFE; -- context->Intermediate_Hash[3] = 0x10325476; -- context->Intermediate_Hash[4] = 0xC3D2E1F0; -- -- context->Computed = 0; -- context->Corrupted = 0; -- -- return shaSuccess; --} -- --/* -- * SHA1Final -- * -- * Description: -- * This function will return the 160-bit message digest into the -- * Message_Digest array provided by the caller. -- * NOTE: The first octet of hash is stored in the 0th element, -- * the last octet of hash in the 19th element. -- * -- * Parameters: -- * context: [in/out] -- * The context to use to calculate the SHA-1 hash. -- * Message_Digest: [out] -- * Where the digest is returned. -- * -- * Returns: -- * sha Error Code. -- * -- */ --int SHA1Final(SHA1Context *context, -- uint8_t Message_Digest[SHA1HashSize]) --{ -- int i; -- -- if (!context || !Message_Digest) { -- return shaNull; -- } -- -- if (context->Corrupted) { -- return context->Corrupted; -- } -- -- if (!context->Computed) { -- SHA1PadMessage(context); -- for(i=0; i<64; ++i) { -- /* message may be sensitive, clear it out */ -- context->Message_Block[i] = 0; -- } -- context->Length_Low = 0; /* and clear length */ -- context->Length_High = 0; -- context->Computed = 1; -- -- } -- -- for(i = 0; i < SHA1HashSize; ++i) { -- Message_Digest[i] = context->Intermediate_Hash[i>>2] -- >> 8 * ( 3 - ( i & 0x03 ) ); -- } -- -- return shaSuccess; --} -- --/* -- * SHA1Update -- * -- * Description: -- * This function accepts an array of octets as the next portion -- * of the message. -- * -- * Parameters: -- * context: [in/out] -- * The SHA context to update -- * message_array: [in] -- * An array of characters representing the next portion of -- * the message. -- * length: [in] -- * The length of the message in message_array -- * -- * Returns: -- * sha Error Code. -- * -- */ --int SHA1Update(SHA1Context *context, -- const uint8_t *message_array, -- unsigned length) --{ -- if (!length) { -- return shaSuccess; -- } -- -- if (!context || !message_array) { -- return shaNull; -- } -- -- if (context->Computed) { -- context->Corrupted = shaStateError; -- -- return shaStateError; -- } -- -- if (context->Corrupted) { -- return context->Corrupted; -- } -- while(length-- && !context->Corrupted) { -- context->Message_Block[context->Message_Block_Index++] = -- (*message_array & 0xFF); -- -- context->Length_Low += 8; -- if (context->Length_Low == 0) { -- context->Length_High++; -- if (context->Length_High == 0) { -- /* Message is too long */ -- context->Corrupted = 1; -- } -- } -- -- if (context->Message_Block_Index == 64) { -- SHA1ProcessMessageBlock(context); -- } -- -- message_array++; -- } -- -- return shaSuccess; --} -- --/* -- * SHA1ProcessMessageBlock -- * -- * Description: -- * This function will process the next 512 bits of the message -- * stored in the Message_Block array. -- * -- * Parameters: -- * None. -- * -- * Returns: -- * Nothing. -- * -- * Comments: -- -- * Many of the variable names in this code, especially the -- * single character names, were used because those were the -- * names used in the publication. -- * -- * -- */ --static void SHA1ProcessMessageBlock(SHA1Context *context) --{ -- const uint32_t K[] = { /* Constants defined in SHA-1 */ -- 0x5A827999, -- 0x6ED9EBA1, -- 0x8F1BBCDC, -- 0xCA62C1D6 -- }; -- int t; /* Loop counter */ -- uint32_t temp; /* Temporary word value */ -- uint32_t W[80]; /* Word sequence */ -- uint32_t A, B, C, D, E; /* Word buffers */ -- -- /* -- * Initialize the first 16 words in the array W -- */ -- for(t = 0; t < 16; t++) { -- W[t] = context->Message_Block[t * 4] << 24; -- W[t] |= context->Message_Block[t * 4 + 1] << 16; -- W[t] |= context->Message_Block[t * 4 + 2] << 8; -- W[t] |= context->Message_Block[t * 4 + 3]; -- } -- -- for(t = 16; t < 80; t++) { -- W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); -- } -- -- A = context->Intermediate_Hash[0]; -- B = context->Intermediate_Hash[1]; -- C = context->Intermediate_Hash[2]; -- D = context->Intermediate_Hash[3]; -- E = context->Intermediate_Hash[4]; -- -- for(t = 0; t < 20; t++) { -- temp = SHA1CircularShift(5,A) + -- ((B & C) | ((~B) & D)) + E + W[t] + K[0]; -- E = D; -- D = C; -- C = SHA1CircularShift(30,B); -- -- B = A; -- A = temp; -- } -- -- for(t = 20; t < 40; t++) { -- temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]; -- E = D; -- D = C; -- C = SHA1CircularShift(30,B); -- B = A; -- A = temp; -- } -- -- for(t = 40; t < 60; t++) { -- temp = SHA1CircularShift(5,A) + -- ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]; -- E = D; -- D = C; -- C = SHA1CircularShift(30,B); -- B = A; -- A = temp; -- } -- -- for(t = 60; t < 80; t++) { -- temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]; -- E = D; -- D = C; -- C = SHA1CircularShift(30,B); -- B = A; -- A = temp; -- } -- -- context->Intermediate_Hash[0] += A; -- context->Intermediate_Hash[1] += B; -- context->Intermediate_Hash[2] += C; -- context->Intermediate_Hash[3] += D; -- context->Intermediate_Hash[4] += E; -- -- context->Message_Block_Index = 0; --} -- --/* -- * SHA1PadMessage -- * -- -- * Description: -- * According to the standard, the message must be padded to an even -- * 512 bits. The first padding bit must be a '1'. The last 64 -- * bits represent the length of the original message. All bits in -- * between should be 0. This function will pad the message -- * according to those rules by filling the Message_Block array -- * accordingly. It will also call the ProcessMessageBlock function -- * provided appropriately. When it returns, it can be assumed that -- * the message digest has been computed. -- * -- * Parameters: -- * context: [in/out] -- * The context to pad -- * ProcessMessageBlock: [in] -- * The appropriate SHA*ProcessMessageBlock function -- * Returns: -- * Nothing. -- * -- */ -- --static void SHA1PadMessage(SHA1Context *context) --{ -- /* -- * Check to see if the current message block is too small to hold -- * the initial padding bits and length. If so, we will pad the -- * block, process it, and then continue padding into a second -- * block. -- */ -- if (context->Message_Block_Index > 55) { -- context->Message_Block[context->Message_Block_Index++] = 0x80; -- while(context->Message_Block_Index < 64) { -- context->Message_Block[context->Message_Block_Index++] = 0; -- } -- -- SHA1ProcessMessageBlock(context); -- -- while(context->Message_Block_Index < 56) { -- context->Message_Block[context->Message_Block_Index++] = 0; -- } -- } else { -- context->Message_Block[context->Message_Block_Index++] = 0x80; -- while(context->Message_Block_Index < 56) { -- -- context->Message_Block[context->Message_Block_Index++] = 0; -- } -- } -- -- /* -- * Store the message length as the last 8 octets -- */ -- context->Message_Block[56] = context->Length_High >> 24; -- context->Message_Block[57] = context->Length_High >> 16; -- context->Message_Block[58] = context->Length_High >> 8; -- context->Message_Block[59] = context->Length_High; -- context->Message_Block[60] = context->Length_Low >> 24; -- context->Message_Block[61] = context->Length_Low >> 16; -- context->Message_Block[62] = context->Length_Low >> 8; -- context->Message_Block[63] = context->Length_Low; -- -- SHA1ProcessMessageBlock(context); --} -- -- --#ifndef TEST_PROGRAM --#define TEST_PROGRAM_A --#endif -- --#ifdef TEST_PROGRAM --/* -- * sha1test.c -- * -- * Description: -- * This file will exercise the SHA-1 code performing the three -- * tests documented in FIPS PUB 180-1 plus one which calls -- * SHA1Input with an exact multiple of 512 bits, plus a few -- * error test checks. -- * -- * Portability Issues: -- * None. -- * -- */ -- --#include --#include --#include --#include "sha1.h" --#include "unittests.h" -- --#define NRTESTS 4 -- --/* -- * Define patterns for testing -- */ --#define TEST1 "abc" --#define TEST2a "abcdbcdecdefdefgefghfghighijhi" -- --#define TEST2b "jkijkljklmklmnlmnomnopnopq" --#define TEST2 TEST2a TEST2b --#define TEST3 "a" --#define TEST4a "01234567012345670123456701234567" --#define TEST4b "01234567012345670123456701234567" -- /* an exact multiple of 512 bits */ --#define TEST4 TEST4a TEST4b -- --const char *testarray[NRTESTS] = --{ -- TEST1, -- TEST2, -- TEST3, -- TEST4 --}; -- --int repeatcount[NRTESTS] = { 1, 1, 1000000, 10 }; -- --const uint8_t resultarray[NRTESTS][20] = --{ -- { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E, 0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D }, -- { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE, 0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 }, -- { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E, 0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }, -- { 0xDE, 0xA3, 0x56, 0xA2, 0xCD, 0xDD, 0x90, 0xC7, 0xA7, 0xEC, 0xED, 0xC5, 0xEB, 0xB5, 0x63, 0x93, 0x4F, 0x46, 0x04, 0x52 }, --}; -- --int main() --{ -- Unittests sha1_test("sha1_test"); -- SHA1Context sha; -- int i, j, err; -- uint8_t Message_Digest[20]; -- bool check_cont; -- bool ct; -- -- /* -- * Perform SHA-1 tests -- */ -- for(j = 0; j < 4; ++j) { -- // printf( "\nTest %d: %d, '%s'\n", j+1, repeatcount[j], testarray[j]); -- err = SHA1Init(&sha); -- nok(err, "Test SHA1Init"); -- if (err) { -- break; /* out of for j loop */ -- } -- ct = true; -- for(i = 0; i < repeatcount[j]; ++i) { -- err = SHA1Update(&sha, (const unsigned char *) testarray[j], strlen(testarray[j])); -- if (i < 5){ -- nok(err, "Test SHA1Update"); -- } -- if (ct && repeatcount[j] > 4 && i > 4){ -- ct = false; -- printf("...\n"); -- } -- if (err) { -- nok(err, "Test SHA1Update"); -- break; /* out of for i loop */ -- } -- } -- -- err = SHA1Final(&sha, Message_Digest); -- nok(err, "Test SHA1Final"); -- check_cont = true; -- for(i = 0; i < 20 ; ++i) { -- if (Message_Digest[i] != resultarray[j][i]){ -- check_cont = false; -- } -- } -- ok(check_cont, "Checking expected result"); -- } -- -- /* Test some error returns */ -- err = SHA1Update(&sha,(const unsigned char *) testarray[1], 1); -- ok(err == shaStateError, "Checking for shaStateError"); -- err = SHA1Init(0); -- ok(err == shaNull, "Checking for shaNull"); -- -- return report(); --} -- --#endif /* TEST_PROGRAM */ -- --#ifdef SHA1_SUM --/* -- * Reads a single ASCII file and prints the HEX sha1 sum. -- */ --#include --int main(int argc, char *argv[]) --{ -- FILE *fd; -- SHA1Context ctx; -- char buf[5000]; -- char signature[25]; -- -- if (argc < 1) { -- printf("Must have filename\n"); -- exit(1); -- } -- fd = fopen(argv[1], "rb"); -- if (!fd) { -- berrno be; -- printf("Could not open %s: ERR=%s\n", argv[1], be.bstrerror(errno)); -- exit(1); -- } -- SHA1Init(&ctx); -- while (fgets(buf, sizeof(buf), fd)) { -- SHA1Update(&ctx, (unsigned char *)buf, strlen(buf)); -- } -- SHA1Final(&ctx, (unsigned char *)signature); -- for (int i=0; i < 20; i++) { -- printf("%02x", signature[i]& 0xFF); -- } -- printf(" %s\n", argv[1]); -- fclose(fd); --} --#endif /* SHA1_SUM */ -diff -Naur bacula-13.0.0.old/src/lib/sha1.h bacula-13.0.0/src/lib/sha1.h ---- bacula-13.0.0.old/src/lib/sha1.h 2022-07-08 14:50:02.248057651 +0200 -+++ bacula-13.0.0/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,107 +0,0 @@ --/* -- * sha1.h -- * -- * Description: -- * This is the header file for code which implements the Secure -- * Hashing Algorithm 1 as defined in FIPS PUB 180-1 published -- * April 17, 1995. -- * -- * Many of the variable names in this code, especially the -- * single character names, were used because those were the names -- * used in the publication. -- * -- * Please read the file sha1.c for more information. -- * -- * Full Copyright Statement -- * -- * Copyright (C) The Internet Society (2001). All Rights Reserved. -- * -- * This document and translations of it may be copied and furnished to -- * others, and derivative works that comment on or otherwise explain it -- * or assist in its implementation may be prepared, copied, published -- * and distributed, in whole or in part, without restriction of any -- * kind, provided that the above copyright notice and this paragraph are -- * included on all such copies and derivative works. However, this -- * document itself may not be modified in any way, such as by removing -- * the copyright notice or references to the Internet Society or other -- * Internet organizations, except as needed for the purpose of -- * developing Internet standards in which case the procedures for -- * copyrights defined in the Internet Standards process must be -- * followed, or as required to translate it into languages other than -- * English. -- * -- * The limited permissions granted above are perpetual and will not be -- * revoked by the Internet Society or its successors or assigns. -- * -- * This document and the information contained herein is provided on an -- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING -- * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING -- * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION -- * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF -- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- * -- * Acknowledgement -- * -- * Funding for the RFC Editor function is currently provided by the -- * Internet Society. -- * -- */ -- --#ifndef _SHA1_H_ --#define _SHA1_H_ -- --#include "bacula.h" -- --/* -- * If you do not have the ISO standard stdint.h header file, then you -- * must typdef the following: -- * name meaning -- * uint32_t unsigned 32 bit integer -- * uint8_t unsigned 8 bit integer (i.e., unsigned char) -- * int32_t integer of 32 bits -- * -- */ -- --#ifndef _SHA_enum_ --#define _SHA_enum_ --enum --{ -- shaSuccess = 0, -- shaNull, /* Null pointer parameter */ -- shaInputTooLong, /* input data too long */ -- shaStateError /* called Input after Result */ --}; --#endif --#define SHA1HashSize 20 -- --/* -- * This structure will hold context information for the SHA-1 -- * hashing operation -- */ --typedef struct SHA1Context --{ -- uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest */ -- -- uint32_t Length_Low; /* Message length in bits */ -- uint32_t Length_High; /* Message length in bits */ -- -- /* Index into message block array */ -- int32_t Message_Block_Index; -- uint8_t Message_Block[64]; /* 512-bit message blocks */ -- -- int Computed; /* Is the digest computed? */ -- int Corrupted; /* Is the message digest corrupted? */ --} SHA1Context; -- --/* -- * Function Prototypes -- */ -- --int SHA1Init(SHA1Context *); --int SHA1Update(SHA1Context *, -- const uint8_t *, -- unsigned int); --int SHA1Final(SHA1Context *, -- uint8_t Message_Digest[SHA1HashSize]); -- --#endif diff --git a/bacula-openssl.patch b/bacula-openssl.patch deleted file mode 100644 index 1d87083..0000000 --- a/bacula-openssl.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur bacula-11.0.1.old/src/lib/crypto.c bacula-11.0.1/src/lib/crypto.c ---- bacula-11.0.1.old/src/lib/crypto.c 2021-02-11 14:08:38.220885976 +0100 -+++ bacula-11.0.1/src/lib/crypto.c 2021-02-11 14:08:42.518956898 +0100 -@@ -42,7 +42,7 @@ - * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer - * exists. It was not an official API. - */ --#ifdef HAVE_OPENSSLv1 -+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) - #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old - #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old - #endif -diff -Naur bacula-11.0.1.old/src/lib/tls.c bacula-11.0.1/src/lib/tls.c ---- bacula-11.0.1.old/src/lib/tls.c 2021-02-11 14:08:38.218885943 +0100 -+++ bacula-11.0.1/src/lib/tls.c 2021-02-11 14:08:42.565957674 +0100 -@@ -47,9 +47,6 @@ - - #include "openssl-compat.h" - --/* No anonymous ciphers, no <128 bit ciphers, no export ciphers, no MD5 ciphers */ --#define TLS_DEFAULT_CIPHERS "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" -- - /* TLS Context Structure */ - struct TLS_Context { - SSL_CTX *openssl; -@@ -350,7 +347,7 @@ - SSL_CTX_set_options(ctx->openssl, SSL_OP_SINGLE_DH_USE); - } - -- if (SSL_CTX_set_cipher_list(ctx->openssl, TLS_DEFAULT_CIPHERS) != 1) { -+ if (SSL_CTX_set_cipher_list(ctx->openssl, "PROFILE=SYSTEM") != 1) { - Jmsg0(NULL, M_ERROR, 0, - _("Error setting cipher list, no valid ciphers available\n")); - goto err; -@@ -551,7 +548,7 @@ - extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); - - if (strcmp(extname, "subjectAltName") == 0) { --#ifdef HAVE_OPENSSLv1 -+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) - const X509V3_EXT_METHOD *method; - #else - X509V3_EXT_METHOD *method; diff --git a/bacula-scripts.patch b/bacula-scripts.patch deleted file mode 100644 index e008cf7..0000000 --- a/bacula-scripts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bacula-13.0.1.old/scripts/isworm bacula-13.0.1/scripts/isworm ---- bacula-13.0.1.old/scripts/isworm 2022-08-05 17:13:35.000000000 +0200 -+++ bacula-13.0.1/scripts/isworm 2022-11-29 11:04:03.313337376 +0100 -@@ -46,7 +46,7 @@ - # but it does not work for mhvtl. Comment out the next 5 lines - # and the code that follows will detect correctly on mhtvl. - # --worm=`$sdparm --page=0x1D -f $1 |grep " *WORMM"|cut -b12-16|sed "s:^ *::"` -+worm=`$sdparm --page=0x1D -f $1 |grep "WORMM"|cut -b12-16|sed "s:^ *::"` - if [ $? = 0 ] ; then - echo $worm - exit 0 diff --git a/bacula-sd.service b/bacula-sd.service deleted file mode 100644 index e05e94b..0000000 --- a/bacula-sd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Bacula Storage Daemon -Documentation=man:bacula-sd(8) -After=network.target nss-lookup.target - -[Service] -Environment=CONFIG=/etc/bacula/bacula-sd.conf -EnvironmentFile=-/etc/sysconfig/bacula-sd -ExecStart=/usr/sbin/bacula-sd -f $OPTS -c $CONFIG -u $SD_USER -g $SD_GROUP -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/bacula-sd.sysconfig b/bacula-sd.sysconfig deleted file mode 100644 index d3c5c48..0000000 --- a/bacula-sd.sysconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Users for bacula storage -# If no user is set bacula will run as root - -SD_USER=bacula -SD_GROUP=tape - -# Useful for debugging -# -# OPTS="-d 200" diff --git a/bacula-seg-fault.patch b/bacula-seg-fault.patch deleted file mode 100644 index f468cd8..0000000 --- a/bacula-seg-fault.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur bacula-13.0.0.old/src/lib/message.c bacula-13.0.0/src/lib/message.c ---- bacula-13.0.0.old/src/lib/message.c 2022-07-08 14:50:02.247057633 +0200 -+++ bacula-13.0.0/src/lib/message.c 2022-07-08 14:51:05.527195040 +0200 -@@ -28,6 +28,7 @@ - * - */ - -+#include - #include "bacula.h" - #include "jcr.h" - -@@ -1480,7 +1481,8 @@ - - if (type == M_ABORT) { - char *p = 0; -- p[0] = 0; /* generate segmentation violation */ -+ // p[0] = 0; /* generate segmentation violation */ -+ assert(p!=NULL); - } - if (type == M_ERROR_TERM) { - exit(1); diff --git a/bacula-storage.xml b/bacula-storage.xml deleted file mode 100644 index 485d64e..0000000 --- a/bacula-storage.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Bacula Storage - Bacula storage daemon. You need the bacula-storage package installed for this option to be useful. - - diff --git a/bacula-traceback-man.patch b/bacula-traceback-man.patch deleted file mode 100644 index 771098f..0000000 --- a/bacula-traceback-man.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Fix libexec path in man-pages -Author: Sven Hartge -Forwarded: not-needed - ---- a/manpages/btraceback.8 -+++ b/manpages/btraceback.8 -@@ -45,14 +45,14 @@ - - .SH FILES - .TP --.I /usr/lib/bacula/btraceback -+.I /usr/libexec/bacula/btraceback - .RS - The script itself. - .RE - .TP - .I /usr/sbin/btraceback - .RS --symbolic link to \fI/usr/lib/bacula/btraceback\fR -+symbolic link to \fI/usr/libexec/bacula/btraceback\fR - .RE - .TP - .I /etc/bacula/scripts/btraceback.gdb diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9814a5b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +bacula package is retired on branch c10s for CS-2311 \ No newline at end of file