Merge pull request #1538

Improve FreeBSD build

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - backup report: show negative compression [PR #1598]
 - core: add build patch for `sprintf` in macos builds [PR #1636]
 - python-bareos: use socket.create_connection() to allow AF_INET6 [PR #1646]
+- Improve FreeBSD build [PR #1538]
 
 ### Removed
 - plugins: remove old deprecated postgres plugin [PR #1606]
@@ -33,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix continuation on colons in plugin baseclass [PR #1637]
 - plugins: fix cancel handling crash [PR #1595]
 
+[PR #1538]: https://github.com/bareos/bareos/pull/1538
 [PR #1581]: https://github.com/bareos/bareos/pull/1581
 [PR #1587]: https://github.com/bareos/bareos/pull/1587
 [PR #1589]: https://github.com/bareos/bareos/pull/1589

cmake/BareosExtractVersionInfo.cmake

@@ -1,6 +1,6 @@
 # BAREOS® - Backup Archiving REcovery Open Sourced
 #
-# Copyright (C) 2017-2021 Bareos GmbH & Co. KG
+# Copyright (C) 2017-2023 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
@@ -69,11 +69,20 @@ message("BAREOS_NUMERIC_VERSION is ${BAREOS_NUMERIC_VERSION}")
 message("BAREOS_FULL_VERSION is ${BAREOS_FULL_VERSION}")
 
 if(VERSION_TIMESTAMP GREATER 0)
-  include(BareosTimeFunctions)
-  timestamp_at("${VERSION_TIMESTAMP}" DATE "%d %B %Y")
-  timestamp_at("${VERSION_TIMESTAMP}" BAREOS_SHORT_DATE "%d%b%y")
-  timestamp_at("${VERSION_TIMESTAMP}" BAREOS_YEAR "%Y")
-  timestamp_at("${VERSION_TIMESTAMP}" BAREOS_PROG_DATE_TIME "%Y-%m-%d %H:%M:%S")
+  if(DEFINED ENV{SOURCE_DATE_EPOCH})
+    set(_old_source_date_epoch "$ENV{SOURCE_DATE_EPOCH}")
+  endif()
+  set(ENV{SOURCE_DATE_EPOCH} "${VERSION_TIMESTAMP}")
+  string(TIMESTAMP DATE "%d %B %Y" UTC)
+  string(TIMESTAMP BAREOS_SHORT_DATE "%d%b%y" UTC)
+  string(TIMESTAMP BAREOS_YEAR "%Y" UTC)
+  string(TIMESTAMP BAREOS_PROG_DATE_TIME "%Y-%m-%d %H:%M:%S" UTC)
+  if(DEFINED _old_source_date_epoch)
+    set(ENV{SOURCE_DATE_EPOCH} "${_old_source_date_epoch}")
+    unset(_old_source_date_epoch)
+  else()
+    unset(ENV{SOURCE_DATE_EPOCH})
+  endif()
 else()
   message(FATAL_ERROR "VERSION_TIMESTAMP is not set")
 endif()

core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile

@@ -55,24 +55,17 @@ USES+=gettext-runtime
 USES+=readline
 
 USES+=		libtool:keepla pkgconfig readline:port
-#USES+=cmake:outsource
-#USES+=cmake
 USES+=cmake:noninja
 USES+=shebangfix
+USES+=python:env
 
 USE_LDCONFIG=	yes
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-LDFLAGS+=	-lz
-LDFLAGS+=	-ljansson
-LDFLAGS+=	-lcrypto
-
-CPPFLAGS+=	-I/usr/include/readline
-CPPFLAGS+=      -I${LOCALBASE}/include
-
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
-		          libjansson.so:devel/jansson
-LIB_DEPENDS+= libpython3.7m.so:lang/python37
+              libjansson.so:devel/jansson \
+              libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX}
+
+_PYVERSION= ${PYTHON_VER}${PYTHON_ABIVER}
 
 # optional overrides, used by build system.
 .-include "BareosCommonMakefile-overrides.mk"
@@ -83,6 +76,7 @@ CMAKE_SOURCE_PATH=   ${WRKSRC}
 CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \
       -DCMAKE_INSTALL_LIBDIR:PATH=/usr/local/lib \
+      -DCMAKE_INSTALL_MANDIR:PATH=/usr/local/man \
       -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
       -DLIB_INSTALL_DIR:PATH=/usr/local/lib \
       -DSYSCONF_INSTALL_DIR:PATH=/etc \

core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql

@@ -13,4 +13,5 @@ lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
 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.2210_2230.sql
 lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql

core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.director-python-plugin

@@ -3,3 +3,4 @@ lib/bareos/plugins/python-dir.so
 lib/bareos/plugins/BareosDirPluginBaseclass.py
 lib/bareos/plugins/bareos-dir-class-plugin.py
 lib/bareos/plugins/BareosDirWrapper.py
+%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so

core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon-python3-plugin

@@ -1,3 +1,3 @@
 
 lib/bareos/plugins/python3-fd.so
-lib/python3.7/site-packages/bareosfd.so
+%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so

core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-python-plugin

@@ -3,3 +3,4 @@ lib/bareos/plugins/python-sd.so
 lib/bareos/plugins/BareosSdPluginBaseclass.py
 lib/bareos/plugins/BareosSdWrapper.py
 lib/bareos/plugins/bareos-sd-class-plugin.py
+%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so

core/platforms/freebsd/bareos-freebsd/bareos.com-filedaemon-python-plugins-common/Makefile

@@ -7,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../bareos.com-common
 
 LIB_DEPENDS+=  libbareos.so:sysutils/bareos.com-common
 
-USES+=python:3.7
+USES+=python
 
 # optional overrides, used by build system.
 .-include "overrides.mk"

core/platforms/freebsd/bareos-freebsd/bareos.com-filedaemon-python3-plugin/Makefile

@@ -7,7 +7,7 @@ MASTERDIR=	${.CURDIR}/../bareos.com-common
 
 LIB_DEPENDS+=  libbareos.so:sysutils/bareos.com-common
 
-USES+=python:3.7
+USES+=python
 
 # optional overrides, used by build system.
 .-include "overrides.mk"

core/src/lib/jcr.cc

@@ -499,15 +499,16 @@ static std::shared_ptr<JobControlRecord> GetJcr(
           [](std::weak_ptr<JobControlRecord>& p) { return p.expired(); }),
       job_control_record_cache.end());
 
-  find_if(job_control_record_cache.begin(), job_control_record_cache.end(),
-          [&compare, &result](std::weak_ptr<JobControlRecord>& p) {
-            auto jcr = p.lock();
-            if (compare(jcr.get())) {
-              result = jcr;
-              return true;
-            }
-            return false;
-          });
+  std::ignore = find_if(
+      job_control_record_cache.begin(), job_control_record_cache.end(),
+      [&compare, &result](std::weak_ptr<JobControlRecord>& p) {
+        auto jcr = p.lock();
+        if (compare(jcr.get())) {
+          result = jcr;
+          return true;
+        }
+        return false;
+      });
 
   UnlockJcrChain();
 

systemtests/CMakeLists.txt

@@ -184,17 +184,19 @@ else()
   set(TEST_INFO_TEXT "running system tests on the sourcetree")
 endif()
 
-execute_process(
-  COMMAND "${CMAKE_BINARY_DIR}/systemtests/scripts/generate_minio_certs.sh"
-  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/systemtests/tls/minio/"
-  RESULT_VARIABLE RESULT_GENERATE_MINIO_CERTS
-  OUTPUT_QUIET ERROR_QUIET
-)
-if(NOT "${RESULT_GENERATE_MINIO_CERTS}" STREQUAL "0")
-  message(
-    FATAL_ERROR
-      "Creation of certificates failed: ${RESULT_GENERATE_MINIO_CERTS} ${CMAKE_BINARY_DIR}"
+if(MINIO)
+  execute_process(
+    COMMAND "${CMAKE_BINARY_DIR}/systemtests/scripts/generate_minio_certs.sh"
+    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/systemtests/tls/minio/"
+    RESULT_VARIABLE RESULT_GENERATE_MINIO_CERTS
+    OUTPUT_QUIET ERROR_QUIET
   )
+  if(NOT "${RESULT_GENERATE_MINIO_CERTS}" STREQUAL "0")
+    message(
+      FATAL_ERROR
+        "Creation of certificates failed: ${RESULT_GENERATE_MINIO_CERTS} ${CMAKE_BINARY_DIR}"
+    )
+  endif()
 endif()
 
 configure_file(