diff options
Diffstat (limited to 'sysutils/bareos-server/files')
15 files changed, 217 insertions, 283 deletions
diff --git a/sysutils/bareos-server/files/patch-autoconf_Make.common.in b/sysutils/bareos-server/files/patch-autoconf_Make.common.in deleted file mode 100644 index 38093dc657b0..000000000000 --- a/sysutils/bareos-server/files/patch-autoconf_Make.common.in +++ /dev/null @@ -1,13 +0,0 @@ ---- autoconf/Make.common.in 2016-11-09 23:17:41.055746000 -0500 -+++ autoconf/Make.common.in 2016-11-09 23:17:59.647897000 -0500 -@@ -62,8 +62,8 @@ - MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode --INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@ --INSTALL_LIB = $(INSTALL) -m 755 -+INSTALL_PROGRAM = $(INSTALL) -s -m @SBINPERM@ -+INSTALL_LIB = $(INSTALL) -s -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@ - INSTALL_CONFIG = $(INSTALL) -m 640 diff --git a/sysutils/bareos-server/files/patch-configure b/sysutils/bareos-server/files/patch-configure deleted file mode 100644 index 2790798a4180..000000000000 --- a/sysutils/bareos-server/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure 2015-08-08 15:47:12.347184000 -0500 -+++ configure 2015-08-08 15:48:11.164437000 -0500 -@@ -18626,7 +18626,7 @@ - found_so= - found_a= - if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then -@@ -21466,7 +21466,7 @@ - found_so= - found_a= - if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake new file mode 100644 index 000000000000..2cafd3ea706f --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake @@ -0,0 +1,72 @@ +--- core/cmake/BareosInstallConfigFiles.cmake 2019-02-13 09:25:55.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2019-05-08 22:47:21.128268000 -0500 +@@ -43,18 +43,9 @@ + get_filename_component(resname ${resdir} NAME) + foreach(configfile ${configfiles}) + get_filename_component(fname ${configfile} NAME) +- if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) +- MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists") +- MESSAGE(STATUS "rename ${configfile} to ${configfile}.new") +- FILE (RENAME "${configfile}" "${configfile}.new") +- +- MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") +- FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") +- FILE (RENAME "${configfile}.new" "${configfile}") +- else() +- MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)") +- FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") +- endif() ++ MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)") ++ FILE (RENAME "${configfile}" "${configfile}.sample") ++ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}") + endforeach() + endforeach() + +@@ -82,15 +73,9 @@ + get_filename_component(dir ${configfile} DIRECTORY) + get_filename_component(fname ${configfile} NAME) + +- if (EXISTS ${DESTCONFDIR}/${configfile}) +- MESSAGE(STATUS "${configfile} as ${configfile}.new (keep existing)") +- FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.new") +- FILE(COPY "${BackendConfigSrcDir}/${configfile}.new" DESTINATION "${DESTCONFDIR}/${dir}") +- FILE(RENAME "${BackendConfigSrcDir}/${configfile}.new" "${BackendConfigSrcDir}/${configfile}") +- else() +- MESSAGE(STATUS "${configfile} as ${configfile}") +- FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") +- endif() ++ MESSAGE(STATUS "${configfile} as ${configfile}") ++ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") ++ FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}") + endforeach() + + file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example") +@@ -104,7 +89,8 @@ + MESSAGE(STATUS "${configfile} as ${configfile}") + endif() + +- FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") ++ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") ++ FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}") + endforeach() + + ENDFOREACH() +@@ -122,15 +108,9 @@ + STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) + if (NOT "${IS_INFILE}" STREQUAL ".in") + get_filename_component(fname ${configfile} NAME) +- if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) +- MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.new (keep existing)") +- FILE (RENAME "${configfile}" "${configfile}.new") +- FILE (COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") +- FILE (RENAME "${configfile}.new" "${configfile}") +- else() +- MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") +- FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") +- endif() ++ MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") ++ FILE (RENAME "${configfile}" "${configfile}.sample") ++ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}") + else() + MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}") + endif() diff --git a/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt new file mode 100644 index 000000000000..ab5442b9a2ba --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt @@ -0,0 +1,19 @@ +--- core/manpages/CMakeLists.txt 2019-05-08 21:16:29.369799000 -0500 ++++ core/manpages/CMakeLists.txt 2019-05-08 21:17:28.526607000 -0500 +@@ -17,6 +17,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + # 02110-1301, USA. + ++IF(client-only) + set (MAN1 + bconsole.1 + ) +@@ -25,7 +26,7 @@ + bareos-fd.8 + bareos.8 + ) +- ++ENDIF() + + IF(NOT client-only) + set ( MAN1-server diff --git a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt new file mode 100644 index 000000000000..2c8b87d9b309 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt @@ -0,0 +1,60 @@ +--- core/scripts/CMakeLists.txt 2019-05-08 19:49:45.595270000 -0500 ++++ core/scripts/CMakeLists.txt 2019-05-08 19:51:39.443730000 -0500 +@@ -17,28 +17,29 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + # 02110-1301, USA. + ++IF(client-only) ++ INSTALL(FILES ++ btraceback ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION "${sbindir}") + +-INSTALL(FILES +- bareos btraceback +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE +- GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- DESTINATION "${sbindir}") ++ INSTALL(FILES ++ bareos ++ btraceback.gdb ++ btraceback.dbx ++ btraceback.mdb ++ bareos-config ++ bareos-config-lib.sh ++ bareos-ctl-fd ++ bareos-ctl-funcs ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION "${scriptdir}") ++ENDIF() + +-INSTALL(FILES +- bareos +- btraceback.gdb +- btraceback.dbx +- btraceback.mdb +- bareos-config +- bareos-config-lib.sh +- bareos-ctl-fd +- bareos-ctl-funcs +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE +- GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- DESTINATION "${scriptdir}") +- + IF(NOT client-only) + INSTALL(FILES + mtx-changer +@@ -47,7 +48,6 @@ + bareos-glusterfind-wrapper + bareos-ctl-dir + bareos-ctl-sd +- bareos-ctl-funcs + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE diff --git a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt new file mode 100644 index 000000000000..11570458e8e4 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt @@ -0,0 +1,21 @@ +--- core/src/dird/CMakeLists.txt 2019-05-08 21:45:45.893113000 -0500 ++++ core/src/dird/CMakeLists.txt 2019-05-08 21:47:00.616203000 -0500 +@@ -77,6 +77,9 @@ + bareosfind + ${LMDB_LIBS} + ${NDMP_LIBS} ++ ${OPENSSL_LIBRARIES} ++ ${PTHREAD_LIBRARIES} ++ ${JANSSON_LIBRARIES} + ) + + IF(HAVE_WIN32) +@@ -92,7 +95,7 @@ + add_executable(bareos-dbcheck ${DBCHKSRCS}) + SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) + +-target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES}) ++target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}) + + # is not built by default + diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt new file mode 100644 index 000000000000..99f6d4ca8d19 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt @@ -0,0 +1,20 @@ +--- core/src/stored/CMakeLists.txt 2019-02-13 09:25:55.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2019-05-09 00:06:43.118374000 -0500 +@@ -192,6 +192,8 @@ + target_link_libraries(bareos-sd + stored_objects + ${BAREOS_SD_LIBRARIES} ++ ${JANSSON_LIBRARIES} ++ ${PTHREAD_LIBRARIES} + ) + + add_executable(bls ${BLSSRCS}) +@@ -231,7 +233,7 @@ + install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") + install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) + +-INSTALL(DIRECTORY DESTINATION "../${archivedir}") ++INSTALL(DIRECTORY DESTINATION "${archivedir}") + + IF(${HAVE_DYNAMIC_SD_BACKENDS}) + add_subdirectory(backends) diff --git a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt new file mode 100644 index 000000000000..135d70a4df4c --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt @@ -0,0 +1,25 @@ +--- core/src/CMakeLists.txt 2019-05-08 21:29:08.173605000 -0500 ++++ core/src/CMakeLists.txt 2019-05-08 21:42:27.597876000 -0500 +@@ -30,13 +30,16 @@ + add_subdirectory(stored) + ENDIF() + +-add_subdirectory(console) +-IF(${HAVE_LMDB}) +-add_subdirectory(lmdb) ++IF(client-only) ++ add_subdirectory(console) ++ IF(${HAVE_LMDB}) ++ add_subdirectory(lmdb) ++ ENDIF() ++ add_subdirectory(lib) ++ add_subdirectory(findlib) ++ add_subdirectory(filed) + ENDIF() +-add_subdirectory(lib) +-add_subdirectory(findlib) +-add_subdirectory(filed) ++ + add_subdirectory(plugins) + + if (${traymonitor}) diff --git a/sysutils/bareos-server/files/patch-src-console-Makefile.in b/sysutils/bareos-server/files/patch-src-console-Makefile.in deleted file mode 100644 index b1526de9fb6f..000000000000 --- a/sysutils/bareos-server/files/patch-src-console-Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ ---- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500 -@@ -28,6 +28,7 @@ - CONS_LIBS = @CONS_LIBS@ - - JANSSON_CPPFLAGS = @JANSSON_INC@ -+JANSSON_LDFLAGS = @JANSSON_LIBS@ - - INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include - -@@ -51,12 +52,12 @@ - bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) $(GNUTLS_LIBS) -+ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \ -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) - strip $@ - - -@@ -93,7 +94,7 @@ - $(MKDIR) $(DESTDIR)$(bindir) - $(MKDIR) $(DESTDIR)$(sbindir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole; -- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi -+ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi - @srcconf=bconsole.conf; \ - if test -f ${DESTDIR}${confdir}/$$srcconf; then \ - destconf=$$srcconf.new; \ diff --git a/sysutils/bareos-server/files/patch-src-dird-Makefile.in b/sysutils/bareos-server/files/patch-src-dird-Makefile.in deleted file mode 100644 index 01552e34b512..000000000000 --- a/sysutils/bareos-server/files/patch-src-dird-Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ ---- src/dird/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/dird/Makefile.in 2016-11-09 15:47:36.135752000 -0500 -@@ -52,6 +52,7 @@ - INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp - - JANSSON_CPPFLAGS = @JANSSON_INC@ -+JANSSON_LDFLAGS = @JANSSON_LIBS@ - - DIRD_RESTYPES = catalog client console counter director fileset job jobdefs messages pool profile schedule storage - -@@ -83,7 +84,7 @@ - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ - $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \ - $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) $(JANSSON_LDFLAGS) - - bareos-dbcheck: Makefile $(DBCHKOBJS) \ - ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -94,7 +95,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \ - -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) - - testfind: Makefile $(TSTFNDOBJS) \ - ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -105,7 +106,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \ - -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) - - static-bareos-dir: Makefile $(SVROBJS) \ - ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -160,8 +161,8 @@ - destconf="$$RESDIR/$$RES.new"; \ - echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ - else \ -- destconf="$$RESDIR/$$RES"; \ -- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ -+ destconf="$$RESDIR/$$RES.sample"; \ -+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ - fi; \ - ${INSTALL_CONFIG} "$$f" "$$destconf"; \ - if test "x${dir_group}" != "x"; then \ -@@ -170,11 +171,6 @@ - fi; \ - done; \ - done -- $(MKDIR) ${DESTDIR}${confdir}/bareos-dir-export/client/ -- @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ -- echo " ==> Saving existing query.sql to query.sql.old"; \ -- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \ -- fi - ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql - @if test -f static-bareos-dir; then \ - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-dir $(DESTDIR)$(sbindir)/static-bareos-dir; \ diff --git a/sysutils/bareos-server/files/patch-src-filed-Makefile.in b/sysutils/bareos-server/files/patch-src-filed-Makefile.in deleted file mode 100644 index 9b38048feeba..000000000000 --- a/sysutils/bareos-server/files/patch-src-filed-Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- src/files/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/filed/Makefile.in 2016-11-10 01:33:16.120709000 -0500 -@@ -25,6 +25,7 @@ - GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ - - JANSSON_CPPFLAGS = @JANSSON_INC@ -+JANSSON_LDFLAGS = @JANSSON_LIBS@ - COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@ - - first_rule: all -@@ -78,7 +79,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ - -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) - - static-bareos-fd: Makefile $(SVROBJS) \ - ../findlib/libbareosfind.a \ -@@ -87,7 +88,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ - -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ -- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_STATIC_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) - strip $@ - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status -@@ -137,8 +138,8 @@ - destconf="$$RESDIR/$$RES.new"; \ - echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ - else \ -- destconf="$$RESDIR/$$RES"; \ -- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ -+ destconf="$$RESDIR/$$RES.sample"; \ -+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ - fi; \ - ${INSTALL_CONFIG} "$$f" "$$destconf"; \ - if test "x${fd_group}" != "x"; then \ diff --git a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in deleted file mode 100644 index 6318ac7a4268..000000000000 --- a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- src/plugins/filed/Makefile.in 2018-05-17 15:34:21.796332000 -0500 -+++ src/plugins/filed/Makefile.in 2018-05-17 15:35:50.843157000 -0500 -@@ -93,7 +93,8 @@ - - install: all - $(MKDIR) $(DESTDIR)$(plugindir) -- $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/ -+ $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/fileset -+ $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/job - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) - $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la - if test "x$(BUILD_PLUGINS)" != "x" ; then \ -@@ -111,7 +112,7 @@ - $(CP) *.py *.py.template $(DESTDIR)$(plugindir); \ - for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \ - $(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \ -- $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${configtemplatedir}/$$i; \ -+ $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \ - done; \ - fi; \ - done;\ diff --git a/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in deleted file mode 100644 index 7d4f8fb3b871..000000000000 --- a/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/stored/Makefile.in 2015-07-23 18:04:28.275396000 -0500 -+++ src/plugins/stored/Makefile.in 2015-07-23 18:05:09.508399000 -0500 -@@ -39,7 +39,7 @@ - - autoxflate-sd.la: Makefile \ - autoxflate-sd$(DEFAULT_OBJECT_TYPE) \ -- ../../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) -+ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared autoxflate-sd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version -L../../lib -lbareos - - example-plugin-sd.la: Makefile example-plugin-sd$(DEFAULT_OBJECT_TYPE) diff --git a/sysutils/bareos-server/files/patch-src-stored-Makefile.in b/sysutils/bareos-server/files/patch-src-stored-Makefile.in deleted file mode 100644 index 59938bea2720..000000000000 --- a/sysutils/bareos-server/files/patch-src-stored-Makefile.in +++ /dev/null @@ -1,73 +0,0 @@ ---- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500 -@@ -93,6 +93,7 @@ - INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include - - JANSSON_CPPFLAGS = @JANSSON_INC@ -+JANSSON_LDFLAGS = @JANSSON_LIBS@ - - DEBUG = @DEBUG@ - GETTEXT_LIBS = @LIBINTL@ -@@ -170,7 +171,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \ - $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ -- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} - - static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \ - ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ -@@ -192,7 +193,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \ - -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) - - bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \ - ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ -@@ -201,7 +202,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ - -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) - - bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \ - ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ -@@ -210,7 +211,7 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \ - -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \ -- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) - - bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \ - ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ -@@ -220,13 +221,13 @@ - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ - -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \ -- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} - - bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \ - ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." - $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \ -- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) - - Makefile: $(srcdir)/Makefile.in $(topdir)/config.status - cd $(topdir) \ -@@ -259,8 +260,8 @@ - destconf="$$RESDIR/$$RES.new"; \ - echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ - else \ -- destconf="$$RESDIR/$$RES"; \ -- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ -+ destconf="$$RESDIR/$$RES.sample"; \ -+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ - fi; \ - ${INSTALL_CONFIG} "$$f" "$$destconf"; \ - if test "x${sd_group}" != "x"; then \ diff --git a/sysutils/bareos-server/files/patch-src-tools_Makefile.in b/sysutils/bareos-server/files/patch-src-tools_Makefile.in deleted file mode 100644 index 9b88111018d5..000000000000 --- a/sysutils/bareos-server/files/patch-src-tools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tools/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/tools/Makefile.in 2016-11-09 22:56:53.069629000 -0500 -@@ -130,7 +130,7 @@ - $(MKDIR) $(DESTDIR)$(sbindir) - @for tool in ${TOOLS_BIN} ; do \ - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(bindir)/$$tool ; \ -- if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) $(bindir)/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \ -+ if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) ../bin/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \ - done - # Allow non-root execution of bsmtp for non-root Directors - chmod 755 $(DESTDIR)$(bindir)/bsmtp |