diff --git a/.gitignore b/.gitignore index e3d5a78..38a8bed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/postgresql-13.16.tar.bz2 -SOURCES/postgresql-15.8-US.pdf -SOURCES/postgresql-15.8.tar.bz2 +SOURCES/postgresql-13.18.tar.bz2 +SOURCES/postgresql-15.10-US.pdf +SOURCES/postgresql-15.10.tar.bz2 SOURCES/postgresql-setup-8.8.tar.gz diff --git a/.postgresql.metadata b/.postgresql.metadata index b77d99a..b2fd7f6 100644 --- a/.postgresql.metadata +++ b/.postgresql.metadata @@ -1,4 +1,4 @@ -a2465d5086abb2b2ff9115541cae404f869dfa0f SOURCES/postgresql-13.16.tar.bz2 -25386701fcffa65a733f0225a58ea6231dc1808b SOURCES/postgresql-15.8-US.pdf -4decf90a7557c41fc61312e8696f59e0f7123d2a SOURCES/postgresql-15.8.tar.bz2 +e314353cf318ce5e33dfb73a91cd2ac9553c9885 SOURCES/postgresql-13.18.tar.bz2 +5aa7dc224b0a53f36ec6d3a76680a1287042b047 SOURCES/postgresql-15.10-US.pdf +a5547e3dd549cbaf8b6f0bf47996edeaad9d0c6a SOURCES/postgresql-15.10.tar.bz2 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.tar.gz diff --git a/SOURCES/generate-pdf.sh b/SOURCES/generate-pdf.sh deleted file mode 100755 index e0ed008..0000000 --- a/SOURCES/generate-pdf.sh +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh - -# This script builds the PDF version of the PostgreSQL documentation. -# -# In principle we could do this as part of the RPM build, but there are -# good reasons not to: -# 1. The build would take longer and have a larger BuildRequires footprint. -# 2. The generated PDF has timestamps in it, which would inevitably result -# in multilib conflicts due to slightly different timestamps. -# So instead, we run this manually when rebasing to a new upstream release, -# and treat the resulting PDF as a separate Source file. -# -# You will need to have the docbook packages installed to run this. -# Expect it to take about 20 minutes and use about 160MB of disk. - -set -e - -# Pass package version (e.g., 9.1.2) as argument -VERSION=$1 - -test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec` - -TARGETFILE=postgresql-$VERSION-US.pdf -test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1 - -echo Building $TARGETFILE ... - -# Unpack postgresql - -rm -rf postgresql-$VERSION - -tar xfj postgresql-$VERSION.tar.bz2 - -cd postgresql-$VERSION - -# Apply any patches that affect the PDF documentation - -# patch -p1 < ../xxx.patch - -# Configure ... - -./configure >/dev/null - -# Build the PDF docs - -cd doc/src/sgml - -make postgres-US.pdf >make.log - -mv -f postgres-US.pdf ../../../../$TARGETFILE - -# Clean up - -cd ../../../.. - -rm -rf postgresql-$VERSION - -exit 0 diff --git a/SOURCES/postgresql-13.14.tar.bz2.sha256 b/SOURCES/postgresql-13.14.tar.bz2.sha256 deleted file mode 100644 index 76e8707..0000000 --- a/SOURCES/postgresql-13.14.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed postgresql-13.14.tar.bz2 diff --git a/SOURCES/postgresql-13.18.tar.bz2.sha256 b/SOURCES/postgresql-13.18.tar.bz2.sha256 new file mode 100644 index 0000000..9570d76 --- /dev/null +++ b/SOURCES/postgresql-13.18.tar.bz2.sha256 @@ -0,0 +1 @@ +ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1 postgresql-13.18.tar.bz2 diff --git a/SOURCES/postgresql-15.10.tar.bz2.sha256 b/SOURCES/postgresql-15.10.tar.bz2.sha256 new file mode 100644 index 0000000..c2ebb02 --- /dev/null +++ b/SOURCES/postgresql-15.10.tar.bz2.sha256 @@ -0,0 +1 @@ +55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573 postgresql-15.10.tar.bz2 diff --git a/SOURCES/postgresql-15.6.tar.bz2.sha256 b/SOURCES/postgresql-15.6.tar.bz2.sha256 deleted file mode 100644 index b9cc1cf..0000000 --- a/SOURCES/postgresql-15.6.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb postgresql-15.6.tar.bz2 diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index 7a5ee44..629eed6 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -62,7 +62,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 15 -Version: %{majorversion}.8 +Version: %{majorversion}.10 Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -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 13 -%global prevversion %{prevmajorversion}.16 +%global prevversion %{prevmajorversion}.18 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -84,10 +84,9 @@ Url: http://www.postgresql.org/ %global service_name postgresql.service Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -# The PDF file is generated by generate-pdf.sh, which see for comments +# PDF can be downloaded from the upstream +# Don't forget to rename the PDF file with the full version prefix (e.g. postgresql-15.10-US.pdf) Source1: postgresql-%{version}-US.pdf -# generate-pdf.sh is not used during RPM build, but include for documentation -Source2: generate-pdf.sh Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2 Source4: Makefile.regress Source9: postgresql.tmpfiles.d @@ -114,6 +113,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) @@ -489,6 +489,8 @@ export CFLAGS common_configure_options=' --disable-rpath + --with-lz4 + --with-zstd %if %beta --enable-debug --enable-cassert @@ -617,6 +619,8 @@ upgrade_configure () --host=%{_host} \ --prefix=%prev_prefix \ --disable-rpath \ + --with-lz4 \ + --with-zstd \ %if %beta --enable-debug \ --enable-cassert \ @@ -703,10 +707,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 @@ -1084,9 +1084,9 @@ make -C postgresql-setup-%{setup_version} check %{_datadir}/pgsql/snowball_create.sql %{_datadir}/pgsql/sql_features.txt %{_datadir}/pgsql/system_constraints.sql -%{_datadir}/pgsql/fix-CVE-2024-4317.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 @@ -1126,7 +1126,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 @@ -1227,9 +1227,23 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Nov 21 2024 Lukas Javorsky - 15.10-1 +- Update to 15.10 +- Fixes: CVE-2024-10976 CVE-2024-10978 CVE-2024-10979 + +* Fri Aug 16 2024 Ales Nezbeda - 15.8-2 +- Fix build on 15.8 + * Tue Aug 6 2024 Filip Janus - 15.8-1 - Update to 15.8 +* Tue Jul 30 2024 Filip Janus - 15.6-3 +- Remove /var/run/postgresql +- Related: RHEL-51271 + +* Mon Jul 15 2024 Filip Janus - 15.6-2 +- Enable lz4 and zstd support + * Fri Feb 9 2024 Filip Janus 15.6-1 - Update to 15.6 and 13.14 - Fix CVE-2024-0985