rpms/postgresql
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Import from CS git

Browse Source
This commit is contained in:
eabdullin 2025-03-26 13:30:30 +00:00
parent c935179eff
commit 65eb4b7715
3 changed files with 3706 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3670
SOURCES/backport-cve-2025-1094.patch Normal file
View File

File diff suppressed because it is too large Load Diff

25
SOURCES/timezone-test-fix.patch Normal file
View File

@ -0,0 +1,25 @@
From 9d18b30ac7a17d70ee789b710865bd20b206023d Mon Sep 17 00:00:00 2001
From: Filip Janus <fjanus@redhat.com>
Date: Tue, 18 Mar 2025 10:11:09 +0100
Subject: [PATCH] Fix failing test regardless the CVE-2025-1094 fix
---
src/test/regress/expected/timestamptz.out | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 55efd183868..5964b65bc6b 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -2060,7 +2060,7 @@ SELECT make_timestamptz(2014, 12, 10, 0, 0, 0, 'Europe/Prague') AT TIME ZONE 'UT
SELECT make_timestamptz(1846, 12, 10, 0, 0, 0, 'Asia/Manila') AT TIME ZONE 'UTC';
timezone
--------------------------
- Wed Dec 09 15:56:00 1846
+ Wed Dec 09 15:56:08 1846
(1 row)
SELECT make_timestamptz(1881, 12, 10, 0, 0, 0, 'Europe/Paris') AT TIME ZONE 'UTC';
--
2.39.5 (Apple Git-154)

12
SPECS/postgresql.spec
View File

@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 12
Version: %{majorversion}.22
Release: 1%{?dist}
Release: 3%{?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.
@ -108,6 +108,8 @@ Patch6: postgresql-man.patch
Patch8: postgresql-external-libpq.patch
Patch9: postgresql-server-pg_config.patch
Patch10: postgresql-12.5-contrib-dblink-expected-out.patch
Patch11: backport-cve-2025-1094.patch
Patch12: timezone-test-fix.patch
BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@ -369,6 +371,8 @@ benchmarks.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
# We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script.
@ -1224,6 +1228,12 @@ make -C postgresql-setup-%{setup_version} check
%changelog
* Tue Mar 18 2025 Filip Janus <fjanus@redhat.com> - 12.22-3
- Fix backport for CVE-2025-1094
* Tue Mar 18 2025 Filip Janus <fjanus@redhat.com> - 12.22-2
- Backport fix for CVE-2025-1094
* Thu Nov 21 2024 Lukas Javorsky <ljavorsk@redhat.com> - 12.22-1
- Update to 12.22
- Fixes: CVE-2024-10976 CVE-2024-10978