From nobody Thu May 2 06:55:53 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VVPpd6tf1z5JRNX; Thu, 2 May 2024 06:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVPpd4r6Rz4PwP; Thu, 2 May 2024 06:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714632953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlM0o3CWlCOzNC1nD475HozHK3e2fS1QOs8Mpae0Vsk=; b=rT+onpYMH3jfoONtEFQ/jzpJ9tFzkEFp9ibO20uWD6PmKU6EXW7cCAOAWPbb7dKNaod11X GUSBNkwN1UD92Bjxxau54jDkoHsaWXBjGji1pGcGwVhs+Dtb2p7pZ38N/CXUL9uYj7dj/c qTDWg9V7kVsrcvKwHH4JQJ2xh9T1b+Bc5YqDRdMJDwG9/F466vNmOuW6a74QR/RSF40OJJ SA7gN+NU8AoCgQ/K2I9PcR8xLHUcdmEmyuS5neQgYqwTEZEt+ay7jq7qZQgjrRmp79mXil QJ8K0tLxaZi+Sv6YOgOBr61rTPaxxWqIadzSJdHWOuvUZOfNBjYeVbbi2qe+VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714632953; a=rsa-sha256; cv=none; b=ZRltgA2B0/0ZfsU5+BWIbH1TUs1BR+kI6EIRdaWtXN1+JLNKTmjrVnJxovkYW0aqpMSepi DsfW0QDU/DIB1Ix+GFuZ3rGbEN6DmykAy0tSA/4HLXFfhCN8sTKOjG91P8MU2uaEYgElbj 3JZ0G6WVwnmu+0EcRSw7e0BSjO4xWpZmg+kuqtdX7rfNedmz0vtNI59uuYvmrfKQWkQwVW AYWXzHaYdu3RekEy4c/2k5ue1vab383wkKFjFieS7TrNJLg37cOsPXJc/BsRighd3SjsoB 4O1H2QkV/uRC0lRURjlIcVllatFsv9EWtmeqYLWu+b+2JgcxlCmrCBCLaIRTFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714632953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlM0o3CWlCOzNC1nD475HozHK3e2fS1QOs8Mpae0Vsk=; b=JGbwIljq+bj8CqlriFTHdWa6JNgJ/yYyZHSHnIfBtBVAFkcx912yw1S8y2iADT5jbt9xhW fPx+/GjeDOviX4MbviqXMGjCZgYNxmyQqmp4k2J0PggPjYjQJxrNSGsmJBzkGyNNGht4Gy 27Ja8NJcW4oLOg9g3w+m2aXq1kcxmgHTdYcASmOzzDBlj2q9M7r1SJxhD8loPwA5r1eAIp ojawK87xkGtHRzMhPhuIO7rbu9Dsram2PYDbLagDleq6bPG/uQ+bKSlnjWPyX5m+rKbfmL MB0fTczXNtmWXUSiMVd8nJmsA3fTahSEL3Q/kUCCOko1ifH3kjrk9ztof0Nw0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVPpd4S4BzscQ; Thu, 2 May 2024 06:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4426trWt018637; Thu, 2 May 2024 06:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4426trog018634; Thu, 2 May 2024 06:55:53 GMT (envelope-from git) Date: Thu, 2 May 2024 06:55:53 GMT Message-Id: <202405020655.4426trog018634@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: c0297686589d - main - sysutils/bareos21-*: update to 21.1.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0297686589d3fee102341d97a841290457a373d Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0297686589d3fee102341d97a841290457a373d commit c0297686589d3fee102341d97a841290457a373d Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-05-02 06:46:37 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-05-02 06:46:37 +0000 sysutils/bareos21-*: update to 21.1.9 - Replace BACULA_DIR/BAREOS_DIR into pkg-deinstall.client.in [1] ChangeLog at: https://github.com/bareos/bareos/blob/Release/21.1.9/CHANGELOG.md PR: 276634 Reported by: Trond.Endrestol@ximalas.info [1] --- sysutils/bareos21-server/Makefile | 6 +- sysutils/bareos21-server/distinfo | 6 +- ...patch-core-cmake_BareosInstallConfigFiles.cmake | 77 ++++++++++++---------- ...atch-core-cmake_BareosSetVariableDefaults.cmake | 14 ++-- .../bareos21-server/files/pkg-deinstall.client.in | 2 +- www/bareos21-webui/Makefile | 2 +- www/bareos21-webui/distinfo | 6 +- 7 files changed, 60 insertions(+), 53 deletions(-) diff --git a/sysutils/bareos21-server/Makefile b/sysutils/bareos21-server/Makefile index eef5239aa8cd..cbfdcf1e22ee 100644 --- a/sysutils/bareos21-server/Makefile +++ b/sysutils/bareos21-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.8 +DISTVERSION= 21.1.9 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -196,7 +196,7 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: - @${REINPLACE_CMD} '120,123d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '129,132d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "21-server" @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif @@ -218,7 +218,7 @@ post-extract: post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ - ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample + ${CP} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample diff --git a/sysutils/bareos21-server/distinfo b/sysutils/bareos21-server/distinfo index 5a823b29f797..0b8d45b36960 100644 --- a/sysutils/bareos21-server/distinfo +++ b/sysutils/bareos21-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704432911 -SHA256 (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 5cdf196151e758ff2787d47d97153e69cf75895d81f559b61c06679166a60b4d -SIZE (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 11663322 +TIMESTAMP = 1714628145 +SHA256 (bareos-bareos-Release-21.1.9_GH0.tar.gz) = cea611402f3d42903e8ad56808e43f3bc2163e0dbbbca4cba3f4abab8842320c +SIZE (bareos-bareos-Release-21.1.9_GH0.tar.gz) = 11670286 diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake index 63a6f9eec824..63a2ea93f5a4 100644 --- a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake +++ b/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake @@ -1,33 +1,41 @@ ---- core/cmake/BareosInstallConfigFiles.cmake 2020-12-16 02:46:16.000000000 -0500 -+++ core/cmake/BareosInstallConfigFiles.cmake 2020-12-23 22:41:21.832081000 -0500 -@@ -55,20 +55,12 @@ - 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(COPY "${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( +--- core/cmake/BareosInstallConfigFiles.cmake 2024-02-28 05:24:21.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2024-05-02 00:46:57.386839000 -0500 +@@ -27,27 +27,13 @@ + endif() + + get_filename_component(fname ${configfile} NAME) +- if(EXISTS ${DESTCONFDIR}${additionalconfigdir}/${fname}) +- message( +- STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} already exists" +- ) +- message( +- STATUS +- "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}.new" +- ) +- file(RENAME "${configfile}" "${configfile}.new") +- file(COPY "${configfile}.new" +- DESTINATION "${DESTCONFDIR}${additionalconfigdir}" +- ) +- file(RENAME "${configfile}.new" "${configfile}") +- else() +- message( +- STATUS "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}" +- ) +- file(COPY "${configfile}" +- DESTINATION "${DESTCONFDIR}${additionalconfigdir}" +- ) +- endif() ++ ++ message(STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} as ${DESTCONFDIR}${additionalconfigdir}/${fname}.sample (new installation)") ++ file(RENAME "${configfile}" "${configfile}.sample") ++ file( + COPY "${configfile}.sample" -+ DESTINATION "${DESTCONFDIR}/${resname}" -+ ) - endforeach() - endforeach() ++ DESTINATION "${DESTCONFDIR}${additionalconfigdir}" ++ ) + endfunction() -@@ -104,23 +96,12 @@ + macro(BareosInstallConfigFiles CONFDIR CONFIGBASEDIRECTORY PLUGINS BACKENDS +@@ -125,23 +111,12 @@ get_filename_component(dir ${configfile} DIRECTORY) get_filename_component(fname ${configfile} NAME) @@ -48,7 +56,7 @@ - DESTINATION "${DESTCONFDIR}/${dir}" - ) - endif() -+ message(STATUS "${configfile} as ${configfile}") ++ message(STATUS "${configfile} as ${configfile}.sample") + file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") + file( + COPY "${BackendConfigSrcDir}/${configfile}.sample" @@ -57,7 +65,7 @@ endforeach() file( -@@ -130,7 +111,8 @@ +@@ -151,7 +126,8 @@ ) foreach(configfile ${configfiles}) get_filename_component(dir ${configfile} DIRECTORY) @@ -67,7 +75,7 @@ if(EXISTS ${DESTCONFDIR}/${configfile}) message(STATUS "overwriting ${configfile}") -@@ -138,9 +120,11 @@ +@@ -159,9 +135,10 @@ message(STATUS "${configfile} as ${configfile}") endif() @@ -75,14 +83,13 @@ - DESTINATION "${DESTCONFDIR}/${dir}" - ) + file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") -+ file( ++ file( + COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" -+ DESTINATION "${DESTCONFDIR}/${dir}" -+ ) ++ DESTINATION "${DESTCONFDIR}/${dir}") endforeach() endforeach() -@@ -167,20 +151,13 @@ +@@ -188,20 +165,13 @@ string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) if(NOT "${IS_INFILE}" STREQUAL ".in") get_filename_component(fname ${configfile} NAME) diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake index 935c5a5b3177..13a68449b4d3 100644 --- a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake +++ b/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake @@ -1,15 +1,15 @@ ---- core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:21:15.864122000 -0500 -+++ core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:23:58.960984000 -0500 -@@ -641,7 +641,11 @@ - set(PACKAGE_URL "\"\"") +--- core/cmake/BareosSetVariableDefaults.cmake 2024-02-28 05:24:21.000000000 -0500 ++++ core/cmake/BareosSetVariableDefaults.cmake 2024-05-02 00:57:55.264449000 -0500 +@@ -568,8 +568,10 @@ + set(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"") set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") --set(ENABLE_NLS 1) +-if(NOT DEFINED ENABLE_NLS) +- set(ENABLE_NLS 1) +if(nls) + SET(ENABLE_NLS 1) +else() + SET(ENABLE_NLS 0) -+endif() + endif() if(HAVE_WIN32) - diff --git a/sysutils/bareos21-server/files/pkg-deinstall.client.in b/sysutils/bareos21-server/files/pkg-deinstall.client.in index 3be8c2e4874c..a6b96a17667d 100644 --- a/sysutils/bareos21-server/files/pkg-deinstall.client.in +++ b/sysutils/bareos21-server/files/pkg-deinstall.client.in @@ -7,7 +7,7 @@ USER=%%BAREOS_USER%% GROUP=%%BAREOS_GROUP%% UID=%%BAREOS_UID%% GID=%%BAREOS_UID%% -BACULA_DIR=%%BAREOS_DIR%% +BAREOS_DIR=%%BAREOS_DIR%% TMPFILE=/tmp/services-$RANDOM-$$ diff --git a/www/bareos21-webui/Makefile b/www/bareos21-webui/Makefile index 5712ff597452..e0ef8025450f 100644 --- a/www/bareos21-webui/Makefile +++ b/www/bareos21-webui/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.8 +DISTVERSION= 21.1.9 CATEGORIES?= www sysutils PKGNAMESUFFIX= 21-webui diff --git a/www/bareos21-webui/distinfo b/www/bareos21-webui/distinfo index 2d2bd1dabcac..4a42ebd17c2c 100644 --- a/www/bareos21-webui/distinfo +++ b/www/bareos21-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704486594 -SHA256 (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 5cdf196151e758ff2787d47d97153e69cf75895d81f559b61c06679166a60b4d -SIZE (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 11663322 +TIMESTAMP = 1714631959 +SHA256 (bareos-bareos-Release-21.1.9_GH0.tar.gz) = cea611402f3d42903e8ad56808e43f3bc2163e0dbbbca4cba3f4abab8842320c +SIZE (bareos-bareos-Release-21.1.9_GH0.tar.gz) = 11670286