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 a9b99d2..b2fd7f6 100644 --- a/.postgresql.metadata +++ b/.postgresql.metadata @@ -1,4 +1,4 @@ -a2465d5086abb2b2ff9115541cae404f869dfa0f SOURCES/postgresql-13.16.tar.bz2 -54911c9280f6c96d142aee99f9493abfa49c21e3 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.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.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.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 f4b2ab9..77ae72b 100755 --- 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 @@ -1227,6 +1226,10 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Nov 21 2024 Lukas Javorsky - 15.10-1 +- Update to 15.10 +- Fixes: CVE-2024-10976 CVE-2024-10978 CVE-2024-10979 + * Mon Aug 12 2024 Ales Nezbeda - 15.8-1 - Update to 15.8 - Fix CVE-2024-7348