From 827e039f94374fe15f7ec86ee93efb63ad6771ce Mon Sep 17 00:00:00 2001
From: Jorge San Emeterio <jsanemet@redhat.com>
Date: Mon, 13 Nov 2023 15:41:44 +0100
Subject: [PATCH] Update to 13.13

---
 .gitignore                      |  3 +++
 .postgresql.metadata            |  2 ++
 postgresql-external-libpq.patch |  8 ++++----
 postgresql.spec                 | 11 ++++++++---
 sources                         |  6 +++---
 5 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 .postgresql.metadata

diff --git a/.gitignore b/.gitignore
index ddde994..bfb89ac 100755
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@
 /postgresql-13.11.tar.bz2.sha256
 /postgresql-13.11-US.pdf
 /postgresql-setup-8.7.tar.gz
+/postgresql-13.13.tar.bz2
+/postgresql-13.13.tar.bz2.sha256
+/postgresql-13.13-US.pdf
diff --git a/.postgresql.metadata b/.postgresql.metadata
new file mode 100644
index 0000000..756f6d1
--- /dev/null
+++ b/.postgresql.metadata
@@ -0,0 +1,2 @@
+a79d8428850da50a65451e5e44771844c7f166d5 postgresql-12.9.tar.bz2
+ce5184f1b16b2fb1d0e7bca4e8083fe22e2bc6c3 postgresql-12.9.tar.bz2.sha256
diff --git a/postgresql-external-libpq.patch b/postgresql-external-libpq.patch
index ba7ef73..74787ba 100644
--- a/postgresql-external-libpq.patch
+++ b/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/postgresql.spec b/postgresql.spec
index 5952dba..7b5ba87 100644
--- a/postgresql.spec
+++ b/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
diff --git a/sources b/sources
index 840e8ff..8af85a3 100755
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 SHA512 (postgresql-12.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
 SHA512 (postgresql-12.9.tar.bz2.sha256) = e06887f94a470d723c8d65ece5a32358da1881411ad92cc4ef35c9f6e8aa05a0485c729e07ab381cda4b53fe6fdaec1b07c2d0200ee8823ec45849e8a8f277f0
-SHA512 (postgresql-13.11.tar.bz2) = 30c60de44f9a33470ea9cd0c9757de23341bf1f5b9f3e8ee2c5b303d6709d08e9aea0f6ae597e344f610a577809860c7921596fe63034b6c2e3fa488e3040987
-SHA512 (postgresql-13.11.tar.bz2.sha256) = 91330c6ada99e0aff7e5658574c56fb3de8e5642ac67c59f5a29ed5a6d829560f35a6cd3861e710d92ffa1589131a813ed5f949f1826978968be4c56c7711f21
+SHA512 (postgresql-13.13.tar.bz2) = d7b1076cdc406ac83440c75d18e6dc6db9af709615344978ba0135b45a127082b1d3c6ad6d8cd6259d67ddf38cfcee37dd78dcfbf8e4a710b724c67cf36170a7
+SHA512 (postgresql-13.13.tar.bz2.sha256) = 3c9a727acc8ab6ff7d338c1e2094f40723c8f6ec33b94caff43c565925802cbd6e1ef18428b42ddc0314ea010d410c6daba8010bc6bfd7e12e5b0d3e8e6842b9
+SHA512 (postgresql-13.13-US.pdf) = 1b5259e8fe0661400ff86d9c6c1e7ee8352643e6c754f8535e9f98c741c4467ac521568fdd8a73ab5831024982fad972a1984f3a38ef80a0f4c6dba3740bf71f
 SHA512 (postgresql-setup-8.7.tar.gz) = 741f036be517e7d9725e4f146ca7dac8b8a16b6a93d045a64ef268487f48faad6b08317b58e07ad16a31002d2a10de0ac32513a4935c3f22f48ec768a742d1fc
-SHA512 (postgresql-13.11-US.pdf) = a085e7dedc6fbd37c69b6616d123f85d769cf20703a8b557f2d399fa1770bb98bb0bf0bdae4010e54da2da7da5e7f0bb5fa6928ee273da6bd8f1a0486feaa2fd