From 95b4b2ca85217c742cdb6441ced6999d6ec9f7e3 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Fri, 26 Jun 2026 05:39:43 -0400
Subject: [PATCH] import Oracle_OSS
 postgresql-15.18-1.module+el9.8.0+90926+92e334e4

---
 .gitignore                              |  6 +++---
 .postgresql.metadata                    |  6 +++---
 SOURCES/postgresql-13.20.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-13.22.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-15.17.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-15.18.tar.bz2.sha256 |  1 +
 SPECS/postgresql.spec                   | 14 +++++++-------
 7 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 SOURCES/postgresql-13.20.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-13.22.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-15.17.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-15.18.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index f8a02aa..9d49a24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-13.22.tar.bz2
-SOURCES/postgresql-15.17-US.pdf
-SOURCES/postgresql-15.17.tar.bz2
+SOURCES/postgresql-13.20.tar.bz2
+SOURCES/postgresql-15.18-US.pdf
+SOURCES/postgresql-15.18.tar.bz2
 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 425a65a..4831f38 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-3a5f8f2a4e889c395db905147be40dc1f8192fa4 SOURCES/postgresql-13.22.tar.bz2
-107aafb7c57a5db50d1aee92a211d648b427e4da SOURCES/postgresql-15.17-US.pdf
-09a3926425707ffcf1dd7a5bae8869f921659c13 SOURCES/postgresql-15.17.tar.bz2
+e56b335306a0dd446987c35dba655427dfcc325c SOURCES/postgresql-13.20.tar.bz2
+ea3df5e85f4b98bae473feb920d0a90682323f1a SOURCES/postgresql-15.18-US.pdf
+fab946980b8709a3caf476eb87a2980fcc0664e8 SOURCES/postgresql-15.18.tar.bz2
 c5aa3e8b728c67b294815931c91c86aa61932bb5 SOURCES/postgresql-setup-8.8.tar.gz
diff --git a/SOURCES/postgresql-13.20.tar.bz2.sha256 b/SOURCES/postgresql-13.20.tar.bz2.sha256
new file mode 100644
index 0000000..020a3a4
--- /dev/null
+++ b/SOURCES/postgresql-13.20.tar.bz2.sha256
@@ -0,0 +1 @@
+8134b685724d15e60d93bea206fbe0f14c8295e84f1cc91d5a3928163e4fb288  postgresql-13.20.tar.bz2
diff --git a/SOURCES/postgresql-13.22.tar.bz2.sha256 b/SOURCES/postgresql-13.22.tar.bz2.sha256
deleted file mode 100644
index 24d28fe..0000000
--- a/SOURCES/postgresql-13.22.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-d36d83dc89e625502cf6fb1d0529642ba1266bd614b4e4a41cefd1dddcf09080  postgresql-13.22.tar.bz2
diff --git a/SOURCES/postgresql-15.17.tar.bz2.sha256 b/SOURCES/postgresql-15.17.tar.bz2.sha256
deleted file mode 100644
index 9b51ec2..0000000
--- a/SOURCES/postgresql-15.17.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ae14f24c14727e0b2ded1c5553031666099bd1054db3ef44bfa6e2bd6d554a56  postgresql-15.17.tar.bz2
diff --git a/SOURCES/postgresql-15.18.tar.bz2.sha256 b/SOURCES/postgresql-15.18.tar.bz2.sha256
new file mode 100644
index 0000000..ecf0d53
--- /dev/null
+++ b/SOURCES/postgresql-15.18.tar.bz2.sha256
@@ -0,0 +1 @@
+11df0df97fe3ea4ba9a791faaf39cee1d2fe571e78885b5b55d8517d27c323b4  postgresql-15.18.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index aff8ac2..3452ccd 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 15
-Version: %{majorversion}.17
+Version: %{majorversion}.18
 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}.22
+%global prevversion %{prevmajorversion}.20
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1238,20 +1238,20 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Wed May 28 2026 Filip Janus <fjanus@redhat.com> - 15.18-1
+- Update to 15.18
+- Fix CVE-2026-6478
+
 * Thu Feb 26 2026 Lukas Javorsky <ljavorsk@redhat.com> - 15.17-1
 - Update to 15.17
 - Fixes: CVE-2026-2004 CVE-2026-2005 CVE-2026-2006
 
 * Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 15.15-2
 - Add sysusers configuration and generate tmpfiles.d dynamically
-- Resolves: RHEL-133896
 
 * Mon Dec 01 2025 Filip Janus <fjanus@redhat.com> - 15.15-1
 - Update to 15.15
-- Resolves: RHEL-128813 (CVE-2025-12818)
-
-* Fri Aug 15 2025 Filip Janus <fjanus@redhat.com> - 15.14-1
-- Update to 15.14
+- Resolves: RHEL-128816 (CVE-2025-12818)
 
 * Thu Feb 20 2025 Ales Nezbeda <anezbeda@redhat.com> - 15.12-1
 - Update to 15.12