diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index ba355c69aaa8..4824d9b441e4 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -1,45 +1,47 @@ PORTNAME= barman DISTVERSIONPREFIX= release/ -DISTVERSION= 3.11.1 +DISTVERSION= 3.12.0 CATEGORIES= databases PKGNAMEPREFIX= pg PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= matthew@FreeBSD.org COMMENT= Backup and recovery manager for PostgreSQL WWW= https://pgbarman.org/ LICENSE= GPLv3 RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= EnterpriseDB WANT_PGSQL= client NO_ARCH= yes USERS= barman GROUPS= barman .include -PGUSER= pgsql - post-patch: - ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/barman/config.py - ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/doc/barman.conf - ${SED} -i -e "s@%%PGUSER%%@${PGUSER}@" ${WRKSRC}/doc/barman.5 +.for f in barman/config.py \ + docs/barman.conf \ + docs/_build/man/barman-config-update.1 \ + docs/_build/man/barman.1 \ + docs/_build/man/barman.5 + ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/${f} +.endfor post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/barman.conf \ + ${INSTALL_DATA} ${WRKSRC}/docs/barman.conf \ ${STAGEDIR}${ETCDIR}/barman.conf.sample .include diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo index 7740df650963..ec7996aaf5a4 100644 --- a/databases/pgbarman/distinfo +++ b/databases/pgbarman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724396335 -SHA256 (EnterpriseDB-barman-release-3.11.1_GH0.tar.gz) = 61a5d687a56b42c2a9adeb6dd3760d2654990f0760230c721cc8a73a910a9f0a -SIZE (EnterpriseDB-barman-release-3.11.1_GH0.tar.gz) = 1899344 +TIMESTAMP = 1732358130 +SHA256 (EnterpriseDB-barman-release-3.12.0_GH0.tar.gz) = 060fc3d4f10697ff1e889033d54e63e23b2c8c6209a3e4bce2f137096a9ffb4a +SIZE (EnterpriseDB-barman-release-3.12.0_GH0.tar.gz) = 3098046 diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py index f5ff6b265be0..005a002ec065 100644 --- a/databases/pgbarman/files/patch-barman_config.py +++ b/databases/pgbarman/files/patch-barman_config.py @@ -1,13 +1,22 @@ ---- barman/config.py.orig 2023-10-03 12:56:33 UTC +--- barman/config.py.orig 2024-11-23 11:42:48 UTC +++ barman/config.py -@@ -802,8 +802,8 @@ class Config(object): +@@ -1194,15 +1194,15 @@ class Config(object): + class Config(object): + """This class represents the barman configuration. + +- Default configuration files are /etc/barman.conf, +- /etc/barman/barman.conf ++ Default configuration files are %%PREFIX%%/etc/barman.conf, ++ %%PREFIX%%/etc/barman/barman.conf + and ~/.barman.conf for a per-user configuration + """ CONFIG_FILES = [ "~/.barman.conf", - "/etc/barman.conf", - "/etc/barman/barman.conf", + "%%PREFIX%%/etc/barman.conf", + "%%PREFIX%%/etc/barman/barman.conf", ] _QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""") diff --git a/databases/pgbarman/files/patch-doc_barman.5 b/databases/pgbarman/files/patch-doc_barman.5 deleted file mode 100644 index 2f63c46013e8..000000000000 --- a/databases/pgbarman/files/patch-doc_barman.5 +++ /dev/null @@ -1,58 +0,0 @@ ---- doc/barman.5.orig 2023-10-03 12:56:33 UTC -+++ doc/barman.5 -@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located - .IP - .nf - \f[C] --/etc/barman.conf -+%%PREFIX%%/etc/barman.conf - \f[] - .fi - .PP -@@ -25,7 +25,7 @@ or - .IP - .nf - \f[C] --/etc/barman/barman.conf -+%%PREFIX%%/etc/barman/barman.conf - \f[] - .fi - .PP -@@ -51,9 +51,9 @@ that folder. - If the value of \f[C]configuration_files_directory\f[] is a directory, - Barman reads all files with \f[C]\&.conf\f[] extension that exist in - that folder. --For example, if you set it to \f[C]/etc/barman.d\f[], you can specify -+For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[], you can specify - your PostgreSQL servers placing each section in a separate --\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder. -+\f[C]\&.conf\f[] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[] folder. - .SH OPTIONS - .TP - .B active -@@ -1082,7 +1082,7 @@ Here is an example of configuration file: - \f[C] - [barman] - ;\ Main\ directory --barman_home\ =\ /var/lib/barman -+barman_home\ =\ /var/barman - - ;\ System\ user - barman_user\ =\ barman -@@ -1102,13 +1102,13 @@ description\ =\ \ "Main\ PostgreSQL\ Database" - description\ =\ \ "Main\ PostgreSQL\ Database" - - ;\ SSH\ options --ssh_command\ =\ ssh\ postgres\@pg -+ssh_command\ =\ ssh\ %%PGUSER%%\@pg - - ;\ PostgreSQL\ connection\ string --conninfo\ =\ host=pg\ user=postgres -+conninfo\ =\ host=pg\ user=%%PGUSER%% - - ;\ PostgreSQL\ streaming\ connection\ string --streaming_conninfo\ =\ host=pg\ user=postgres -+streaming_conninfo\ =\ host=pg\ user=%%PGUSER%% - - ;\ Minimum\ number\ of\ required\ backups\ (redundancy) - minimum_redundancy\ =\ 1 diff --git a/databases/pgbarman/files/patch-docs___build_man_barman-config-update.1 b/databases/pgbarman/files/patch-docs___build_man_barman-config-update.1 new file mode 100644 index 000000000000..66e55cb5e269 --- /dev/null +++ b/databases/pgbarman/files/patch-docs___build_man_barman-config-update.1 @@ -0,0 +1,13 @@ +--- docs/_build/man/barman-config-update.1.orig 2024-11-23 11:48:56 UTC ++++ docs/_build/man/barman-config-update.1 +@@ -53,8 +53,8 @@ file has higher precedence and will override values fr + The barman \fBconfig\-update\fP command writes configuration options to a file named + \fB\&.barman.auto.conf\fP, located in the \fBbarman_home\fP directory. This configuration + file has higher precedence and will override values from the global Barman +-configuration file (usually \fB/etc/barman.conf\fP) and from any included files specified +-in \fBconfiguration_files_directory\fP (typically files in \fB/etc/barman.d\fP). Be aware ++configuration file (usually \fB%%PREFIX%%/etc/barman.conf\fP) and from any included files specified ++in \fBconfiguration_files_directory\fP (typically files in \fB%%PREFIX%%/etc/barman.d\fP). Be aware + of this if you decide to manually modify configuration options in those files later. + .UNINDENT + .UNINDENT diff --git a/databases/pgbarman/files/patch-docs___build_man_barman.1 b/databases/pgbarman/files/patch-docs___build_man_barman.1 new file mode 100644 index 000000000000..962dd1878bdc --- /dev/null +++ b/databases/pgbarman/files/patch-docs___build_man_barman.1 @@ -0,0 +1,22 @@ +--- docs/_build/man/barman.1.orig 2024-11-23 11:47:45 UTC ++++ docs/_build/man/barman.1 +@@ -84,7 +84,7 @@ synopsis should be seen as a replacement for the \fBSU + .INDENT 0.0 + .TP + .B \fB\-c\fP / \fB\-\-config CONFIG\fP +-Specify the configuration file to be used. Defaults to \fB/etc/barman.conf\fP if ++Specify the configuration file to be used. Defaults to \fB%%PREFIX%%/etc/barman.conf\fP if + not provided. + .TP + .B \fB\-\-color\fP / \fB\-\-colour { never | always | auto }\fP +@@ -554,8 +554,8 @@ file has higher precedence and will override values fr + The barman \fBconfig\-update\fP command writes configuration options to a file named + \fB\&.barman.auto.conf\fP, located in the \fBbarman_home\fP directory. This configuration + file has higher precedence and will override values from the global Barman +-configuration file (usually \fB/etc/barman.conf\fP) and from any included files specified +-in \fBconfiguration_files_directory\fP (typically files in \fB/etc/barman.d\fP). Be aware ++configuration file (usually \fB%%PREFIX%%/etc/barman.conf\fP) and from any included files specified ++in \fBconfiguration_files_directory\fP (typically files in \fB%%PREFIX%%/etc/barman.d\fP). Be aware + of this if you decide to manually modify configuration options in those files later. + .UNINDENT + .UNINDENT diff --git a/databases/pgbarman/files/patch-docs___build_man_barman.5 b/databases/pgbarman/files/patch-docs___build_man_barman.5 new file mode 100644 index 000000000000..d28981bdef54 --- /dev/null +++ b/databases/pgbarman/files/patch-docs___build_man_barman.5 @@ -0,0 +1,45 @@ +--- docs/_build/man/barman.5.orig 2024-11-23 11:45:54 UTC ++++ docs/_build/man/barman.5 +@@ -44,13 +44,13 @@ barman system, such as the main directory, system user + .sp + 1. \fBGlobal Configuration\fP: It comprises one file with a set of configurations for the + barman system, such as the main directory, system user, log file, and other general +-options. Default location is \fB/etc/barman.conf\fP and it can be overridden on a per\-user ++options. Default location is \fB%%PREFIX%%/etc/barman.conf\fP and it can be overridden on a per\-user + level by \fB~/.barman.conf\fP or by specifying a \fB\&.conf\fP file using the \fB\-c\fP / + \fB\-\-config\fP with the \fI\%barman command\fP directly in the CLI. + .sp + 2. \fBServer Configuration\fP: It comprises one or more files with a set of + configurations for a Postgres server that you want to keep track and interact for +-backup, recovery and/or replication. Default location is \fB/etc/barman.d\fP and must use ++backup, recovery and/or replication. Default location is \fB%%PREFIX%%/etc/barman.d\fP and must use + the \fB\&.conf\fP suffix. You may have one or multiple files for servers. You can override the + default location by setting the \fBconfiguration_files_directory\fP option in the global + configuration file and placing the files in that particular location. +@@ -58,7 +58,7 @@ the model. These overrides can be implemented using th + 3. \fBModel Configuration\fP: It comprises one or more files with a set of + configurations overrides that can be applied to Barman servers within the same cluster as + the model. These overrides can be implemented using the barman \fBconfig\-switch\fP command. +-Default location is \fB/etc/barman.d\fP and must use the \fB\&.conf\fP suffix. The same ++Default location is \fB%%PREFIX%%/etc/barman.d\fP and must use the \fB\&.conf\fP suffix. The same + \fBconfiguration_files_directory\fP override option from the server configuration applies for + models. You may have one or multiple files for models. + .sp +@@ -175,7 +175,7 @@ Scope: Global / Server / Model. + .sp + \fBbarman_home\fP + .sp +-Designates the main data directory for Barman. Defaults to \fB/var/lib/barman\fP\&. ++Designates the main data directory for Barman. Defaults to \fB/var/barman\fP\&. + .sp + Scope: Global. + .sp +@@ -255,7 +255,7 @@ Designates the directory where server/model configurat + \fBconfiguration_files_directory\fP + .sp + Designates the directory where server/model configuration files will be read by Barman. +-Defaults to \fB/etc/barman.d/\fP\&. ++Defaults to \fB%%PREFIX%%/etc/barman.d/\fP\&. + .sp + Scope: Global. + .sp diff --git a/databases/pgbarman/files/patch-doc_barman.conf b/databases/pgbarman/files/patch-docs_barman.conf similarity index 89% rename from databases/pgbarman/files/patch-doc_barman.conf rename to databases/pgbarman/files/patch-docs_barman.conf index b2993aff915d..02f0d4e7dbdd 100644 --- a/databases/pgbarman/files/patch-doc_barman.conf +++ b/databases/pgbarman/files/patch-docs_barman.conf @@ -1,17 +1,17 @@ ---- doc/barman.conf.orig 2023-10-03 12:56:33 UTC -+++ doc/barman.conf +--- docs/barman.conf.orig 2024-11-23 11:44:09 UTC ++++ docs/barman.conf @@ -8,11 +8,11 @@ barman_user = barman barman_user = barman ; Directory of configuration files. Place your sections in separate files with .conf extension -; For example place the 'main' server section in /etc/barman.d/main.conf -configuration_files_directory = /etc/barman.d +; For example place the 'main' server section in %%PREFIX%%/etc/barman.d/main.conf +configuration_files_directory = %%PREFIX%%/etc/barman.d ; Main directory -barman_home = /var/lib/barman +barman_home = /var/barman ; Locks directory - default: %(barman_home)s ;barman_lock_directory = /var/run/barman