From 13c4db383b92f364e7f106e4fef1af32591f2245 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Mon, 26 Feb 2024 05:48:11 +0000
Subject: [PATCH] import UBI postgresql-15.6-1.module+el9.3.0+21283+b0ea34b6

---
 .gitignore                              | 6 +++---
 .postgresql.metadata                    | 6 +++---
 SOURCES/postgresql-13.14.tar.bz2.sha256 | 1 +
 SOURCES/postgresql-13.7.tar.bz2.sha256  | 1 -
 SOURCES/postgresql-15.5.tar.bz2.sha256  | 1 -
 SOURCES/postgresql-15.6.tar.bz2.sha256  | 1 +
 SPECS/postgresql.spec                   | 9 ++++++---
 7 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 SOURCES/postgresql-13.14.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-13.7.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-15.5.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-15.6.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 5f8371c..84e812d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-13.7.tar.bz2
-SOURCES/postgresql-15.5-US.pdf
-SOURCES/postgresql-15.5.tar.bz2
+SOURCES/postgresql-13.14.tar.bz2
+SOURCES/postgresql-15.6-US.pdf
+SOURCES/postgresql-15.6.tar.bz2
 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 87765bf..b55ccde 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-cb4c0aed7cee21f3a1f4756fc61054d8ba756e2b SOURCES/postgresql-13.7.tar.bz2
-09a8705ab9589f63e1c661a2218ca58d916bbbc3 SOURCES/postgresql-15.5-US.pdf
-1688b684c181a3173a3f2b76a12e83c8371facc8 SOURCES/postgresql-15.5.tar.bz2
+79dbababe688d5589fa1d255656bf2e8e35730ce SOURCES/postgresql-13.14.tar.bz2
+dd87738d2b2d8ccd3afcd414a1d47d9819e8cbff SOURCES/postgresql-15.6-US.pdf
+c62fb81e3eccbab523d840a7717c14a0b3a82a02 SOURCES/postgresql-15.6.tar.bz2
 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/SOURCES/postgresql-13.14.tar.bz2.sha256 b/SOURCES/postgresql-13.14.tar.bz2.sha256
new file mode 100644
index 0000000..76e8707
--- /dev/null
+++ b/SOURCES/postgresql-13.14.tar.bz2.sha256
@@ -0,0 +1 @@
+b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed  postgresql-13.14.tar.bz2
diff --git a/SOURCES/postgresql-13.7.tar.bz2.sha256 b/SOURCES/postgresql-13.7.tar.bz2.sha256
deleted file mode 100644
index c285633..0000000
--- a/SOURCES/postgresql-13.7.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1b905bf4f3d83614a393b3c51fd345910fd261e4f5124a68d9a1fdd3a2a46399  postgresql-13.7.tar.bz2
diff --git a/SOURCES/postgresql-15.5.tar.bz2.sha256 b/SOURCES/postgresql-15.5.tar.bz2.sha256
deleted file mode 100644
index f5f8afa..0000000
--- a/SOURCES/postgresql-15.5.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6  postgresql-15.5.tar.bz2
diff --git a/SOURCES/postgresql-15.6.tar.bz2.sha256 b/SOURCES/postgresql-15.6.tar.bz2.sha256
new file mode 100644
index 0000000..b9cc1cf
--- /dev/null
+++ b/SOURCES/postgresql-15.6.tar.bz2.sha256
@@ -0,0 +1 @@
+8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb  postgresql-15.6.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 96a651d..3397b75 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.5
+Version: %{majorversion}.6
 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}.7
+%global prevversion %{prevmajorversion}.14
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1226,10 +1226,13 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri Feb 9 2024 Filip Janus <fjanus@redhat.com> 15.6-1
+- Update to 15.6 and 13.14
+- Fix CVE-2024-0985
+
 * Mon Nov 13 2023 Masahiro Matsuya <mmatsuya@redhat.com> - 15.5-1
 - update to 15.5
 - Fixes CVE-2023-5868, CVE-2023-5869, CVE-2023-5870, CVE-2023-39417, and CVE-2023-39418
-  Resolves: RHEL-16100, RHEL-16124, RHEL-16139
 
 * Wed Jun 14 2023 Masahiro Matsuya <mmatsuya@redhat.com> - 15.3-1
 - update to 15.3