From f8f9db6c2ba6eb6c3e099bc8af5f82a3ba0dedeb Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 21 Feb 2025 07:32:03 +0000
Subject: [PATCH] Import from CS git

---
 .gitignore                              | 4 ++--
 .postgresql.metadata                    | 4 ++--
 SOURCES/postgresql-15.10.tar.bz2.sha256 | 1 -
 SOURCES/postgresql-15.12.tar.bz2.sha256 | 1 +
 SOURCES/postgresql-16.6.tar.bz2.sha256  | 1 -
 SOURCES/postgresql-16.8.tar.bz2.sha256  | 1 +
 SPECS/postgresql.spec                   | 8 ++++++--
 7 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 SOURCES/postgresql-15.10.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-15.12.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-16.6.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-16.8.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 511897e..5e154d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-15.10.tar.bz2
-SOURCES/postgresql-16.6.tar.bz2
+SOURCES/postgresql-15.12.tar.bz2
+SOURCES/postgresql-16.8.tar.bz2
 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index a7f63c6..37b4394 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
-a5547e3dd549cbaf8b6f0bf47996edeaad9d0c6a SOURCES/postgresql-15.10.tar.bz2
-4213fa91ab843ad5956aa54bfa30adc4a6466561 SOURCES/postgresql-16.6.tar.bz2
+e324936f043bca125f3b12bef2919e5183118400 SOURCES/postgresql-15.12.tar.bz2
+2ada040fcd8965cbbcb75c2e021a489f32230ae4 SOURCES/postgresql-16.8.tar.bz2
 25a05ef36218b1de80d8eeb55f4b4e0b723bd7f6 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/SOURCES/postgresql-15.10.tar.bz2.sha256 b/SOURCES/postgresql-15.10.tar.bz2.sha256
deleted file mode 100644
index c2ebb02..0000000
--- a/SOURCES/postgresql-15.10.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573  postgresql-15.10.tar.bz2
diff --git a/SOURCES/postgresql-15.12.tar.bz2.sha256 b/SOURCES/postgresql-15.12.tar.bz2.sha256
new file mode 100644
index 0000000..cd7b414
--- /dev/null
+++ b/SOURCES/postgresql-15.12.tar.bz2.sha256
@@ -0,0 +1 @@
+3bc8462a38ca0857270cc88b949a3f6659f0d5c44c029c482355835b61a0f6f7  postgresql-15.12.tar.bz2
diff --git a/SOURCES/postgresql-16.6.tar.bz2.sha256 b/SOURCES/postgresql-16.6.tar.bz2.sha256
deleted file mode 100644
index 0a7158c..0000000
--- a/SOURCES/postgresql-16.6.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b  postgresql-16.6.tar.bz2
diff --git a/SOURCES/postgresql-16.8.tar.bz2.sha256 b/SOURCES/postgresql-16.8.tar.bz2.sha256
new file mode 100644
index 0000000..5c9a229
--- /dev/null
+++ b/SOURCES/postgresql-16.8.tar.bz2.sha256
@@ -0,0 +1 @@
+9468083a56ce0ee7d294601b74dad3dd9fc69d87aff61f0a9fb63c813ff7efd8  postgresql-16.8.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 6a36259..8f3c013 100755
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 16
-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 15
-%global prevversion %{prevmajorversion}.10
+%global prevversion %{prevmajorversion}.12
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1216,6 +1216,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Tue Feb 18 2025 Filip Janus <fjanus@redhat.com> - 16.8-1
+- Update to 16.8
+- Fix CVE-2025-1094
+
 * Thu Nov 21 2024 Lukas Javorsky <ljavorsk@redhat.com> - 16.6-1
 - Update to 16.6
 - Fixes: CVE-2024-10976 CVE-2024-10978 CVE-2024-10979