diff --git a/root/ppg/common/deps/etcd/debian/changelog b/root/ppg/common/deps/etcd/debian/changelog index bf7d854a..d62b2e85 100644 --- a/root/ppg/common/deps/etcd/debian/changelog +++ b/root/ppg/common/deps/etcd/debian/changelog @@ -1,3 +1,9 @@ +etcd (3.5.33-1) unstable; urgency=low + + * Update to upstream version 3.5.33, per changes described at: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3533-2026-07-23 + + -- Percona Development Team Fri, 28 Aug 2026 00:00:00 +0000 + etcd (3.5.30-1) unstable; urgency=low * Update to upstream version 3.5.30, per changes described at: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3530-2026-05-01 diff --git a/root/ppg/common/deps/etcd/obs/_service b/root/ppg/common/deps/etcd/obs/_service index c3909afc..c24da8db 100644 --- a/root/ppg/common/deps/etcd/obs/_service +++ b/root/ppg/common/deps/etcd/obs/_service @@ -2,7 +2,7 @@ https://github.com/etcd-io/etcd.git git - v3.5.30 + v3.5.33 @PARENT_TAG@ v(.*) etcd diff --git a/root/ppg/common/deps/etcd/rpm/etcd.spec b/root/ppg/common/deps/etcd/rpm/etcd.spec index 5a9b739d..4d287f52 100644 --- a/root/ppg/common/deps/etcd/rpm/etcd.spec +++ b/root/ppg/common/deps/etcd/rpm/etcd.spec @@ -111,6 +111,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %attr(755, root, root) %{_bindir}/etcdutl %changelog +* Fri Aug 28 2026 Percona Development Team - 3.5.33-1 +- Update to upstream version 3.5.33, per changes described at: + https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3533-2026-07-23 + * Tue May 15 2026 Percona Development Team - 3.5.30-1 - Update to upstream version 3.5.30, per changes described at: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3530-2026-05-01 diff --git a/root/ppg/staging/14/macros.yaml b/root/ppg/staging/14/macros.yaml index e6d4a92b..d9ba0ea5 100644 --- a/root/ppg/staging/14/macros.yaml +++ b/root/ppg/staging/14/macros.yaml @@ -1,6 +1,6 @@ - PG_MAJOR_VERSION: 14 - PG_PREV_MAJOR_VERSION: 13 -- PG_MINOR_VERSION: 23 -- PG_PREV_MINOR_VERSION: 22 +- PG_MINOR_VERSION: 24 +- PG_PREV_MINOR_VERSION: 23 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION} - PGAUDIT_VERSION: 1.6.3 diff --git a/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql-common-dev.docs b/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql-common-dev.docs new file mode 100644 index 00000000..68d3bea6 --- /dev/null +++ b/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql-common-dev.docs @@ -0,0 +1 @@ +doc/postgresql-debian-packaging.md diff --git a/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql.config b/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql.config index f7a577d5..20b136c3 100644 --- a/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql.config +++ b/root/ppg/staging/14/percona-postgresql-common/debian/percona-postgresql.config @@ -9,6 +9,7 @@ NEWVERSION=14 try_upgrade () { # look for the newest "main" cluster + command -v pg_lsclusters >/dev/null || return 0 OLDVERSION=$(pg_lsclusters -h | grep -E '^[0-9.]+ +main ' | tail -n1) [ "$OLDVERSION" ] || return 0 # no cluster found OLDVERSION=${OLDVERSION%% *} diff --git a/root/ppg/staging/15/macros.yaml b/root/ppg/staging/15/macros.yaml index 01fa878d..fd5cbee3 100644 --- a/root/ppg/staging/15/macros.yaml +++ b/root/ppg/staging/15/macros.yaml @@ -1,6 +1,6 @@ - PG_MAJOR_VERSION: 15 - PG_PREV_MAJOR_VERSION: 14 -- PG_MINOR_VERSION: 18 -- PG_PREV_MINOR_VERSION: 17 +- PG_MINOR_VERSION: 19 +- PG_PREV_MINOR_VERSION: 18 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION} - PGAUDIT_VERSION: 1.7.1 diff --git a/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql-common-dev.docs b/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql-common-dev.docs new file mode 100644 index 00000000..68d3bea6 --- /dev/null +++ b/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql-common-dev.docs @@ -0,0 +1 @@ +doc/postgresql-debian-packaging.md diff --git a/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql.config b/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql.config index cb397d03..2f4adffc 100644 --- a/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql.config +++ b/root/ppg/staging/15/percona-postgresql-common/debian/percona-postgresql.config @@ -9,6 +9,7 @@ NEWVERSION=15 try_upgrade () { # look for the newest "main" cluster + command -v pg_lsclusters >/dev/null || return 0 OLDVERSION=$(pg_lsclusters -h | grep -E '^[0-9.]+ +main ' | tail -n1) [ "$OLDVERSION" ] || return 0 # no cluster found OLDVERSION=${OLDVERSION%% *} diff --git a/root/ppg/staging/16/extras/containers/project.yaml b/root/ppg/staging/16/extras/containers/project.yaml index 80f26e5e..e37eb38e 100644 --- a/root/ppg/staging/16/extras/containers/project.yaml +++ b/root/ppg/staging/16/extras/containers/project.yaml @@ -63,7 +63,7 @@ qa: - pipeline: ppg-obs-upgrade parameters: REPOSITORY: registry.opensuse.org/${OBS_CONTAINER_REGISTRY_ROOTPRJ}/ppg/staging/16/extras/containers/ubi9 - OLD_SERVER_VERSION: "15.18" + OLD_SERVER_VERSION: "15.19" NEW_SERVER_VERSION: %!{PG_VERSION} UPGRADE_DOCKER_TAG: %!{PG_MAJOR_VERSION}-%!{PG_PREV_MAJOR_VERSION} OLD_DOCKER_REPOSITORY: registry.opensuse.org/isv/percona/ppg/staging/%!{PG_PREV_MAJOR_VERSION}/extras/containers/ubi9 diff --git a/root/ppg/staging/16/macros.yaml b/root/ppg/staging/16/macros.yaml index 280916d6..46f04b39 100644 --- a/root/ppg/staging/16/macros.yaml +++ b/root/ppg/staging/16/macros.yaml @@ -1,6 +1,7 @@ - PG_MAJOR_VERSION: 16 - PG_PREV_MAJOR_VERSION: 15 -- PG_MINOR_VERSION: 14 -- PG_PREV_MINOR_VERSION: 13 +- PG_MINOR_VERSION: 15 +- PG_PREV_MINOR_VERSION: 14 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION} +- PERCONA_PG_PATCH_VERSION: 1 - PGAUDIT_VERSION: 16.1 diff --git a/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql-common-dev.docs b/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql-common-dev.docs new file mode 100644 index 00000000..68d3bea6 --- /dev/null +++ b/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql-common-dev.docs @@ -0,0 +1 @@ +doc/postgresql-debian-packaging.md diff --git a/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql.config b/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql.config index 90e88687..652355f3 100644 --- a/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql.config +++ b/root/ppg/staging/16/percona-postgresql-common/debian/percona-postgresql.config @@ -9,6 +9,7 @@ NEWVERSION=18 try_upgrade () { # look for the newest "main" cluster + command -v pg_lsclusters >/dev/null || return 0 OLDVERSION=$(pg_lsclusters -h | grep -E '^[0-9.]+ +main ' | tail -n1) [ "$OLDVERSION" ] || return 0 # no cluster found OLDVERSION=${OLDVERSION%% *} diff --git a/root/ppg/staging/16/tde/percona-pg_tde/debian/control b/root/ppg/staging/16/tde/percona-pg_tde/debian/control index 2012e63a..1576a44d 100644 --- a/root/ppg/staging/16/tde/percona-pg_tde/debian/control +++ b/root/ppg/staging/16/tde/percona-pg_tde/debian/control @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), meson, + cmake, ninja-build, chrpath, pkg-config, diff --git a/root/ppg/staging/16/tde/percona-pg_tde/debian/debian.dsc b/root/ppg/staging/16/tde/percona-pg_tde/debian/debian.dsc index 5f0fcb71..0f5ed8e4 100644 --- a/root/ppg/staging/16/tde/percona-pg_tde/debian/debian.dsc +++ b/root/ppg/staging/16/tde/percona-pg_tde/debian/debian.dsc @@ -7,6 +7,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), meson, + cmake, ninja-build, chrpath, pkg-config, diff --git a/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/meson-cpp-std-c2a b/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/meson-cpp-std-c2a new file mode 100644 index 00000000..94eeb8b0 --- /dev/null +++ b/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/meson-cpp-std-c2a @@ -0,0 +1,26 @@ +Use the pre-ratification spelling "c++2a" of the C++20 standard so that +meson 0.56.2 on Debian 11 accepts the cpp_std value ("c++20" was only +added to meson's cpp_std choices in 0.57). gcc and clang treat -std=c++2a +and -std=c++20 identically, and g++ 10 on bullseye compiles the C++ KMIP +client fine. The libkmip cmake subproject needs no change: cmake itself +emits -std=c++2a for CMAKE_CXX_STANDARD 20 on gcc 10. +--- a/meson.build ++++ b/meson.build +@@ -139,7 +139,7 @@ shared_module('pg_tde', + 'src/pg_tde_guc.c', + 'src/smgr/pg_tde_smgr.c', + ), +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + include_directories: incdirs, + install: true, + install_dir: pkglibdir, +@@ -168,7 +168,7 @@ pg_tde_frontend = static_library('pg_tde_frontend', + ), + c_args: ['-DFRONTEND'], + cpp_args: ['-DFRONTEND'], +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + dependencies: [pgfeutils, pgcommon, pgport, curl, crypto, ssl, kmipclient, kmipcore], + include_directories: incdirs, + ) diff --git a/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/series b/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/series new file mode 100644 index 00000000..4a9549b2 --- /dev/null +++ b/root/ppg/staging/16/tde/percona-pg_tde/debian/patches/series @@ -0,0 +1 @@ +meson-cpp-std-c2a diff --git a/root/ppg/staging/16/tde/percona-pg_tde/obs/_service b/root/ppg/staging/16/tde/percona-pg_tde/obs/_service index ae880f8c..a8200645 100644 --- a/root/ppg/staging/16/tde/percona-pg_tde/obs/_service +++ b/root/ppg/staging/16/tde/percona-pg_tde/obs/_service @@ -2,9 +2,9 @@ https://github.com/percona/pg_tde.git git - release-%!{PG_TDE_VERSION} + %!{PG_TDE_VERSION} @PARENT_TAG@ - release-(.*) + enable percona-pg_tde%!{PG_MAJOR_VERSION} diff --git a/root/ppg/staging/16/tde/percona-pg_tde/rpm/pg_tde.spec b/root/ppg/staging/16/tde/percona-pg_tde/rpm/pg_tde.spec index c34184dc..db63bee4 100644 --- a/root/ppg/staging/16/tde/percona-pg_tde/rpm/pg_tde.spec +++ b/root/ppg/staging/16/tde/percona-pg_tde/rpm/pg_tde.spec @@ -33,12 +33,17 @@ License: PostgreSQL URL: https://github.com/percona/pg_tde Source0: %{sname}-%{version}.tar.gz -BuildRequires: %{pg_name}-devel chrpath openssl-devel libcurl-devel zlib-devel libzstd-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel meson +BuildRequires: %{pg_name}-devel chrpath openssl-devel libcurl-devel zlib-devel libzstd-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel meson cmake %if 0%{?gts_version} BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c++ gcc-toolset-%{gts_version}-annobin-plugin-gcc %endif %if 0%{?suse_version} >= 1500 BuildRequires: libjson-c-devel liblz4-devel +# The C++ KMIP client needs a C++ compiler. Without gcc-c++ in the chroot +# meson falls back to clang++ (pulled in via the llvm BuildRequires) while +# C is compiled by gcc; with SUSE's default -flto=auto the mixed toolchain +# produces archives/objects the linker cannot combine. +BuildRequires: gcc-c++ %else BuildRequires: json-c-devel lz4-devel %endif diff --git a/root/ppg/staging/16/tde/percona-postgresql/obs/_service b/root/ppg/staging/16/tde/percona-postgresql/obs/_service index c09cf7b5..68e8c777 100644 --- a/root/ppg/staging/16/tde/percona-postgresql/obs/_service +++ b/root/ppg/staging/16/tde/percona-postgresql/obs/_service @@ -1,8 +1,8 @@ - https://github.com/Percona-Lab/postgres.git + https://github.com/percona/postgres.git git - release-%!{PG_VERSION} + release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} %!{PG_VERSION} percona-postgresql diff --git a/root/ppg/staging/17/extras/containers/project.yaml b/root/ppg/staging/17/extras/containers/project.yaml index c22e6168..fc9c3627 100644 --- a/root/ppg/staging/17/extras/containers/project.yaml +++ b/root/ppg/staging/17/extras/containers/project.yaml @@ -63,7 +63,7 @@ qa: - pipeline: ppg-obs-upgrade parameters: REPOSITORY: registry.opensuse.org/${OBS_CONTAINER_REGISTRY_ROOTPRJ}/ppg/staging/17/extras/containers/ubi9 - OLD_SERVER_VERSION: "16.14" + OLD_SERVER_VERSION: "16.15" NEW_SERVER_VERSION: %!{PG_VERSION} UPGRADE_DOCKER_TAG: %!{PG_MAJOR_VERSION}-%!{PG_PREV_MAJOR_VERSION} OLD_DOCKER_REPOSITORY: registry.opensuse.org/isv/percona/ppg/staging/%!{PG_PREV_MAJOR_VERSION}/extras/containers/ubi9 diff --git a/root/ppg/staging/17/macros.yaml b/root/ppg/staging/17/macros.yaml index 22ff3057..244d9734 100644 --- a/root/ppg/staging/17/macros.yaml +++ b/root/ppg/staging/17/macros.yaml @@ -1,7 +1,7 @@ - PG_MAJOR_VERSION: 17 - PG_PREV_MAJOR_VERSION: 16 -- PG_MINOR_VERSION: 10 -- PG_PREV_MINOR_VERSION: 9 +- PG_MINOR_VERSION: 11 +- PG_PREV_MINOR_VERSION: 10 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION} -- PERCONA_PG_PATCH_VERSION: 2 +- PERCONA_PG_PATCH_VERSION: 1 - PGAUDIT_VERSION: 17.1 diff --git a/root/ppg/staging/17/percona-pg_tde/debian/control b/root/ppg/staging/17/percona-pg_tde/debian/control index f857cb48..2b30b4fb 100644 --- a/root/ppg/staging/17/percona-pg_tde/debian/control +++ b/root/ppg/staging/17/percona-pg_tde/debian/control @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), meson, + cmake, ninja-build, chrpath, pkg-config, diff --git a/root/ppg/staging/17/percona-pg_tde/debian/debian.dsc b/root/ppg/staging/17/percona-pg_tde/debian/debian.dsc index 5f0fcb71..0f5ed8e4 100644 --- a/root/ppg/staging/17/percona-pg_tde/debian/debian.dsc +++ b/root/ppg/staging/17/percona-pg_tde/debian/debian.dsc @@ -7,6 +7,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), meson, + cmake, ninja-build, chrpath, pkg-config, diff --git a/root/ppg/staging/17/percona-pg_tde/debian/patches/meson-cpp-std-c2a b/root/ppg/staging/17/percona-pg_tde/debian/patches/meson-cpp-std-c2a new file mode 100644 index 00000000..94eeb8b0 --- /dev/null +++ b/root/ppg/staging/17/percona-pg_tde/debian/patches/meson-cpp-std-c2a @@ -0,0 +1,26 @@ +Use the pre-ratification spelling "c++2a" of the C++20 standard so that +meson 0.56.2 on Debian 11 accepts the cpp_std value ("c++20" was only +added to meson's cpp_std choices in 0.57). gcc and clang treat -std=c++2a +and -std=c++20 identically, and g++ 10 on bullseye compiles the C++ KMIP +client fine. The libkmip cmake subproject needs no change: cmake itself +emits -std=c++2a for CMAKE_CXX_STANDARD 20 on gcc 10. +--- a/meson.build ++++ b/meson.build +@@ -139,7 +139,7 @@ shared_module('pg_tde', + 'src/pg_tde_guc.c', + 'src/smgr/pg_tde_smgr.c', + ), +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + include_directories: incdirs, + install: true, + install_dir: pkglibdir, +@@ -168,7 +168,7 @@ pg_tde_frontend = static_library('pg_tde_frontend', + ), + c_args: ['-DFRONTEND'], + cpp_args: ['-DFRONTEND'], +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + dependencies: [pgfeutils, pgcommon, pgport, curl, crypto, ssl, kmipclient, kmipcore], + include_directories: incdirs, + ) diff --git a/root/ppg/staging/17/percona-pg_tde/debian/patches/series b/root/ppg/staging/17/percona-pg_tde/debian/patches/series new file mode 100644 index 00000000..4a9549b2 --- /dev/null +++ b/root/ppg/staging/17/percona-pg_tde/debian/patches/series @@ -0,0 +1 @@ +meson-cpp-std-c2a diff --git a/root/ppg/staging/17/percona-pg_tde/obs/_service b/root/ppg/staging/17/percona-pg_tde/obs/_service index b6c2bd73..2992494c 100644 --- a/root/ppg/staging/17/percona-pg_tde/obs/_service +++ b/root/ppg/staging/17/percona-pg_tde/obs/_service @@ -2,9 +2,9 @@ https://github.com/percona/pg_tde.git git - release-%!{PG_TDE_VERSION} + %!{PG_TDE_VERSION} @PARENT_TAG@ - release-(.*) + enable percona-pg_tde17 diff --git a/root/ppg/staging/17/percona-pg_tde/rpm/pg_tde.spec b/root/ppg/staging/17/percona-pg_tde/rpm/pg_tde.spec index c34184dc..db63bee4 100644 --- a/root/ppg/staging/17/percona-pg_tde/rpm/pg_tde.spec +++ b/root/ppg/staging/17/percona-pg_tde/rpm/pg_tde.spec @@ -33,12 +33,17 @@ License: PostgreSQL URL: https://github.com/percona/pg_tde Source0: %{sname}-%{version}.tar.gz -BuildRequires: %{pg_name}-devel chrpath openssl-devel libcurl-devel zlib-devel libzstd-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel meson +BuildRequires: %{pg_name}-devel chrpath openssl-devel libcurl-devel zlib-devel libzstd-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel meson cmake %if 0%{?gts_version} BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c++ gcc-toolset-%{gts_version}-annobin-plugin-gcc %endif %if 0%{?suse_version} >= 1500 BuildRequires: libjson-c-devel liblz4-devel +# The C++ KMIP client needs a C++ compiler. Without gcc-c++ in the chroot +# meson falls back to clang++ (pulled in via the llvm BuildRequires) while +# C is compiled by gcc; with SUSE's default -flto=auto the mixed toolchain +# produces archives/objects the linker cannot combine. +BuildRequires: gcc-c++ %else BuildRequires: json-c-devel lz4-devel %endif diff --git a/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql-common-dev.docs b/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql-common-dev.docs new file mode 100644 index 00000000..68d3bea6 --- /dev/null +++ b/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql-common-dev.docs @@ -0,0 +1 @@ +doc/postgresql-debian-packaging.md diff --git a/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql.config b/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql.config index e8d7db55..729e805f 100644 --- a/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql.config +++ b/root/ppg/staging/17/percona-postgresql-common/debian/percona-postgresql.config @@ -9,6 +9,7 @@ NEWVERSION=17 try_upgrade () { # look for the newest "main" cluster + command -v pg_lsclusters >/dev/null || return 0 OLDVERSION=$(pg_lsclusters -h | grep -E '^[0-9.]+ +main ' | tail -n1) [ "$OLDVERSION" ] || return 0 # no cluster found OLDVERSION=${OLDVERSION%% *} diff --git a/root/ppg/staging/18/extras/containers/project.yaml b/root/ppg/staging/18/extras/containers/project.yaml index 024f0855..cd1880fc 100644 --- a/root/ppg/staging/18/extras/containers/project.yaml +++ b/root/ppg/staging/18/extras/containers/project.yaml @@ -63,7 +63,7 @@ qa: - pipeline: ppg-obs-upgrade parameters: REPOSITORY: registry.opensuse.org/${OBS_CONTAINER_REGISTRY_ROOTPRJ}/ppg/staging/18/extras/containers/ubi9 - OLD_SERVER_VERSION: "17.10" + OLD_SERVER_VERSION: "17.11" NEW_SERVER_VERSION: %!{PG_VERSION} UPGRADE_DOCKER_TAG: %!{PG_MAJOR_VERSION}-%!{PG_PREV_MAJOR_VERSION} OLD_DOCKER_REPOSITORY: registry.opensuse.org/isv/percona/ppg/staging/%!{PG_PREV_MAJOR_VERSION}/extras/containers/ubi9 diff --git a/root/ppg/staging/18/macros.yaml b/root/ppg/staging/18/macros.yaml index 3a0bae14..83248672 100644 --- a/root/ppg/staging/18/macros.yaml +++ b/root/ppg/staging/18/macros.yaml @@ -1,7 +1,7 @@ - PG_MAJOR_VERSION: 18 - PG_PREV_MAJOR_VERSION: 17 -- PG_MINOR_VERSION: 4 -- PG_PREV_MINOR_VERSION: 3 +- PG_MINOR_VERSION: 6 +- PG_PREV_MINOR_VERSION: 4 - PG_VERSION: %!{PG_MAJOR_VERSION}.%!{PG_MINOR_VERSION} -- PERCONA_PG_PATCH_VERSION: 2 +- PERCONA_PG_PATCH_VERSION: 1 - PGAUDIT_VERSION: 18.0 diff --git a/root/ppg/staging/18/percona-pg_oidc_validator/obs/_service b/root/ppg/staging/18/percona-pg_oidc_validator/obs/_service index e197468a..7a42be96 100644 --- a/root/ppg/staging/18/percona-pg_oidc_validator/obs/_service +++ b/root/ppg/staging/18/percona-pg_oidc_validator/obs/_service @@ -2,7 +2,7 @@ https://github.com/Percona-Lab/pg_oidc_validator.git git - release-%!{PG_OIDC_VALIDATOR_VERSION} + %!{PG_OIDC_VALIDATOR_VERSION} %!{PG_OIDC_VALIDATOR_VERSION} percona-pg_oidc_validator%!{PG_MAJOR_VERSION} diff --git a/root/ppg/staging/18/percona-pg_oidc_validator/rpm/pg_oidc.spec b/root/ppg/staging/18/percona-pg_oidc_validator/rpm/pg_oidc.spec index f7253b48..df78669b 100644 --- a/root/ppg/staging/18/percona-pg_oidc_validator/rpm/pg_oidc.spec +++ b/root/ppg/staging/18/percona-pg_oidc_validator/rpm/pg_oidc.spec @@ -15,7 +15,7 @@ %global sname percona-pg_oidc_validator%{pgmajorversion} Name: %{sname} -Version: 1.0 +Version: 1.0.0 Release: 1%{?dist} Summary: PostgreSQL OAuth/OIDC token validator extension diff --git a/root/ppg/staging/18/percona-pg_tde/debian/control b/root/ppg/staging/18/percona-pg_tde/debian/control index 5114320b..db0cbe0b 100644 --- a/root/ppg/staging/18/percona-pg_tde/debian/control +++ b/root/ppg/staging/18/percona-pg_tde/debian/control @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: mawk, meson, + cmake, ninja-build, pkg-config, debhelper (>= 9), diff --git a/root/ppg/staging/18/percona-pg_tde/debian/control.in b/root/ppg/staging/18/percona-pg_tde/debian/control.in index 5114320b..db0cbe0b 100644 --- a/root/ppg/staging/18/percona-pg_tde/debian/control.in +++ b/root/ppg/staging/18/percona-pg_tde/debian/control.in @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: mawk, meson, + cmake, ninja-build, pkg-config, debhelper (>= 9), diff --git a/root/ppg/staging/18/percona-pg_tde/debian/debian.dsc b/root/ppg/staging/18/percona-pg_tde/debian/debian.dsc index 15d72c5e..a90a087d 100644 --- a/root/ppg/staging/18/percona-pg_tde/debian/debian.dsc +++ b/root/ppg/staging/18/percona-pg_tde/debian/debian.dsc @@ -19,6 +19,7 @@ Build-Depends: libzstd-dev, mawk, meson, + cmake, ninja-build, pkg-config, percona-postgresql-server-dev-all (>= 153~), diff --git a/root/ppg/staging/18/percona-pg_tde/debian/patches/meson-cpp-std-c2a b/root/ppg/staging/18/percona-pg_tde/debian/patches/meson-cpp-std-c2a new file mode 100644 index 00000000..94eeb8b0 --- /dev/null +++ b/root/ppg/staging/18/percona-pg_tde/debian/patches/meson-cpp-std-c2a @@ -0,0 +1,26 @@ +Use the pre-ratification spelling "c++2a" of the C++20 standard so that +meson 0.56.2 on Debian 11 accepts the cpp_std value ("c++20" was only +added to meson's cpp_std choices in 0.57). gcc and clang treat -std=c++2a +and -std=c++20 identically, and g++ 10 on bullseye compiles the C++ KMIP +client fine. The libkmip cmake subproject needs no change: cmake itself +emits -std=c++2a for CMAKE_CXX_STANDARD 20 on gcc 10. +--- a/meson.build ++++ b/meson.build +@@ -139,7 +139,7 @@ shared_module('pg_tde', + 'src/pg_tde_guc.c', + 'src/smgr/pg_tde_smgr.c', + ), +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + include_directories: incdirs, + install: true, + install_dir: pkglibdir, +@@ -168,7 +168,7 @@ pg_tde_frontend = static_library('pg_tde_frontend', + ), + c_args: ['-DFRONTEND'], + cpp_args: ['-DFRONTEND'], +- override_options: ['cpp_std=c++20'], ++ override_options: ['cpp_std=c++2a'], + dependencies: [pgfeutils, pgcommon, pgport, curl, crypto, ssl, kmipclient, kmipcore], + include_directories: incdirs, + ) diff --git a/root/ppg/staging/18/percona-pg_tde/debian/patches/series b/root/ppg/staging/18/percona-pg_tde/debian/patches/series new file mode 100644 index 00000000..4a9549b2 --- /dev/null +++ b/root/ppg/staging/18/percona-pg_tde/debian/patches/series @@ -0,0 +1 @@ +meson-cpp-std-c2a diff --git a/root/ppg/staging/18/percona-pg_tde/obs/_service b/root/ppg/staging/18/percona-pg_tde/obs/_service index 39e9c6fe..d2308563 100644 --- a/root/ppg/staging/18/percona-pg_tde/obs/_service +++ b/root/ppg/staging/18/percona-pg_tde/obs/_service @@ -2,9 +2,8 @@ https://github.com/percona/pg_tde.git git - release-%!{PG_TDE_VERSION} + %!{PG_TDE_VERSION} @PARENT_TAG@ - release-(.*) enable percona-pg_tde%!{PG_MAJOR_VERSION} diff --git a/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec b/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec index 925d3872..907ea39b 100644 --- a/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec +++ b/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec @@ -28,6 +28,7 @@ URL: https://github.com/%{sname}/%{sname}/ Source0: %{name}-%{version}.tar.gz BuildRequires: meson +BuildRequires: cmake BuildRequires: percona-postgresql%{pgmajorversion}-devel chrpath openssl-devel libcurl-devel zlib-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel %if 0%{?gts_version} BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c++ gcc-toolset-%{gts_version}-annobin-plugin-gcc @@ -37,6 +38,11 @@ BuildRequires: json-c-devel lz4-devel libzstd-devel numactl-devel %endif %if 0%{?suse_version} BuildRequires: libjson-c-devel liblz4-devel libzstd-devel >= 1.4.0 libnuma-devel +# The C++ KMIP client needs a C++ compiler. Without gcc-c++ in the chroot +# meson falls back to clang++ (pulled in via the llvmjit BuildRequires) while +# C is compiled by gcc; with SUSE's default -flto=auto the mixed toolchain +# produces archives/objects the linker cannot combine. +BuildRequires: gcc-c++ %endif Requires: postgresql%{pgmajorversion}-server curl openssl diff --git a/root/ppg/staging/18/percona-pgbackrest/debian/debian.dsc b/root/ppg/staging/18/percona-pgbackrest/debian/debian.dsc index e6aba362..84e87528 100644 --- a/root/ppg/staging/18/percona-pgbackrest/debian/debian.dsc +++ b/root/ppg/staging/18/percona-pgbackrest/debian/debian.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: percona-pgbackrest Binary: percona-pgbackrest, percona-pgbackrest-doc Architecture: any all -Version: 2.58.0-1 +Version: 1.0.0 Maintainer: Percona Development Team Build-Depends: mawk, diff --git a/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec b/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec index 1e9c6d19..c6b810a2 100644 --- a/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec +++ b/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec @@ -9,7 +9,7 @@ Summary: Reliable PostgreSQL Backup & Restore Name: percona-pgbackrest -Version: 2.58.0 +Version: 1.0.0 Release: 1%{?dist} License: MIT Group: Applications/Databases diff --git a/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql-common-dev.docs b/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql-common-dev.docs new file mode 100644 index 00000000..68d3bea6 --- /dev/null +++ b/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql-common-dev.docs @@ -0,0 +1 @@ +doc/postgresql-debian-packaging.md diff --git a/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql.config b/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql.config index e8d7db55..729e805f 100644 --- a/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql.config +++ b/root/ppg/staging/18/percona-postgresql-common/debian/percona-postgresql.config @@ -9,6 +9,7 @@ NEWVERSION=17 try_upgrade () { # look for the newest "main" cluster + command -v pg_lsclusters >/dev/null || return 0 OLDVERSION=$(pg_lsclusters -h | grep -E '^[0-9.]+ +main ' | tail -n1) [ "$OLDVERSION" ] || return 0 # no cluster found OLDVERSION=${OLDVERSION%% *} diff --git a/root/ppg/staging/macros.yaml b/root/ppg/staging/macros.yaml index 981e4c4d..5cc75315 100644 --- a/root/ppg/staging/macros.yaml +++ b/root/ppg/staging/macros.yaml @@ -3,27 +3,27 @@ # live in the per-version macros.yaml files and override these where needed. # Core package versions -- HAPROXY_VERSION: 2.8.23 -- PATRONI_VERSION: 4.1.3 +- HAPROXY_VERSION: 2.8.27 +- PATRONI_VERSION: 4.1.5 - PGAUDIT_SET_USER_TAG: REL4_2_0 - PGAUDIT_SET_USER_VERSION: 4.2.0 -- PGBACKREST_VERSION: 2.58.0 +- PGBACKREST_VERSION: 2.59.0 - PGBADGER_VERSION: 13.2 - PGBOUNCER_TAG: pgbouncer_1_25_2 - PGBOUNCER_VERSION: 1.25.2 - PGPOOL_TAG: V4_7_2 - PGPOOL_VERSION: 4.7.2 -- PGVECTOR_VERSION: 0.8.3 +- PGVECTOR_VERSION: 0.8.6 - PG_CRON_VERSION: 1.6.7 - PG_GATHER_VERSION: 33 -- PG_OIDC_VALIDATOR_VERSION: 1.0 +- PG_OIDC_VALIDATOR_VERSION: 1.1.0 - PG_REPACK_TAG: ver_1.5.3 - PG_REPACK_VERSION: 1.5.3 - PG_STAT_MONITOR_VERSION: 2.3.2 -- PG_TDE_VERSION: 2.2.1 +- PG_TDE_VERSION: 2.2.2 - PG_TELEMETRY_VERSION: 1.2.0 - POSTGIS_VERSION: 3.5.7 -- POSTGRESQL_COMMON_VERSION: 290 +- POSTGRESQL_COMMON_VERSION: 293 - PPG_RELEASE: 1 - PSYCOPG2_VERSION: 2.9.10 - WAL2JSON_TAG: wal2json_2_6