From c01b517cfe5241f00d21f1886b7d4108dde768df Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 13 Jan 2026 15:02:29 +0000
Subject: [PATCH] import UBI postgresql-13.23-1.el9_7

---
 .gitignore                              |  4 ++--
 .postgresql.metadata                    |  4 ++--
 SOURCES/postgresql-13.22.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-13.23.tar.bz2.sha256 |  1 +
 SOURCES/postgresql.tmpfiles.d           |  1 -
 SPECS/postgresql.spec                   | 32 ++++++++++++++++++++++---
 6 files changed, 34 insertions(+), 9 deletions(-)
 delete mode 100644 SOURCES/postgresql-13.22.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-13.23.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql.tmpfiles.d

diff --git a/.gitignore b/.gitignore
index 88c65cf..a414c34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-12.22.tar.bz2
-SOURCES/postgresql-13.22-US.pdf
-SOURCES/postgresql-13.22.tar.bz2
+SOURCES/postgresql-13.23-US.pdf
+SOURCES/postgresql-13.23.tar.bz2
 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index fd1fa47..bd69263 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 4f0a2bfcdaa6b370029353d7a01451d7a8282750 SOURCES/postgresql-12.22.tar.bz2
-8ff831da226b89ae11af4e73009379412de96580 SOURCES/postgresql-13.22-US.pdf
-3a5f8f2a4e889c395db905147be40dc1f8192fa4 SOURCES/postgresql-13.22.tar.bz2
+8ff831da226b89ae11af4e73009379412de96580 SOURCES/postgresql-13.23-US.pdf
+25e217f0c7bbc3150b4632eabdf77eb539a99719 SOURCES/postgresql-13.23.tar.bz2
 9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
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-13.23.tar.bz2.sha256 b/SOURCES/postgresql-13.23.tar.bz2.sha256
new file mode 100644
index 0000000..ef4f58d
--- /dev/null
+++ b/SOURCES/postgresql-13.23.tar.bz2.sha256
@@ -0,0 +1 @@
+6ec3c82726af92b7dec873fa1cdf881eca92a4219787dfad05acb6b10e041fd6  postgresql-13.23.tar.bz2
diff --git a/SOURCES/postgresql.tmpfiles.d b/SOURCES/postgresql.tmpfiles.d
deleted file mode 100644
index 6c48e34..0000000
--- a/SOURCES/postgresql.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 0755 postgres postgres -
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 35e7710..36cf789 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
-Version: %{majorversion}.22
+Version: %{majorversion}.23
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -90,7 +90,6 @@ Source1: postgresql-%{version}-US.pdf
 Source2: generate-pdf.sh
 Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2
 Source4: Makefile.regress
-Source9: postgresql.tmpfiles.d
 Source10: postgresql.pam
 Source11: postgresql-bashprofile
 
@@ -453,6 +452,15 @@ find . -type f -name Makefile -exec sed -i -e "s/SO_MAJOR_VERSION=\s\?\([0-9]\+\
 # remove .gitignore files to ensure none get into the RPMs (bug #642210)
 find . -type f -name .gitignore | xargs rm
 
+cat > postgresql.sysusers.conf <<EOF
+u postgres 26 'PostgreSQL Server' /var/lib/pgsql /bin/bash
+EOF
+
+cat > postgresql.tmpfiles.conf <<EOF
+d /run/postgresql 0755 postgres postgres -
+d /var/lib/pgsql 0700 postgres postgres -
+EOF
+
 
 %build
 # Avoid LTO on armv7hl as it runs out of memory
@@ -706,7 +714,9 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/postgresql
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
-install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+install -m 0644 postgresql.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir}/postgresql.conf
+
+install -m 0644 -D postgresql.sysusers.conf $RPM_BUILD_ROOT%{_sysusersdir}/postgresql.conf
 
 # PGDATA needs removal of group and world permissions due to pg_pwd hole.
 install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data
@@ -837,6 +847,9 @@ find_lang_bins pltcl.lst pltcl
 %endif
 %endif
 
+install -m0644 -D postgresql.tmpfiles.conf %{buildroot}%{_tmpfilesdir}/postgresql.conf
+
+
 %pre server
 /usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 /usr/sbin/useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
@@ -1109,6 +1122,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postmaster.*
 %{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
+%{_sysusersdir}/postgresql.conf
 %{_unitdir}/*postgresql*.service
 %attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql
 %attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile
@@ -1118,6 +1132,7 @@ make -C postgresql-setup-%{setup_version} check
 %if %pam
 %config(noreplace) /etc/pam.d/postgresql
 %endif
+%{_tmpfilesdir}/postgresql.conf
 
 
 %files server-devel -f devel.lst
@@ -1215,6 +1230,17 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 13.23-1
+- Update to 13.23
+- Resolves: RHEL-128812 (CVE-2025-12818)
+
+* Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 13.22-3
+- Add sysusers configuration and complete tmpfiles.d dynamically
+- Related: RHEL-94905
+
+* Wed Oct 22 2025 Filip Janus <fjanus@redhat.com> - 13.22-2
+- Define tmpfiles.d to enable ostree and bootc support
+
 * Fri Aug 15 2025 Filip Janus <fjanus@redhat.com> - 13.22-1
 - Update to 13.22