From 6f94b1f1d1b327593a1952717e7e70bc4f859027 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 5 Dec 2024 03:21:02 +0300
Subject: [PATCH] import postgresql-13.18-1.el9_5

---
 .gitignore                              |  6 +++---
 .postgresql.metadata                    |  6 +++---
 SOURCES/postgresql-12.20.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-12.22.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-13.16.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-13.18.tar.bz2.sha256 |  1 +
 SPECS/postgresql.spec                   | 17 ++++++++++-------
 7 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 SOURCES/postgresql-12.20.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-12.22.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-13.16.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-13.18.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index ab2fe83..37f435d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-12.20.tar.bz2
-SOURCES/postgresql-13.16-US.pdf
-SOURCES/postgresql-13.16.tar.bz2
+SOURCES/postgresql-12.22.tar.bz2
+SOURCES/postgresql-13.18-US.pdf
+SOURCES/postgresql-13.18.tar.bz2
 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index c1bdb79..ef72177 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-53f918639e4f0ee456c09586c5528d31a84e3934 SOURCES/postgresql-12.20.tar.bz2
-b21273bc7f03dc70a52dd7e0b7e878bc1de76f1e SOURCES/postgresql-13.16-US.pdf
-a2465d5086abb2b2ff9115541cae404f869dfa0f SOURCES/postgresql-13.16.tar.bz2
+4f0a2bfcdaa6b370029353d7a01451d7a8282750 SOURCES/postgresql-12.22.tar.bz2
+955d79c1020409995834540260981b95e269b980 SOURCES/postgresql-13.18-US.pdf
+e314353cf318ce5e33dfb73a91cd2ac9553c9885 SOURCES/postgresql-13.18.tar.bz2
 9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/SOURCES/postgresql-12.20.tar.bz2.sha256 b/SOURCES/postgresql-12.20.tar.bz2.sha256
deleted file mode 100644
index 8f410ea..0000000
--- a/SOURCES/postgresql-12.20.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2d543af3009fec7fd5af35f7a70c95085d3eef6b508e517aa9493e99b15e9ea9  postgresql-12.20.tar.bz2
diff --git a/SOURCES/postgresql-12.22.tar.bz2.sha256 b/SOURCES/postgresql-12.22.tar.bz2.sha256
new file mode 100644
index 0000000..81a18f5
--- /dev/null
+++ b/SOURCES/postgresql-12.22.tar.bz2.sha256
@@ -0,0 +1 @@
+8df3c0474782589d3c6f374b5133b1bd14d168086edbc13c6e72e67dd4527a3b  postgresql-12.22.tar.bz2
diff --git a/SOURCES/postgresql-13.16.tar.bz2.sha256 b/SOURCES/postgresql-13.16.tar.bz2.sha256
deleted file mode 100644
index 8b1d6f3..0000000
--- a/SOURCES/postgresql-13.16.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865  postgresql-13.16.tar.bz2
diff --git a/SOURCES/postgresql-13.18.tar.bz2.sha256 b/SOURCES/postgresql-13.18.tar.bz2.sha256
new file mode 100644
index 0000000..9570d76
--- /dev/null
+++ b/SOURCES/postgresql-13.18.tar.bz2.sha256
@@ -0,0 +1 @@
+ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1  postgresql-13.18.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 81de48c..9821e06 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
-Version: %{majorversion}.16
+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 12
-%global prevversion %{prevmajorversion}.20
+%global prevversion %{prevmajorversion}.22
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -705,10 +705,6 @@ install -d $RPM_BUILD_ROOT/etc/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
 %endif
 
-# Create the directory for sockets.
-install -d -m 755 $RPM_BUILD_ROOT%{?_localstatedir}/run/postgresql
-
-# ... and make a tmpfiles script to recreate it at reboot.
 mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
 install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
 
@@ -1118,7 +1114,7 @@ make -C postgresql-setup-%{setup_version} check
 %attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data
-%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql
+%ghost %attr(755,postgres,postgres) %dir %{?_rundir}/postgresql
 %if %pam
 %config(noreplace) /etc/pam.d/postgresql
 %endif
@@ -1219,9 +1215,16 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu Nov 21 2024 Filip Janus <fjanus@redhat.com> - 13.18-1
+- Update to 13.18
+
 * Tue Aug 06 2024 Filip Janus <fjanus@redhat.com> - 13.16-1
 - Update to 13.16
 
+* Tue Jul 30 2024 Filip Janus <fjanus@redhat.com> - 13.14-2
+- Remove /var/run/postgresql
+- Related: RHEL-25756
+
 * Fri Feb 9 2024 Filip Janus <fjanus@redhat.com> - 13.14-1
 - Update to 13.14
 - Fix CVE-2024-0985