From nobody Fri Jan 05 20:48:35 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 4T6Fsw0Rf5z55t44; Fri, 5 Jan 2024 20:48:36 +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 4T6Fsv5h4rz4FD8; Fri, 5 Jan 2024 20:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704487715; 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=KDc4zhiFqVB0v3Ssev2gujLwKADYDxgeGFsay/NG4o8=; b=cuQc3S/RiQlL2qveP/LRUdpin8aMeG3d6SMIxkULjdIad6S6cTK4x5dnCKm9iqZhG1wIaK /sNu0NydczQ3CYE/Z+yuQABIoAt0+0zmYyKjI6rODYr06O865n++To4+1hNaVwczkGsCnL maYW71VOHnXJHAzh6s/W09iOiUWL6dUxdzeUDhmi+RdzmBN8dZRhMpIjn0h5mIcs/nnJXi RiYDxsIZO66GvMfygg3N4dbv7iyInHguSxuoH8wS7H+i1eruE5vx01jqrBzw0xM0F0psj7 poez/aS0iDQc1Tj/80I5HWCG979VzchogefyhxD9j1NDS7yt08E67AwnqKZv9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704487715; 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=KDc4zhiFqVB0v3Ssev2gujLwKADYDxgeGFsay/NG4o8=; b=Zl7EbUO/dMrqQj9DPbYxpFc2vm873bbW0hqsBNWhuhUhMD7VOrCKtkIO/y0AngPjrVF+l5 sykKvWdSrQEDJq2LcB3D4gVALiqvNUIu0LtGsHfOmVIqVJW5U10DSoYQh+O9/Y6KZ4Skyl cKwoKjHmXmF1hIU0K4UdYXqcSkcwZqgT+uG1r/HogGliuPCmo6YvVgLWFHzgdwCFbwr92w cf3ctB6fUsjD7deK5wf5R4aDkmW8YvtqplTtlHK9RDiD6wX7pim2aHBMiozm5+y/+k3utA /tj+NetzBgBvCy16D3xJM2EG/KlZZEw9HzJ6NiFxm5oB19QDws1xG95M4spbuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704487715; a=rsa-sha256; cv=none; b=AXE9e+GEB2OvSADcxHpwoEipt7lRsomHEeHY3rAPA5oun3FuaUsjPY6b+MElpk7BIc1Dq+ ZJpxGiRieadrCTgzAQT6vDyWhzY2STMjBRgqxuHzDs+h49RV1m3iFgXmPA48csWS3rigLM 1+Ezoe1TKyAe5Cm4IJFTLYASTqAopsYdwcB1Ij5dagi9BI/twmClpEazq/H3eTZoDXWxyv EidAFQpklvt4aULeBsV7lSf3FJd1GhhEE/QBTPFrFSXAoNy29UMiS8JaRSEW64eH91md1p ONpmkzrkderJioIJslsStRYbXISF7i8VR5LQYcBK6YBHCFuIlR0HrWHQ2czRKw== 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 4T6Fsv4mQCz19tt; Fri, 5 Jan 2024 20:48:35 +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 405KmZaM078262; Fri, 5 Jan 2024 20:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405KmZRE078259; Fri, 5 Jan 2024 20:48:35 GMT (envelope-from git) Date: Fri, 5 Jan 2024 20:48:35 GMT Message-Id: <202401052048.405KmZRE078259@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: f1885a5e16f3 - main - security/bareos-*: Update to 22.1.3 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: f1885a5e16f3ec91ade46d40035ae4c0a2a44cf8 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1885a5e16f3ec91ade46d40035ae4c0a2a44cf8 commit f1885a5e16f3ec91ade46d40035ae4c0a2a44cf8 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-01-05 20:46:58 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-01-05 20:48:23 +0000 security/bareos-*: Update to 22.1.3 - Fix pkg-plist [1] PR: 270967 Reported by: ddrinnon _at_ cdor.net [1] --- sysutils/bareos-server/Makefile | 4 +- sysutils/bareos-server/distinfo | 6 +- ...patch-core-cmake_BareosInstallConfigFiles.cmake | 80 ++++++++++++---------- sysutils/bareos-server/pkg-plist | 1 - sysutils/py-python-bareos/Makefile | 2 +- sysutils/py-python-bareos/distinfo | 6 +- www/bareos-webui/Makefile | 2 +- www/bareos-webui/distinfo | 6 +- 8 files changed, 56 insertions(+), 51 deletions(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 62c22e675c83..b3df0a11aec7 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 22.0.3 +DISTVERSION= 22.1.3 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -215,7 +215,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 + ${MV} ${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/bareos-server/distinfo b/sysutils/bareos-server/distinfo index 5663ab3f8511..e6ac2baf20d2 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680719160 -SHA256 (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 3ea98d4ca78e4451ce4f4e2990547de0872330ab115eb27e1471c3af34380404 -SIZE (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 14529338 +TIMESTAMP = 1704433438 +SHA256 (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 765bf250a34296756051e896b28130b2ca3965cebaf310116c50e3e6c63d7d52 +SIZE (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 14745204 diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake index 63a6f9eec824..85e738c8e9f4 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake +++ b/sysutils/bareos-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( -+ COPY "${configfile}.sample" -+ DESTINATION "${DESTCONFDIR}/${resname}" -+ ) - endforeach() - endforeach() +--- core/cmake/BareosInstallConfigFiles.cmake 2023-12-13 07:48:37.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2024-01-05 01:02:51.562611000 -0500 +@@ -27,27 +27,13 @@ + endif() -@@ -104,23 +96,12 @@ + 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}${additionalconfigdir}" ++ ) + endfunction() + + 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,22 +75,20 @@ if(EXISTS ${DESTCONFDIR}/${configfile}) message(STATUS "overwriting ${configfile}") -@@ -138,9 +120,11 @@ +@@ -159,8 +135,10 @@ message(STATUS "${configfile} as ${configfile}") endif() - file(COPY "${BackendConfigSrcDir}/${configfile}" - DESTINATION "${DESTCONFDIR}/${dir}" -- ) + file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") -+ file( ++ file( + COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" + DESTINATION "${DESTCONFDIR}/${dir}" -+ ) + ) endforeach() - endforeach() -@@ -167,20 +151,13 @@ +@@ -188,20 +166,13 @@ string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) if(NOT "${IS_INFILE}" STREQUAL ".in") get_filename_component(fname ${configfile} NAME) diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index c6114abb9712..5fe4dcb666e8 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -45,7 +45,6 @@ bin/bwild @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample -%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bsmc.conf %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir lib/bareos/backends/libbareoscats-%%DBTYPE%%.so diff --git a/sysutils/py-python-bareos/Makefile b/sysutils/py-python-bareos/Makefile index ee81dd363e94..92fc480b93e2 100644 --- a/sysutils/py-python-bareos/Makefile +++ b/sysutils/py-python-bareos/Makefile @@ -1,5 +1,5 @@ PORTNAME= python-bareos -PORTVERSION= 22.0.3 +PORTVERSION= 22.1.3 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-python-bareos/distinfo b/sysutils/py-python-bareos/distinfo index cd59bc6235f1..dc44ef59006a 100644 --- a/sysutils/py-python-bareos/distinfo +++ b/sysutils/py-python-bareos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680908895 -SHA256 (python-bareos-22.0.3.tar.gz) = 2988b4efb583538ee6679cfa956b907717c298c895ef91910f1b671c8ae91097 -SIZE (python-bareos-22.0.3.tar.gz) = 23622 +TIMESTAMP = 1704486902 +SHA256 (python-bareos-22.1.3.tar.gz) = e3ff6c7c9bc67898360315844afe128b8d176cb0f6d0df59b0ea6a9b43ec4350 +SIZE (python-bareos-22.1.3.tar.gz) = 35782 diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 272b633a662b..00a41fdf1469 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 22.0.3 +DISTVERSION= 22.1.3 CATEGORIES?= www sysutils PKGNAMESUFFIX= -webui diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo index 76286a771f9f..fe4153fead46 100644 --- a/www/bareos-webui/distinfo +++ b/www/bareos-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680995698 -SHA256 (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 3ea98d4ca78e4451ce4f4e2990547de0872330ab115eb27e1471c3af34380404 -SIZE (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 14529338 +TIMESTAMP = 1704486712 +SHA256 (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 765bf250a34296756051e896b28130b2ca3965cebaf310116c50e3e6c63d7d52 +SIZE (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 14745204