From d0a290d025f591f105ed05dfd500f3851ce6f65a Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Mon, 18 Dec 2023 16:09:38 +0300
Subject: [PATCH] import postgresql-13.13-1.module+el8.9.0+20664+9c30cf7f

---
 .gitignore                              |  4 ++--
 .postgresql.metadata                    |  4 ++--
 SOURCES/postgresql-13.11.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-13.13.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-external-libpq.patch |  8 ++++----
 SPECS/postgresql.spec                   | 11 ++++++++---
 6 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 SOURCES/postgresql-13.11.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-13.13.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 67ff669..d43b242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-12.9.tar.bz2
-SOURCES/postgresql-13.11-US.pdf
-SOURCES/postgresql-13.11.tar.bz2
+SOURCES/postgresql-13.13-US.pdf
+SOURCES/postgresql-13.13.tar.bz2
 SOURCES/postgresql-setup-8.7.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 3ad0930..178e2bb 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
-c7cc63d5caffcc5d4d8f31e07845722dc6db7787 SOURCES/postgresql-13.11-US.pdf
-501acb24ba8539c08ba12b08adecd7559bf87e1b SOURCES/postgresql-13.11.tar.bz2
+d67d6bc7c6213f67c96ca766a6626c409356f3a2 SOURCES/postgresql-13.13-US.pdf
+4e7eedca825034f1e249935a811fa30ce3b58d97 SOURCES/postgresql-13.13.tar.bz2
 fb97095dc9648f9c31d58fcb406831da5e419ddf SOURCES/postgresql-setup-8.7.tar.gz
diff --git a/SOURCES/postgresql-13.11.tar.bz2.sha256 b/SOURCES/postgresql-13.11.tar.bz2.sha256
deleted file mode 100644
index c5f9baf..0000000
--- a/SOURCES/postgresql-13.11.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb  postgresql-13.11.tar.bz2
diff --git a/SOURCES/postgresql-13.13.tar.bz2.sha256 b/SOURCES/postgresql-13.13.tar.bz2.sha256
new file mode 100644
index 0000000..a423e58
--- /dev/null
+++ b/SOURCES/postgresql-13.13.tar.bz2.sha256
@@ -0,0 +1 @@
+8af69c2599047a2ad246567d68ec4131aef116954d8c3e469e9789080b37a474  postgresql-13.13.tar.bz2
diff --git a/SOURCES/postgresql-external-libpq.patch b/SOURCES/postgresql-external-libpq.patch
index ba7ef73..74787ba 100644
--- a/SOURCES/postgresql-external-libpq.patch
+++ b/SOURCES/postgresql-external-libpq.patch
@@ -18,10 +18,10 @@ index bcdbd95..4bea236 100644
  	backend/replication/pgoutput \
  	fe_utils \
 diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index b9d86ac..29df69f 100644
+index b75bafd..ddd381b 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -549,7 +549,7 @@ endif
+@@ -576,7 +576,7 @@ endif
  # How to link to libpq.  (This macro may be used as-is by backend extensions.
  # Client-side code should go through libpq_pgport or libpq_pgport_shlib,
  # instead.)
@@ -29,8 +29,8 @@ index b9d86ac..29df69f 100644
 +libpq = -lpq
  
  # libpq_pgport is for use by client executables (not libraries) that use libpq.
- # We force clients to pull symbols from the non-shared libraries libpgport
-@@ -579,7 +579,6 @@ endif
+ # We want clients to pull symbols from the non-shared libraries libpgport
+@@ -619,7 +619,6 @@ endif
  # Commonly used submake targets
  
  submake-libpq: | submake-generated-headers
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 5952dba..7b5ba87 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -59,8 +59,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
-Version: %{majorversion}.11
-Release: 2%{?dist}
+Version: %{majorversion}.13
+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.
@@ -71,8 +71,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # 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 prevversion 12.9
 %global prevmajorversion 12
+%global prevversion %{prevmajorversion}.9
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1225,6 +1225,11 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Nov 13 2023 Jorge San Emeterio <jsanemet@redhat.com> - 13.13-1
+- Update to 13.13
+- Fixes: CVE-2023-5868 CVE-2023-5869 CVE-2023-5870 CVE-2023-39417
+- Resolves: RHEL-16085 RHEL-16123
+
 * Thu Jun 22 2023 Jorge San Emeterio <jsanemet@redhat.com> - 13.11-2
 - Update postgresql-setup to 8.7 (https://github.com/devexp-db/postgresql-setup/pull/35)
 - Resolves: #2207933