From nobody Sat Apr 27 05:48:50 2024 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 4VRJYZ6npcz5HsDH; Sat, 27 Apr 2024 05:48:50 +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 4VRJYZ6ChPz58vm; Sat, 27 Apr 2024 05:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714196930; 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=e6ucF+Nzjwy82XAW6rnZqZ2qGYaBVQmNYyP2er8HZ00=; b=k10LNQyI5aI2VoW+B+rkMuQNZU1G3TWb/N7sK5AAM3qZtyQCEYhy9bKZDyg/fp42p+UlFG apNGUtb5tbyM6IXCJnTmVbaPbLIfzCQNOjOSVIHvap0a1SurR8vLVqZiqUIVovDQjWXy57 GeQKm7AodYcDtWOEUtpezuNkKGuOv2teuewktyRzQZCdOYTI4P3zNz/6qheR/iK5X27hJL 8svnQq+cFxiGc8HrJMa+oVmC/4E66/2Molr3Mil7WVQZB2GPK8cxol55fX1pRcjkfEbsLN fwClmyMdy2kYkfAP6ay/RbNwE51bYYO08tGL3KLA/fUEl1GUT/gF9x/+D5ZvWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714196930; a=rsa-sha256; cv=none; b=Cb0Ua8SGBa2RZSnDOcesDZUD32xbo3Hx9XfFf64ruaKSTm2snL+8mJVXbPb2BW5FiHlvvZ eqyeqUvC2ySjsIsXW8uyYIFCBT4jCtguxTt+AO5S/07M/BndUqjsw705JrfNXCK5sbRtRg roXiuIz76YS+yChKzecO//6xB14c0nKJXS11rdyXLFBzy4gLhIyF+9zWFLJHm71zzUNtZ+ qTXuQ75Tbf3qaj/QKeyGNRioXfP7wgF3+mBO3sSnDOlyx3i95VB/TcSze0PS2IFq8d3uO/ OaP2WmXmEc9hgOb3OkF++vtYzV2gcKm7QlNJsazjC7lUG/+CnxmD3YpO+RxUeQ== 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=1714196930; 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=e6ucF+Nzjwy82XAW6rnZqZ2qGYaBVQmNYyP2er8HZ00=; b=ipCqsHlJx47AmXeB/fpqqHq+thQS0F+nyDMCL4+2B/Y1lHWKkIF8w11SAARVP5qusCertW X6IAK3bh+xbMuwuHVMGuloJfK3rgLfQY4etNY1TGvyN1dmm0WAMgIBf85gauSWO/H8mxSi oRGcTcGYoaxZm8NH+39Pp+PLyl1V9jg846jJXn0dpVb7FxHAKo+bKxVdkI4li4rKkeE5Ty Hldkky0AnNI73R8LrdZxqS0FrqKBdGRlAUKypzwcK0tl3TagBoRtbiKuU2iiXtCDGCZFqz r9maSk+Ggm8bOrsFQvZ6M1WpJ5q7LrbuYGjRcpmq7JObNlIaW47wYAfLOx6x/w== 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 4VRJYZ5gqGzDp7; Sat, 27 Apr 2024 05:48:50 +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 43R5moYv000148; Sat, 27 Apr 2024 05:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5moth000145; Sat, 27 Apr 2024 05:48:50 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:48:50 GMT Message-Id: <202404270548.43R5moth000145@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 43ecb9346397 - main - databases/pgbackrest: update to 2.51 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ecb93463973dbe210d4fd5dc2158b962a012bc Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=43ecb93463973dbe210d4fd5dc2158b962a012bc commit 43ecb93463973dbe210d4fd5dc2158b962a012bc Author: Michael Schout AuthorDate: 2024-04-14 16:08:30 +0000 Commit: Zsolt Udvari CommitDate: 2024-04-27 05:48:06 +0000 databases/pgbackrest: update to 2.51 Switch to meson build system. Rename option SSH to SFTP. The origin of patch is https://github.com/pgbackrest/pgbackrest/commit/7b95fd3bd29346e7325aa161bfee45efd71e22eb It is upstreamed and can remove it at update to 2.52. Changelog: https://pgbackrest.org/release.html#2.51 PR: 276559 Approved by: diizzy (mentor) Differential Revision: https://reviews.freebsd.org/D44791 --- databases/pgbackrest/Makefile | 30 +++++++++++++--------- databases/pgbackrest/distinfo | 6 ++--- databases/pgbackrest/files/patch-meson.build | 28 ++++++++++++++++++++ .../pgbackrest/files/patch-meson__options.txt | 8 ++++++ databases/pgbackrest/files/patch-src_meson.build | 10 ++++++++ 5 files changed, 67 insertions(+), 15 deletions(-) diff --git a/databases/pgbackrest/Makefile b/databases/pgbackrest/Makefile index 99d7f8a1cb99..49b628288584 100644 --- a/databases/pgbackrest/Makefile +++ b/databases/pgbackrest/Makefile @@ -1,6 +1,6 @@ PORTNAME= pgbackrest DISTVERSIONPREFIX= release/ -DISTVERSION= 2.49 +DISTVERSION= 2.51 CATEGORIES= databases MAINTAINER= schoutm@gmail.com @@ -8,31 +8,37 @@ COMMENT= Reliable PostgreSQL Backup & Restore WWW= https://pgbackrest.org/ LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/../LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libyaml.so:textproc/libyaml -USES= gmake gnome pkgconfig pgsql ssl +USES= gnome meson pgsql pkgconfig python ssl +USE_GITHUB= yes USE_GNOME= libxml2 -GNU_CONFIGURE= yes -USE_GITHUB= yes +MESON_ARGS+= -Dconfigdir="${LOCALBASE}/etc/pgbackrest" + +BINARY_ALIAS= python3=${PYTHON_CMD} -WRKSRC_SUBDIR= src +OPTIONS_DEFINE= LZ4 SFTP ZSTD +OPTIONS_DEFAULT= LZ4 -ALL_TARGET= +SFTP_DESC= Enable SFTP storage support -CONFIGURE_ARGS= --with-configdir="${LOCALBASE}/etc/pgbackrest" +LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZ4_MESON_ON= -Dliblz4=enabled +LZ4_MESON_OFF= -Dliblz4=disabled -OPTIONS_DEFINE= ZSTD +SFTP_LIB_DEPENDS= libssh2.so:security/libssh2 +SFTP_MESON_ON= -Dlibssh2=enabled +SFTP_MESON_OFF= -Dlibssh2=disabled ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd -ZSTD_CONFIGURE_OFF= ac_cv_lib_zstd_ZSTD_isError=no -ZSTD_CONFIGURE_ON= ac_cv_lib_zstd_ZSTD_isError=yes +ZSTD_MESON_ON= -Dlibzstd=enabled +ZSTD_MESON_OFF= -Dlibzstd=disabled post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgbackrest ${MKDIR} ${STAGEDIR}${PREFIX}/etc/pgbackrest .include diff --git a/databases/pgbackrest/distinfo b/databases/pgbackrest/distinfo index f3db3ba835a5..1f96f8d089b8 100644 --- a/databases/pgbackrest/distinfo +++ b/databases/pgbackrest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704919820 -SHA256 (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 32a2d1bd504cc13f6e01533811104da39e2e842cdd8a7ba87293021cf03162f3 -SIZE (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 6162457 +TIMESTAMP = 1712155789 +SHA256 (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 9fa6760032927de448251fb1e5b824e2d17caf560796e74947275b72dc20ed2a +SIZE (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 6119922 diff --git a/databases/pgbackrest/files/patch-meson.build b/databases/pgbackrest/files/patch-meson.build new file mode 100644 index 000000000000..96a8b063da4b --- /dev/null +++ b/databases/pgbackrest/files/patch-meson.build @@ -0,0 +1,28 @@ +--- meson.build.orig 2024-04-10 11:23:05 UTC ++++ meson.build +@@ -144,7 +144,7 @@ lib_bz2 = cc.find_library('bz2') + lib_bz2 = cc.find_library('bz2') + + # Find optional lz4 library +-lib_lz4 = dependency('liblz4', required: false) ++lib_lz4 = dependency('liblz4', required: get_option('liblz4')) + + if lib_lz4.found() + configuration.set('HAVE_LIBLZ4', true, description: 'Is liblz4 present?') +@@ -168,14 +168,14 @@ configuration.set('ZLIB_CONST', true, description: 'Re + configuration.set('ZLIB_CONST', true, description: 'Require zlib const input buffer') + + # Find optional libssh2 library +-lib_ssh2 = dependency('libssh2', required: false) ++lib_ssh2 = dependency('libssh2', required: get_option('libssh2')) + + if lib_ssh2.found() + configuration.set('HAVE_LIBSSH2', true, description: 'Is libssh2 present?') + endif + + # Find optional zstd library +-lib_zstd = dependency('libzstd', version: '>=1.0', required: false) ++lib_zstd = dependency('libzstd', version: '>=1.0', required: get_option('libzstd')) + + if lib_zstd.found() + configuration.set('HAVE_LIBZST', true, description: 'Is libzstd present?') diff --git a/databases/pgbackrest/files/patch-meson__options.txt b/databases/pgbackrest/files/patch-meson__options.txt new file mode 100644 index 000000000000..30bdd3e9599f --- /dev/null +++ b/databases/pgbackrest/files/patch-meson__options.txt @@ -0,0 +1,8 @@ +--- meson_options.txt.orig 2024-03-24 20:53:22 UTC ++++ meson_options.txt +@@ -1,2 +1,5 @@ option('fatal-errors', type: 'boolean', value: false, + option('configdir', type: 'string', value: '/etc/pgbackrest', description: 'Configuration directory') + option('fatal-errors', type: 'boolean', value: false, description: 'Stop compilation on first error') ++option('liblz4', type: 'feature', value: 'auto', description: 'Enable LZ4 compression support') ++option('libssh2', type: 'feature', value: 'auto', description: 'Enable SFTP storage support') ++option('libzstd', type: 'feature', value: 'auto', description: 'Enable Zstandard compression support') diff --git a/databases/pgbackrest/files/patch-src_meson.build b/databases/pgbackrest/files/patch-src_meson.build new file mode 100644 index 000000000000..3ea71633e6c1 --- /dev/null +++ b/databases/pgbackrest/files/patch-src_meson.build @@ -0,0 +1,10 @@ +--- src/meson.build.orig 2024-03-24 20:53:22 UTC ++++ src/meson.build +@@ -284,5 +284,6 @@ executable( + lib_xml, + lib_z, + lib_zstd, +- ] ++ ], ++ install: true, + )