From 8eb41725a0b80de4b238bdbc94255fcc755df340 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 14 Feb 2025 10:53:21 +0800
Subject: [PATCH] update to 15.11 to fix CVE-2025-1094

(cherry picked from commit 2f448b5873cd15589515e9761cd849ef3fcaaaba)
---
 postgresql-14.15.tar.bz2.sha256                      | 1 -
 postgresql-14.15.tar.bz2 => postgresql-14.16.tar.bz2 | 4 ++--
 postgresql-14.16.tar.bz2.sha256                      | 1 +
 postgresql-15.10.tar.bz2.sha256                      | 1 -
 postgresql-15.10-US.pdf => postgresql-15.11-US.pdf   | 4 ++--
 postgresql-15.10.tar.bz2 => postgresql-15.11.tar.bz2 | 4 ++--
 postgresql-15.11.tar.bz2.sha256                      | 1 +
 postgresql.spec                                      | 9 ++++++---
 8 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 postgresql-14.15.tar.bz2.sha256
 rename postgresql-14.15.tar.bz2 => postgresql-14.16.tar.bz2 (32%)
 create mode 100644 postgresql-14.16.tar.bz2.sha256
 delete mode 100644 postgresql-15.10.tar.bz2.sha256
 rename postgresql-15.10-US.pdf => postgresql-15.11-US.pdf (32%)
 rename postgresql-15.10.tar.bz2 => postgresql-15.11.tar.bz2 (32%)
 create mode 100644 postgresql-15.11.tar.bz2.sha256

diff --git a/postgresql-14.15.tar.bz2.sha256 b/postgresql-14.15.tar.bz2.sha256
deleted file mode 100644
index 879fa4c..0000000
--- a/postgresql-14.15.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5  postgresql-14.15.tar.bz2
diff --git a/postgresql-14.15.tar.bz2 b/postgresql-14.16.tar.bz2
similarity index 32%
rename from postgresql-14.15.tar.bz2
rename to postgresql-14.16.tar.bz2
index 0e66919..b6e0e0b 100644
--- a/postgresql-14.15.tar.bz2
+++ b/postgresql-14.16.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5
-size 22458243
+oid sha256:673c26f15ebb14306ad0ea051d8acfb3915dd342de942f5b502e5354a0ab760c
+size 22491073
diff --git a/postgresql-14.16.tar.bz2.sha256 b/postgresql-14.16.tar.bz2.sha256
new file mode 100644
index 0000000..298723f
--- /dev/null
+++ b/postgresql-14.16.tar.bz2.sha256
@@ -0,0 +1 @@
+673c26f15ebb14306ad0ea051d8acfb3915dd342de942f5b502e5354a0ab760c  postgresql-14.16.tar.bz2
diff --git a/postgresql-15.10.tar.bz2.sha256 b/postgresql-15.10.tar.bz2.sha256
deleted file mode 100644
index c2ebb02..0000000
--- a/postgresql-15.10.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573  postgresql-15.10.tar.bz2
diff --git a/postgresql-15.10-US.pdf b/postgresql-15.11-US.pdf
similarity index 32%
rename from postgresql-15.10-US.pdf
rename to postgresql-15.11-US.pdf
index 1300984..9de2bec 100644
--- a/postgresql-15.10-US.pdf
+++ b/postgresql-15.11-US.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0451c85f572c02574cf4b86b0088669f800fbe28d4414609b888ea4ce2748b7b
-size 14249467
+oid sha256:de9fda952c0b484c59227865131eb661901ec0c48d79f82b25cc4388d7868d40
+size 14272847
diff --git a/postgresql-15.10.tar.bz2 b/postgresql-15.11.tar.bz2
similarity index 32%
rename from postgresql-15.10.tar.bz2
rename to postgresql-15.11.tar.bz2
index 795aeaa..126864c 100644
--- a/postgresql-15.10.tar.bz2
+++ b/postgresql-15.11.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573
-size 23138615
+oid sha256:5367e97e81e493301cc4aab049dfbc9b4913822985bc62379faab2a281cfbdf0
+size 23167652
diff --git a/postgresql-15.11.tar.bz2.sha256 b/postgresql-15.11.tar.bz2.sha256
new file mode 100644
index 0000000..feab072
--- /dev/null
+++ b/postgresql-15.11.tar.bz2.sha256
@@ -0,0 +1 @@
+5367e97e81e493301cc4aab049dfbc9b4913822985bc62379faab2a281cfbdf0  postgresql-15.11.tar.bz2
diff --git a/postgresql.spec b/postgresql.spec
index d315716..9fcdf95 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -31,8 +31,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.10
-Release: 2
+Version: %{majorversion}.11
+Release: 1
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -40,7 +40,7 @@ License: PostgreSQL
 Url: http://www.postgresql.org/
 
 %global prevmajorversion 14
-%global prevversion %{prevmajorversion}.15
+%global prevversion %{prevmajorversion}.16
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1294,6 +1294,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri Feb 14 2025 Funda Wang <fundawang@yeah.net> - 15.11-1
+- update to 15.11 to fix CVE-2025-1094
+
 * Thu Jan 16 2025 Funda Wang <fundawang@yeah.net> - 15.10-2
 - drop useless perl(:MODULE_COMPAT) requirement
 
-- 
Gitee