From bbfa0902cbb7fe351fe26ce42e896197f1ab1906bcfd0cfbf9fc21a834c8086e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 15 May 2023 14:54:20 +0000 Subject: [PATCH 1/3] - Overhaul postgresql-README.SUSE and move it from the binary package to the noarch wrapper package. - Change the unix domain socket location from /var/run to /run. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=70 --- postgresql-README.SUSE | 80 --------------------------------- postgresql-var-run-socket.patch | 4 +- postgresql13.changes | 7 +++ postgresql13.spec | 2 - 4 files changed, 9 insertions(+), 84 deletions(-) delete mode 100644 postgresql-README.SUSE diff --git a/postgresql-README.SUSE b/postgresql-README.SUSE deleted file mode 100644 index 2fbea8e..0000000 --- a/postgresql-README.SUSE +++ /dev/null @@ -1,80 +0,0 @@ -Unix-Domain Socket Directory -============================ - - - -Upgrading PostgreSQL on openSUSE and SUSE Linux Enterprise Server -================================================================= - -Current versions of PostgreSQL come with the pg_upgrade tool that -simplifies and speeds up the migration of a PostgreSQL installation to -a new version. Before version 9.1 dump and restore was needed which -was much slower. - -pg_upgrade needs to have the server binaries of both versions -available. To allow this, we had to change the way PostgreSQL is -packaged as well as the naming of the packages, so that two or more -versions of PostgreSQL can be installed in parallel. The package -names for PostgreSQL contain numbers indicating the major version. - -In PostgreSQL terms for versions up to 9.6 the major version consisted -of the first two components of the three-component version number, -i.e. 8.3, 8.4, 9.0, or 9.1. So, the packages for Postgresql 9.1 are -named postgresql91, postgresql91-server, etc. Inside the packages the -files were moved from their standard locations to a versioned location -such as /usr/lib/postgresql83/bin or /usr/lib/postgresql91/bin to -avoid file conflicts if packages are installed in parallel. - -Starting with version 10 the PostgreSQL project changed their -versioning scheme from from three components to two, which means one -component for the major version and one for the minor. So, the -sequence of major version across the versioning scheme change will be: -9.4, 9.5, 9.6, 10, 11, 12. For versions that use the new versioning -scheme SUSE only puts the single component major version into the -package name, so the postgresql96 package (containg version 9.6 -according to the old versioning scheme) will be followed by -postgresql10, then postgresql11, and so on. - -The update-alternatives mechanism creates and maintains symbolic links -that cause one version (by default the highest installed version) to -re-appear in the standard locations. By default, database data are -stored under /var/lib/pgsql/data on SUSE Linux. - -The following preconditions have to be fulfilled before data migration -can be started: - - 1. If not already done, the packages of the old PostgreSQL version - must be upgraded to the new packaging scheme through a maintenance - update. - - 2. The packages of the new PostgreSQL major version need to be - installed. As pg_upgrade is contained in postgresql91-contrib, that - one has to be installed as well, at least until the migration is - done. - - 3. Unless pg_upgrade is used in link mode, the server must have - enough free disk space to temporarily hold a copy of the database - files. If the database instance was installed in the default - location, the needed space in megabytes can be determined by running - the follwing command as root: "du -hs /var/lib/pgsql/data". If space - is tight, it might help to run the "VACUUM FULL" SQL command on each - database in the instance to be migrated, but be aware that it might - take very long. - -The latest upstream documentation for pg_upgrade including step by -step instructions for performing a database migration can be found -online under https://www.postgresql.org/docs/current/pgupgrade.html , -or locally under -file:///usr/share/doc/packages/postgresqlXX/html/pgupgrade.html , if -the postgresqlXX-docs package is installed. XX is a place holder for -the respective major version here. - -NOTE: The online documentation starts with explaining how you can -install PostgreSQL from the upstream sources (which is not necessary -when you install the SUSE RPMs) and also uses other directory names -(/usr/local instead of the update-alternatives based path as described -above). - -For background information about the inner workings of pg_upgrade and -a performance comparison with the old dump and restore method, see -http://momjian.us/main/writings/pgsql/pg_upgrade.pdf . diff --git a/postgresql-var-run-socket.patch b/postgresql-var-run-socket.patch index 751b0f7..a026e51 100644 --- a/postgresql-var-run-socket.patch +++ b/postgresql-var-run-socket.patch @@ -1,4 +1,4 @@ -Change the built-in default socket directory to be /var/run/postgresql. +Change the built-in default socket directory to be /run/postgresql. For backwards compatibility with (probably non-libpq-based) clients that might still expect to find the socket in /tmp, also create a socket in /tmp. This is to resolve communication problems with clients operating @@ -42,7 +42,7 @@ override it via postgresql.conf.) */ #ifndef WIN32 -#define DEFAULT_PGSOCKET_DIR "/tmp" -+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" #else #define DEFAULT_PGSOCKET_DIR "" #endif diff --git a/postgresql13.changes b/postgresql13.changes index f59adc5..77f66a4 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 15 14:22:10 UTC 2023 - Reinhard Max + +- Overhaul postgresql-README.SUSE and move it from the binary + package to the noarch wrapper package. +- Change the unix domain socket location from /var/run to /run. + ------------------------------------------------------------------- Wed May 10 13:02:46 UTC 2023 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index 5217b96..247877e 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -156,7 +156,6 @@ Release: 0 Source0: https://ftp.postgresql.org/pub/source/v%{tarversion}/postgresql-%{tarversion}.tar.bz2 Source1: https://ftp.postgresql.org/pub/source/v%{tarversion}/postgresql-%{tarversion}.tar.bz2.sha256 Source2: baselibs.conf -Source3: postgresql-README.SUSE Source17: postgresql-rpmlintrc Patch1: postgresql-conf.patch # PL/Perl needs to be linked with rpath (bsc#578053) @@ -630,7 +629,6 @@ install -d -m 750 %buildroot/var/lib/pgsql install -d -m755 %buildroot%pgdocdir cp doc/KNOWN_BUGS doc/MISSING_FEATURES COPYRIGHT \ README HISTORY %buildroot%pgdocdir -cp -a %SOURCE3 %buildroot%pgdocdir/README.SUSE # Use versioned names for the man pages: for f in %buildroot%pgmandir/man*/*; do mv $f ${f}pg%pgmajor From 27d68739ef0cc26961d37fcde37f4c5d5c8434c82e7da5facfac9d1ba284213e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Fri, 26 May 2023 12:03:19 +0000 Subject: [PATCH 2/3] - Restore the independence of mini builds from the main build after the -mini name change from April 4, 2023. - Adjust icu handling to prepare for PostgreSQL 16. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=71 --- postgresql13.changes | 7 +++++++ postgresql13.spec | 21 ++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/postgresql13.changes b/postgresql13.changes index 77f66a4..5b61b2b 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 26 11:48:38 UTC 2023 - Reinhard Max + +- Restore the independence of mini builds from the main build after + the -mini name change from April 4, 2023. +- Adjust icu handling to prepare for PostgreSQL 16. + ------------------------------------------------------------------- Mon May 15 14:22:10 UTC 2023 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index 247877e..e1057db 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -69,7 +69,11 @@ Name: %pgname %if %mini %bcond_with selinux +%if %pgmajor >= 16 +%bcond_without icu +%else %bcond_with icu +%endif %else BuildRequires: %{python}-devel BuildRequires: docbook_4 @@ -143,11 +147,18 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) -#!BuildIgnore: postgresql-implementation -#!BuildIgnore: postgresql-server-implementation -#!BuildIgnore: postgresql-devel-noarch -#!BuildIgnore: postgresql-llvmjit-devel-noarch -#!BuildIgnore: postgresql-server-devel-noarch +#!BuildIgnore: %pgname +#!BuildIgnore: %pgname-server +#!BuildIgnore: %pgname-devel +#!BuildIgnore: %pgname-server-devel +#!BuildIgnore: %pgname-llvmjit +#!BuildIgnore: %pgname-llvmjit-devel +#!BuildIgnore: %pgname-contrib +#!BuildIgnore: %pgname-docs +#!BuildIgnore: %pgname-test +#!BuildIgnore: %pgname-pltcl +#!BuildIgnore: %pgname-plperl +#!BuildIgnore: %pgname-plpython Summary: Basic Clients and Utilities for PostgreSQL License: PostgreSQL Group: Productivity/Databases/Tools From 554b93a424fd6f7cafebbbce365319abbc4209156942dd031a7f695217e6262a Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 10 Aug 2023 13:36:21 +0000 Subject: [PATCH 3/3] - Update to 13.12: * bsc#1214059, CVE-2023-39417: Disallow substituting a schema or owner name into an extension script if the name contains a quote, backslash, or dollar sign. * https://www.postgresql.org/docs/13/release-13-12.html OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=72 --- postgresql-13.11.tar.bz2 | 3 --- postgresql-13.11.tar.bz2.sha256 | 1 - postgresql-13.12.tar.bz2 | 3 +++ postgresql-13.12.tar.bz2.sha256 | 1 + postgresql13.changes | 9 +++++++++ postgresql13.spec | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 postgresql-13.11.tar.bz2 delete mode 100644 postgresql-13.11.tar.bz2.sha256 create mode 100644 postgresql-13.12.tar.bz2 create mode 100644 postgresql-13.12.tar.bz2.sha256 diff --git a/postgresql-13.11.tar.bz2 b/postgresql-13.11.tar.bz2 deleted file mode 100644 index bf28abc..0000000 --- a/postgresql-13.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb -size 21519655 diff --git a/postgresql-13.11.tar.bz2.sha256 b/postgresql-13.11.tar.bz2.sha256 deleted file mode 100644 index bdd019b..0000000 --- a/postgresql-13.11.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb postgresql-13.11.tar.bz2 diff --git a/postgresql-13.12.tar.bz2 b/postgresql-13.12.tar.bz2 new file mode 100644 index 0000000..3e5ea4b --- /dev/null +++ b/postgresql-13.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0da1edcee3514b7bc7ba6dbaf0c00499e8ac1590668e8789c50253a6249f218b +size 21542293 diff --git a/postgresql-13.12.tar.bz2.sha256 b/postgresql-13.12.tar.bz2.sha256 new file mode 100644 index 0000000..67587e6 --- /dev/null +++ b/postgresql-13.12.tar.bz2.sha256 @@ -0,0 +1 @@ +0da1edcee3514b7bc7ba6dbaf0c00499e8ac1590668e8789c50253a6249f218b postgresql-13.12.tar.bz2 diff --git a/postgresql13.changes b/postgresql13.changes index 5b61b2b..06afefc 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 9 09:55:59 UTC 2023 - Reinhard Max + +- Update to 13.12: + * bsc#1214059, CVE-2023-39417: Disallow substituting a schema or + owner name into an extension script if the name contains a + quote, backslash, or dollar sign. + * https://www.postgresql.org/docs/13/release-13-12.html + ------------------------------------------------------------------- Fri May 26 11:48:38 UTC 2023 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index e1057db..cf480ec 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -16,7 +16,7 @@ # -%define pgversion 13.11 +%define pgversion 13.12 %define pgmajor 13 %define buildlibs 0 %define tarversion %{pgversion}