From 5af7eb395f48d9b07913b53e559bf388e2212a0c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 16 Jan 2026 09:17:15 +0000
Subject: [PATCH] import OL postgresql-16.11-1.module+el9.7.0+90762+9d88f05d

---
 .gitignore                              |  2 +-
 .postgresql.metadata                    |  2 +-
 SOURCES/postgresql-16.10.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-16.11.tar.bz2.sha256 |  1 +
 SOURCES/postgresql.tmpfiles.d           |  1 -
 SPECS/postgresql.spec                   | 24 ++++++++++++++++++++----
 6 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 SOURCES/postgresql-16.10.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-16.11.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql.tmpfiles.d

diff --git a/.gitignore b/.gitignore
index f73c984..f8858ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/postgresql-15.14.tar.bz2
-SOURCES/postgresql-16.10.tar.bz2
+SOURCES/postgresql-16.11.tar.bz2
 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index c14344e..6ddaf9c 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
 474c7ee4c36f34dac2080c7ec569f1b485df724e SOURCES/postgresql-15.14.tar.bz2
-0bee6efb735cae0a40bd5584e96f26f1d16664ba SOURCES/postgresql-16.10.tar.bz2
+7c93e10c6d400e76b0e2ab29334efde7d58cd0ba SOURCES/postgresql-16.11.tar.bz2
 25a05ef36218b1de80d8eeb55f4b4e0b723bd7f6 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/SOURCES/postgresql-16.10.tar.bz2.sha256 b/SOURCES/postgresql-16.10.tar.bz2.sha256
deleted file mode 100644
index 3733042..0000000
--- a/SOURCES/postgresql-16.10.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-de8485f4ce9c32e3ddfeef0b7c261eed1cecb54c9bcd170e437ff454cb292b42  postgresql-16.10.tar.bz2
diff --git a/SOURCES/postgresql-16.11.tar.bz2.sha256 b/SOURCES/postgresql-16.11.tar.bz2.sha256
new file mode 100644
index 0000000..11193b8
--- /dev/null
+++ b/SOURCES/postgresql-16.11.tar.bz2.sha256
@@ -0,0 +1 @@
+6deb08c23d03d77d8f8bd1c14049eeef64aef8968fd8891df2dfc0b42f178eac  postgresql-16.11.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 0da3369..627a7ee 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 16
-Version: %{majorversion}.10
+Version: %{majorversion}.11
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -87,7 +87,6 @@ Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}
 # The PDF file is generated by generate-pdf.sh, which see for comments
 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
 
@@ -445,6 +444,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
@@ -702,7 +710,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
@@ -1112,6 +1122,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postgresql-upgrade.*
 %{_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
@@ -1218,7 +1229,12 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Fri Aug 15 2025 Filip Janus <fjanus@redhat.com> - 16.10-1
+* Fri Dec 05 2025 Filip Janus <fjanus@redhat.com> - 16.11-1
+- Update to 16.11
+- Add sysusers configuration and generate tmpfiles.d dynamically
+- Resolves: RHEL-123193 (CVE-2025-12818)
+
+* Wed Sep 3 2025 Filip Janus <fjanus@redhat.com> - 16.10-1
 - Update to 16.10
 
 * Tue Feb 18 2025 Filip Janus <fjanus@redhat.com> - 16.8-1