From nobody Mon Oct 31 22:13:31 2022 X-Original-To: dev-commits-ports-all@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 4N1S8r1w6Qz4gfSg; Mon, 31 Oct 2022 22:13:32 +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 4N1S8r1LQPz485S; Mon, 31 Oct 2022 22:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667254412; 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=G8EDSnM3Yclf2dOsJCJ/fze8o8R7vL0hbju6d6a5KVU=; b=vEdd6pfwXNl+SNOz76cCywlg7R9QhcNNXMnGyiIuzB6EVMotwX1cpA7+HmPuu8NrmimECy +uhH9NbCmm22diwF96HzhUdw1ctXSPHF1mIGKHVX9Zz5SlI6JjCwxgjB+cYaKErH923FXS 56dnUO5LgSMVK4b8DUY+YWluQoDDp6tv7/0/i35A+di71uIKpPzk4nXMgB1xbn7+POl28T cS/9CIguWtECWG/aFGmi3jK+Y/D6Ttqu+ngheL4DioQKAdMFL9MCeqothYhMx9Qq3uD8a2 TQdUVn6Rj7VLUrHPca8cqFe6BkyxPdKDm1g71ePfkaTcz/4lA/TR8pcTkzWG/A== 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 4N1S8r0Msnzshg; Mon, 31 Oct 2022 22:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29VMDVOT028665; Mon, 31 Oct 2022 22:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VMDV0i028664; Mon, 31 Oct 2022 22:13:31 GMT (envelope-from git) Date: Mon, 31 Oct 2022 22:13:31 GMT Message-Id: <202210312213.29VMDV0i028664@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: 6d3410eea852 - main - sysutils/bareos-*: update to 21.1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 6d3410eea852caa12e26be3fb2df2cc613a9ff11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667254412; 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=G8EDSnM3Yclf2dOsJCJ/fze8o8R7vL0hbju6d6a5KVU=; b=wF98EOz/h0GBD3eESVuXkYAFmgD7/PbKNmTEoTL8SA/ZmxS19f5dUnhExOaSUN+89RkWga X7KowhSeobsEoJqQvwrkPHNIGiyvJSDn5sIGPahBaJmjuWznEZyj5GIl105ris1DfU3MAV S+zPcqq+eYicJRUeNXdNpMCidhARSxAIwpc2TQzDEOY8Rg9CPxWp6nOEGCc1F5R3yo/E5v J8qnOsUArxccpJshVKXg5anZQMcHsoVyYpOeCcfTcA02KV9nDSpmFBqebbGGBHGnKQYED3 TVu7cZWu5h+Kegg8YlQBULUmWc4fxMZytRze5D3oY125hj38kmcDfU9oqhNb0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667254412; a=rsa-sha256; cv=none; b=Z9BjG9rPsZlwsiKB/5BkfKPpi0nmvI0447775deVsx26MsZISJT3qfPogiOYct6h7JV1Df ed76E52qdBoubJs4goCq2g37x8/ncJGNfVleh0FopcCLx5XUP6RvGnWR3LLwzc8IOAQats p7joURX1nJJkQgbtLb8lM2Uy23iOIQBB22+ZOqBF5sBXq2POVfZmgDy17/n0/my5nbz54q KhthMc7JYKNwvtUil9Zx1y3BhVyFr7otZ0iGIAtiOIKsxvj/KaIndlGMLd6CjYAKcF0aoy 3b8mQz9TT0GY+wOi5YiJS6+tpU+QTReV9SyHpPYzH0nkf98OcKSv48cvnJiNRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d3410eea852caa12e26be3fb2df2cc613a9ff11 commit 6d3410eea852caa12e26be3fb2df2cc613a9ff11 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-10-31 22:12:39 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-10-31 22:12:39 +0000 sysutils/bareos-*: update to 21.1.4 ChangeLog at: https://github.com/bareos/bareos/blob/Release/21.1.4/CHANGELOG.md --- sysutils/bareos-server/Makefile | 6 +- sysutils/bareos-server/distinfo | 6 +- .../patch-core-cmake_BareosFindAllLibraries.cmake | 90 +--------------------- sysutils/bareos-traymonitor/Makefile | 2 +- www/bareos-webui/Makefile | 2 +- www/bareos-webui/distinfo | 6 +- 6 files changed, 14 insertions(+), 98 deletions(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 3169247de1dd..b337c01882d6 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.3 +DISTVERSION= 21.1.4 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -74,8 +74,8 @@ SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file PYTHON_USES= python -PYTHON_CMAKE_ON= -Dpython=ON -PYTHON_CMAKE_OFF= -Dpython=OFF +PYTHON_CMAKE_ON= -DENABLE_PYTHON=ON +PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo index 12ce9bd74752..b62e16c5e22d 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653200782 -SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11 -SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758 +TIMESTAMP = 1667251095 +SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb +SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699 diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake index f15a4678c330..e3ff7074a02f 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake @@ -1,90 +1,6 @@ ---- core/cmake/BareosFindAllLibraries.cmake 2021-12-21 06:00:49.000000000 -0500 -+++ core/cmake/BareosFindAllLibraries.cmake 2021-12-22 00:16:58.093078000 -0500 -@@ -42,56 +42,39 @@ - set(Python3_FOUND 0) - - else() -- find_package(Python2 COMPONENTS Interpreter Development) -- find_package(Python3 COMPONENTS Interpreter Development) -+ if(python) -+ find_package(Python3 COMPONENTS Interpreter Development) - -- set(Python3_VERSION_MAJOR -- ${Python3_VERSION_MAJOR} -- PARENT_SCOPE -- ) -- -- set(Python3_VERSION_MINOR -- ${Python3_VERSION_MINOR} -- PARENT_SCOPE -- ) -- -- if(${Python2_FOUND} OR ${Python3_FOUND}) -- set(HAVE_PYTHON 1) -- endif() -- -- if(${Python2_FOUND}) -- set(PYTHON_EXECUTABLE -- ${Python2_EXECUTABLE} -+ set(Python3_VERSION_MAJOR -+ ${Python3_VERSION_MAJOR} - PARENT_SCOPE - ) -- set(Python2_EXECUTABLE -- ${Python2_EXECUTABLE} -- PARENT_SCOPE -- ) -- execute_process( -- COMMAND ${Python2_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake -- ) -- include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake) -- set(Python2_CCSHARED ${Python2_CC_FLAGS} -Wno-register) -- endif() - -- if(${Python3_FOUND}) -- set(PYTHON_EXECUTABLE -- ${Python3_EXECUTABLE} -+ set(Python3_VERSION_MINOR -+ ${Python3_VERSION_MINOR} - PARENT_SCOPE - ) -- set(Python3_EXECUTABLE -- ${Python3_EXECUTABLE} -- PARENT_SCOPE -- ) -- execute_process( -- COMMAND ${Python3_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake -- ) -- include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) -+ -+ if(${Python3_FOUND}) -+ set(HAVE_PYTHON 1) -+ endif() -+ -+ if(${Python3_FOUND}) -+ set(PYTHON_EXECUTABLE -+ ${Python3_EXECUTABLE} -+ PARENT_SCOPE -+ ) -+ set(Python3_EXECUTABLE -+ ${Python3_EXECUTABLE} -+ PARENT_SCOPE -+ ) -+ execute_process( -+ COMMAND ${Python3_EXECUTABLE} -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -+ OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake -+ ) -+ include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) -+ endif() - endif() - endif() - -@@ -169,12 +152,18 @@ +--- core/cmake/BareosFindAllLibraries.cmake 2022-08-05 04:40:11.000000000 -0500 ++++ core/cmake/BareosFindAllLibraries.cmake 2022-10-31 16:28:14.422391000 -0500 +@@ -175,12 +175,18 @@ ) endif() diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 7f18df2180b0..c7cc4e25b317 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -1,5 +1,5 @@ PORTNAME= bareos -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 1aff77dab6f9..3eb0014a61bb 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.3 +DISTVERSION= 21.1.4 CATEGORIES?= www sysutils PKGNAMESUFFIX= -webui diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo index 8ffc5a7973f3..5607b68d699a 100644 --- a/www/bareos-webui/distinfo +++ b/www/bareos-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653201609 -SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11 -SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758 +TIMESTAMP = 1667253078 +SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb +SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699