mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-14 07:43:06 +00:00
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]
This commit is contained in:
Jose Alonso Cardenas Marquez
parent
068af41018
commit
c029768658
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 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()
|
||||
|
||||
@@ -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,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)
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
@ -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-$$
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
PORTNAME= bareos
|
||||
DISTVERSIONPREFIX= Release/
|
||||
DISTVERSION= 21.1.8
|
||||
DISTVERSION= 21.1.9
|
||||
CATEGORIES?= www sysutils
|
||||
PKGNAMESUFFIX= 21-webui
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user