From 9a3a7d3ca222fe8129447d8469bd3f6128701f46 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 29 Aug 2024 15:16:52 +0300
Subject: [PATCH] Import from CS git

---
 .gitignore            | 6 +++---
 .postgresql.metadata  | 6 +++---
 SPECS/postgresql.spec | 8 ++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84e812d..e3d5a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-13.14.tar.bz2
-SOURCES/postgresql-15.6-US.pdf
-SOURCES/postgresql-15.6.tar.bz2
+SOURCES/postgresql-13.16.tar.bz2
+SOURCES/postgresql-15.8-US.pdf
+SOURCES/postgresql-15.8.tar.bz2
 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index b55ccde..b77d99a 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-79dbababe688d5589fa1d255656bf2e8e35730ce SOURCES/postgresql-13.14.tar.bz2
-dd87738d2b2d8ccd3afcd414a1d47d9819e8cbff SOURCES/postgresql-15.6-US.pdf
-c62fb81e3eccbab523d840a7717c14a0b3a82a02 SOURCES/postgresql-15.6.tar.bz2
+a2465d5086abb2b2ff9115541cae404f869dfa0f SOURCES/postgresql-13.16.tar.bz2
+25386701fcffa65a733f0225a58ea6231dc1808b SOURCES/postgresql-15.8-US.pdf
+4decf90a7557c41fc61312e8696f59e0f7123d2a SOURCES/postgresql-15.8.tar.bz2
 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 3397b75..7a5ee44 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.6
+Version: %{majorversion}.8
 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}.14
+%global prevversion %{prevmajorversion}.16
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1084,6 +1084,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/snowball_create.sql
 %{_datadir}/pgsql/sql_features.txt
 %{_datadir}/pgsql/system_constraints.sql
+%{_datadir}/pgsql/fix-CVE-2024-4317.sql
 %{_datadir}/pgsql/system_functions.sql
 %{_datadir}/pgsql/system_views.sql
 %{_datadir}/pgsql/timezonesets/
@@ -1226,6 +1227,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Tue Aug 6 2024 Filip Janus <fjanus@redhat.com> - 15.8-1
+- Update to 15.8
+
 * Fri Feb 9 2024 Filip Janus <fjanus@redhat.com> 15.6-1
 - Update to 15.6 and 13.14
 - Fix CVE-2024-0985