From cf25b7d8fec1bf26bc5733301c68caaa3549434a Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 5 Dec 2024 03:00:52 +0300
Subject: [PATCH] import postgresql-12.22-1.module+el8.10.0+22548+dd326681

---
 .gitignore                              |  4 +-
 .postgresql.metadata                    |  4 +-
 SOURCES/generate-pdf.sh                 | 58 -------------------------
 SOURCES/postgresql-12.20.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-12.22.tar.bz2.sha256 |  1 +
 SPECS/postgresql.spec                   | 11 +++--
 6 files changed, 12 insertions(+), 67 deletions(-)
 delete mode 100755 SOURCES/generate-pdf.sh
 delete mode 100644 SOURCES/postgresql-12.20.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-12.22.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index fd6f807..d1a62b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-10.23.tar.bz2
-SOURCES/postgresql-12.20-US.pdf
-SOURCES/postgresql-12.20.tar.bz2
+SOURCES/postgresql-12.22-US.pdf
+SOURCES/postgresql-12.22.tar.bz2
 SOURCES/postgresql-setup-8.7.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 93243c2..92a6562 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 2df7b4b3751112f3cb543c3ea81e45531bebc7a1 SOURCES/postgresql-10.23.tar.bz2
-985592db6377799663a0287d8f11aeb9ac65638c SOURCES/postgresql-12.20-US.pdf
-53f918639e4f0ee456c09586c5528d31a84e3934 SOURCES/postgresql-12.20.tar.bz2
+e4c99bb52875c4822f4cf4a63dc69d5de1cb8a05 SOURCES/postgresql-12.22-US.pdf
+4f0a2bfcdaa6b370029353d7a01451d7a8282750 SOURCES/postgresql-12.22.tar.bz2
 fb97095dc9648f9c31d58fcb406831da5e419ddf SOURCES/postgresql-setup-8.7.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-12.20.tar.bz2.sha256 b/SOURCES/postgresql-12.20.tar.bz2.sha256
deleted file mode 100644
index 8f410ea..0000000
--- a/SOURCES/postgresql-12.20.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2d543af3009fec7fd5af35f7a70c95085d3eef6b508e517aa9493e99b15e9ea9  postgresql-12.20.tar.bz2
diff --git a/SOURCES/postgresql-12.22.tar.bz2.sha256 b/SOURCES/postgresql-12.22.tar.bz2.sha256
new file mode 100644
index 0000000..81a18f5
--- /dev/null
+++ b/SOURCES/postgresql-12.22.tar.bz2.sha256
@@ -0,0 +1 @@
+8df3c0474782589d3c6f374b5133b1bd14d168086edbc13c6e72e67dd4527a3b  postgresql-12.22.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 965a11a..4e4982d 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -59,7 +59,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
-Version: %{majorversion}.20
+Version: %{majorversion}.22
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -81,10 +81,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-12.22-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
@@ -1225,6 +1224,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu Nov 21 2024 Lukas Javorsky <ljavorsk@redhat.com> - 12.22-1
+- Update to 12.22
+- Fixes: CVE-2024-10976 CVE-2024-10978
+
 * Mon Aug 12 2024 Ales Nezbeda <anezbeda@redhat.com> - 12.20-1
 - Update to 12.20
 - Fix CVE-2024-7348