From 18e444e69cc829f75cae04047f634d2fc91699ca Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 1 Oct 2024 06:39:03 +0000 Subject: [PATCH] import CS postgresql-16.4-2.module_el9+1109+d821d6e7 --- .gitignore | 4 ++-- .postgresql.metadata | 4 ++-- SOURCES/postgresql-15.5.tar.bz2.sha256 | 1 - SOURCES/postgresql-15.8.tar.bz2.sha256 | 1 + SOURCES/postgresql-16.1.tar.bz2.sha256 | 1 - SOURCES/postgresql-16.4.tar.bz2.sha256 | 1 + SPECS/postgresql.spec | 31 +++++++++++++++++++------- 7 files changed, 29 insertions(+), 14 deletions(-) delete mode 100644 SOURCES/postgresql-15.5.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-15.8.tar.bz2.sha256 delete mode 100644 SOURCES/postgresql-16.1.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-16.4.tar.bz2.sha256 diff --git a/.gitignore b/.gitignore index 5b69151..4e0f243 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/postgresql-15.5.tar.bz2 -SOURCES/postgresql-16.1.tar.bz2 +SOURCES/postgresql-15.8.tar.bz2 +SOURCES/postgresql-16.4.tar.bz2 SOURCES/postgresql-setup-8.9.tar.gz diff --git a/.postgresql.metadata b/.postgresql.metadata index aaa2e7d..f0841b7 100644 --- a/.postgresql.metadata +++ b/.postgresql.metadata @@ -1,3 +1,3 @@ -1688b684c181a3173a3f2b76a12e83c8371facc8 SOURCES/postgresql-15.5.tar.bz2 -7b335f3dbb9f566fa021f255650178b7c9642df2 SOURCES/postgresql-16.1.tar.bz2 +4decf90a7557c41fc61312e8696f59e0f7123d2a SOURCES/postgresql-15.8.tar.bz2 +fe7169014b49d9c191fd181893b233b3accf5c07 SOURCES/postgresql-16.4.tar.bz2 ba5d21f1d9c02e2c21976e76bd3ded0f64988e01 SOURCES/postgresql-setup-8.9.tar.gz diff --git a/SOURCES/postgresql-15.5.tar.bz2.sha256 b/SOURCES/postgresql-15.5.tar.bz2.sha256 deleted file mode 100644 index f5f8afa..0000000 --- a/SOURCES/postgresql-15.5.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 postgresql-15.5.tar.bz2 diff --git a/SOURCES/postgresql-15.8.tar.bz2.sha256 b/SOURCES/postgresql-15.8.tar.bz2.sha256 new file mode 100644 index 0000000..21864c7 --- /dev/null +++ b/SOURCES/postgresql-15.8.tar.bz2.sha256 @@ -0,0 +1 @@ +4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a postgresql-15.8.tar.bz2 diff --git a/SOURCES/postgresql-16.1.tar.bz2.sha256 b/SOURCES/postgresql-16.1.tar.bz2.sha256 deleted file mode 100644 index 8ef9f9e..0000000 --- a/SOURCES/postgresql-16.1.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec postgresql-16.1.tar.bz2 diff --git a/SOURCES/postgresql-16.4.tar.bz2.sha256 b/SOURCES/postgresql-16.4.tar.bz2.sha256 new file mode 100644 index 0000000..4043851 --- /dev/null +++ b/SOURCES/postgresql-16.4.tar.bz2.sha256 @@ -0,0 +1 @@ +971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f postgresql-16.4.tar.bz2 diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index 0843782..9ce7183 100755 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -62,8 +62,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 16 -Version: %{majorversion}.1 -Release: 1%{?dist} +Version: %{majorversion}.4 +Release: 2%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI # recognizes it as an independent license, so we do as well. @@ -75,7 +75,7 @@ Url: http://www.postgresql.org/ # that this be kept up with the latest minor release of the previous series; # but update when bugs affecting pg_dump output are fixed. %global prevmajorversion 15 -%global prevversion %{prevmajorversion}.5 +%global prevversion %{prevmajorversion}.8 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -111,6 +111,7 @@ Patch12: postgresql-no-libecpg.patch BuildRequires: make BuildRequires: gcc +BuildRequires: lz4-devel, libzstd-devel BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel BuildRequires: perl(Opcode) @@ -482,6 +483,8 @@ export CFLAGS common_configure_options=' --disable-rpath + --with-lz4 + --with-zstd %if %beta --enable-debug --enable-cassert @@ -610,6 +613,8 @@ upgrade_configure () --host=%{_host} \ --prefix=%prev_prefix \ --disable-rpath \ + --with-lz4 \ + --with-zstd \ %if %beta --enable-debug \ --enable-cassert \ @@ -696,10 +701,6 @@ install -d $RPM_BUILD_ROOT/etc/pam.d install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql %endif -# Create the directory for sockets. -install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql - -# ... and make a tmpfiles script to recreate it at reboot. mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf @@ -1077,6 +1078,7 @@ make -C postgresql-setup-%{setup_version} check %{_datadir}/pgsql/system_constraints.sql %{_datadir}/pgsql/system_functions.sql %{_datadir}/pgsql/system_views.sql +%{_datadir}/pgsql/fix-CVE-2024-4317.sql %{_datadir}/pgsql/timezonesets/ %{_datadir}/pgsql/tsearch_data/ %dir %{_datadir}/postgresql-setup @@ -1115,7 +1117,7 @@ make -C postgresql-setup-%{setup_version} check %attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data -%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql +%ghost %attr(755,postgres,postgres) %dir %{?_rundir}/postgresql %if %pam %config(noreplace) /etc/pam.d/postgresql %endif @@ -1216,6 +1218,19 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Aug 16 2024 Ales Nezbeda - 16.4-2 +- Fix build on 16.4 + +* Tue Aug 6 2024 Filip Janus - 16.4-1 +- Update to 16.4 + +* Tue Jul 30 2024 Filip Janus - 16.1-3 +- Remove /var/run/postgresql +- Related: RHEL-51275 + +* Mon Jul 15 2024 Filip Janus - 16.1-2 +- Enable lz4 and zstd support + * Mon Jan 08 2024 Filip Janus - 16.1-1 - Update to 16.1 - Update upgrade server to 15.5