diff --git a/core/cmake/bareos-symlink-default-db-backend.cmake b/core/cmake/bareos-symlink-default-db-backend.cmake deleted file mode 100644 index 1d44a6939c0..00000000000 --- a/core/cmake/bareos-symlink-default-db-backend.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# BAREOS® - Backup Archiving REcovery Open Sourced -# -# Copyright (C) 2017-2019 Bareos GmbH & Co. KG -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of version three of the GNU Affero General Public -# License as published by the Free Software Foundation and included -# in the file LICENSE. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -message( - STATUS - "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}" -) -execute_process( - COMMAND - ${CMAKE_COMMAND} -E create_symlink - ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} - ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} -) diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common index 425493845ea..c2143c1bcc6 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common @@ -1,9 +1,6 @@ lib/libbareossql.so.%%DISTVERSION%% lib/libbareossql.so.%%LIBVERSION%% lib/libbareossql.so -lib/libbareoscats.so.%%DISTVERSION%% -lib/libbareoscats.so.%%LIBVERSION%% -lib/libbareoscats.so @dir(bareos,bareos,755) lib/bareos/scripts/ddl @dir(bareos,bareos,755) lib/bareos/scripts/ddl/creates @dir(bareos,bareos,755) lib/bareos/scripts/ddl/drops diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql index fa8d83e4f90..4e5bd2c1660 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql @@ -14,4 +14,3 @@ lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql -lib/libbareoscats-postgresql.so diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-common/Makefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-common/Makefile index 2b35143ec5e..358ef14c2c8 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-common/Makefile +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-common/Makefile @@ -5,7 +5,7 @@ COMMENT= Backup archiving recovery open sourced (database-common) PLIST= ${PKGDIR}/pkg-plist.database-common MASTERDIR= ${.CURDIR}/../bareos.com-common -LIB_DEPENDS+= libbareos.so:sysutils/baroes.com-common +LIB_DEPENDS+= libbareos.so:sysutils/bareos.com-common # optional overrides, used by build system. diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-postgresql/Makefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-postgresql/Makefile index fadcb43344a..0d0e6d64920 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-postgresql/Makefile +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-postgresql/Makefile @@ -7,7 +7,6 @@ MASTERDIR= ${.CURDIR}/../bareos.com-common LIB_DEPENDS+= libbareos.so:sysutils/bareos.com-common LIB_DEPENDS+= libbareossql.so:sysutils/bareos.com-database-common -LIB_DEPENDS+= libbareoscats.so:sysutils/bareos.com-database-common USES+=pgsql diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-tools/Makefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-tools/Makefile index 81d062759b9..8c9b3971542 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-database-tools/Makefile +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-database-tools/Makefile @@ -10,7 +10,6 @@ LIB_DEPENDS+= libbareosfind.so:sysutils/bareos.com-common LIB_DEPENDS+= libbareossd.so:sysutils/bareos.com-common LIB_DEPENDS+= libbareossql.so:sysutils/bareos.com-database-common -LIB_DEPENDS+= libbareoscats.so:sysutils/bareos.com-database-common # optional overrides, used by build system. .-include "overrides.mk" diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-director/Makefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-director/Makefile index 9c374e0d876..5c6ea604461 100644 --- a/core/platforms/freebsd/bareos-freebsd/bareos.com-director/Makefile +++ b/core/platforms/freebsd/bareos-freebsd/bareos.com-director/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS+= libbareoslmdb.so:sysutils/bareos.com-common LIB_DEPENDS+= libbareosfind.so:sysutils/bareos.com-common LIB_DEPENDS+= libbareossql.so:sysutils/bareos.com-database-common -LIB_DEPENDS+= libbareoscats.so:sysutils/bareos.com-database-common RUN_DEPENDS+= bareos-dbcheck:sysutils/bareos.com-database-tools diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index bf0913fe431..7b263c89545 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -1436,7 +1436,6 @@ mkdir -p %{?buildroot}/%{_libdir}/bareos/plugins/vmware_plugin # catalog independent files %defattr(-, root, root) %{library_dir}/libbareossql*.so.* -%{library_dir}/libbareoscats*.so.* %dir %{script_dir}/ddl %dir %{script_dir}/ddl/creates %dir %{script_dir}/ddl/drops @@ -1454,7 +1453,6 @@ mkdir -p %{?buildroot}/%{_libdir}/bareos/plugins/vmware_plugin # postgresql catalog files %defattr(-, root, root) %{script_dir}/ddl/*/postgresql*.sql -%{backend_dir}/libbareoscats-postgresql.so* %files database-tools # dbtools with link to db libs (dbcheck, bscan) diff --git a/core/platforms/win32/winbareos.nsi b/core/platforms/win32/winbareos.nsi index 7d29cf0576a..8003a05726e 100644 --- a/core/platforms/win32/winbareos.nsi +++ b/core/platforms/win32/winbareos.nsi @@ -704,7 +704,6 @@ SectionIn 2 3 File "testfind.exe" File "bregex.exe" File "bwild.exe" - File "libbareoscats.dll" # install configuration as templates SetOutPath "$INSTDIR\defaultconfigs\bareos-dir.d" @@ -722,7 +721,6 @@ SectionIn 2 3 SetShellVarContext all SetOutPath "$INSTDIR" - File "libbareoscats-postgresql.dll" # edit sql ddl files nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\postgres.sed" -i-template "$PLUGINSDIR\postgresql-grant.sql"' @@ -2032,8 +2030,6 @@ ConfDeleteSkip: Delete "$INSTDIR\libbareosfind.dll" Delete "$INSTDIR\libbareoslmdb.dll" Delete "$INSTDIR\libbareossql.dll" - Delete "$INSTDIR\libbareoscats.dll" - Delete "$INSTDIR\libbareoscats-postgresql.dll" Delete "$INSTDIR\libcrypto-*.dll" Delete "$INSTDIR\libgcc_s_*-1.dll" diff --git a/debian/bareos-database-common.install.in b/debian/bareos-database-common.install.in index 3c7da8ecd27..b6384339eb8 100644 --- a/debian/bareos-database-common.install.in +++ b/debian/bareos-database-common.install.in @@ -1,5 +1,4 @@ @libdir@/libbareossql.so* -@libdir@/libbareoscats.so* @scriptdir@/create_bareos_database @scriptdir@/drop_bareos_database @scriptdir@/drop_bareos_tables diff --git a/debian/bareos-database-postgresql.install.in b/debian/bareos-database-postgresql.install.in index 877a9433b87..8a90eb0f689 100644 --- a/debian/bareos-database-postgresql.install.in +++ b/debian/bareos-database-postgresql.install.in @@ -1,4 +1,3 @@ -@backenddir@/libbareoscats-postgresql.so* @scriptdir@/ddl/*/postgresql*.sql /usr/share/dbconfig-common/data/bareos-database-common/install/pgsql /usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/* diff --git a/debian/rules b/debian/rules index 592f80650d1..1a51bc702b5 100755 --- a/debian/rules +++ b/debian/rules @@ -99,11 +99,6 @@ else endif -override_dh_install: - chrpath -d $(CURDIR)/debian/tmp/usr/lib/bareos/backends/libbareoscats-postgresql* || true - dh_install - - override_dh_systemd_enable: ifeq (build-universal-client,$(filter build-universal-client,$(DEB_BUILD_OPTIONS))) dh_systemd_enable --name bareos-filedaemon