diff --git a/.gitignore b/.gitignore index e3d5a78..3a4ad1c 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.20.tar.bz2 +SOURCES/postgresql-15.12-US.pdf +SOURCES/postgresql-15.12.tar.bz2 SOURCES/postgresql-setup-8.8.tar.gz diff --git a/.postgresql.metadata b/.postgresql.metadata index b77d99a..7520f70 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 +e56b335306a0dd446987c35dba655427dfcc325c SOURCES/postgresql-13.20.tar.bz2 +9d12f656c463abfd9b95c806be95d37ae71a0671 SOURCES/postgresql-15.12-US.pdf +e324936f043bca125f3b12bef2919e5183118400 SOURCES/postgresql-15.12.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.16.tar.bz2.sha256 b/SOURCES/postgresql-13.16.tar.bz2.sha256 deleted file mode 100644 index 8b1d6f3..0000000 --- a/SOURCES/postgresql-13.16.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865 postgresql-13.16.tar.bz2 diff --git a/SOURCES/postgresql-13.20.tar.bz2.sha256 b/SOURCES/postgresql-13.20.tar.bz2.sha256 new file mode 100644 index 0000000..020a3a4 --- /dev/null +++ b/SOURCES/postgresql-13.20.tar.bz2.sha256 @@ -0,0 +1 @@ +8134b685724d15e60d93bea206fbe0f14c8295e84f1cc91d5a3928163e4fb288 postgresql-13.20.tar.bz2 diff --git a/SOURCES/postgresql-15.12.tar.bz2.sha256 b/SOURCES/postgresql-15.12.tar.bz2.sha256 new file mode 100644 index 0000000..cd7b414 --- /dev/null +++ b/SOURCES/postgresql-15.12.tar.bz2.sha256 @@ -0,0 +1 @@ +3bc8462a38ca0857270cc88b949a3f6659f0d5c44c029c482355835b61a0f6f7 postgresql-15.12.tar.bz2 diff --git a/SOURCES/postgresql-15.8.tar.bz2.sha256 b/SOURCES/postgresql-15.8.tar.bz2.sha256 deleted file mode 100644 index 21864c7..0000000 --- a/SOURCES/postgresql-15.8.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a postgresql-15.8.tar.bz2 diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index b3e9495..aee5a0a 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -62,8 +62,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 15 -Version: %{majorversion}.8 -Release: 2%{?dist} +Version: %{majorversion}.12 +Release: 1%{?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 13 -%global prevversion %{prevmajorversion}.16 +%global prevversion %{prevmajorversion}.20 %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 @@ -417,15 +416,15 @@ goal of accelerating analytics queries. %endif ) %setup -q -a 12 -n postgresql-%{version} -%patch1 -p1 -%patch2 -p1 -%patch5 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 5 -p1 %if %external_libpq -%patch8 -p1 +%patch -P 8 -p1 %else -%patch12 -p1 +%patch -P 12 -p1 %endif -%patch9 -p1 +%patch -P 9 -p1 # We used to run autoconf here, but there's no longer any real need to, # since Postgres ships with a reasonably modern configure script. @@ -1228,6 +1227,13 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Feb 20 2025 Ales Nezbeda - 15.12-1 +- Update to 15.12 + +* 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