From ed06d8fb5caf0ff61c735e65a6a2e94e96dab303 Mon Sep 17 00:00:00 2001 From: Devrim Gunduz Date: Mon, 10 Nov 2025 09:33:01 +0300 Subject: [PATCH] pgbouncer: Update to 1.25.0, per changes described at http://www.pgbouncer.org/changelog.html#pgbouncer-125x . Also do a bit modernisation work and cleanup --- .../pgbouncer/EL-10/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/EL-8/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/EL-9/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/F-41/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/F-42/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/F-43/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/SLES-15/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/SLES-16/pgbouncer-tmpfiles.d | 1 + .../pgbouncer/main/pgbouncer-tmpfiles.d | 3 ++ .../main/common/pgbouncer/main/pgbouncer.spec | 39 +++++++++---------- 10 files changed, 30 insertions(+), 20 deletions(-) create mode 120000 rpm/redhat/main/common/pgbouncer/EL-10/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/EL-8/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/EL-9/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/F-41/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/F-42/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/F-43/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/SLES-15/pgbouncer-tmpfiles.d create mode 120000 rpm/redhat/main/common/pgbouncer/SLES-16/pgbouncer-tmpfiles.d create mode 100644 rpm/redhat/main/common/pgbouncer/main/pgbouncer-tmpfiles.d diff --git a/rpm/redhat/main/common/pgbouncer/EL-10/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/EL-10/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/EL-10/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/EL-8/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/EL-8/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/EL-8/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/EL-9/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/EL-9/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/EL-9/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/F-41/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/F-41/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/F-41/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/F-42/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/F-42/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/F-42/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/F-43/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/F-43/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/F-43/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/SLES-15/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/SLES-15/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/SLES-15/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/SLES-16/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/SLES-16/pgbouncer-tmpfiles.d new file mode 120000 index 000000000..9627c92a5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/SLES-16/pgbouncer-tmpfiles.d @@ -0,0 +1 @@ +../main/pgbouncer-tmpfiles.d \ No newline at end of file diff --git a/rpm/redhat/main/common/pgbouncer/main/pgbouncer-tmpfiles.d b/rpm/redhat/main/common/pgbouncer/main/pgbouncer-tmpfiles.d new file mode 100644 index 000000000..0f3f94ed5 --- /dev/null +++ b/rpm/redhat/main/common/pgbouncer/main/pgbouncer-tmpfiles.d @@ -0,0 +1,3 @@ +d /run/pgbouncer 0700 pgbouncer pgbouncer - +d /home/pgbouncer 0700 pgbouncer pgbouncer - + diff --git a/rpm/redhat/main/common/pgbouncer/main/pgbouncer.spec b/rpm/redhat/main/common/pgbouncer/main/pgbouncer.spec index 541dd28ea..9cae21833 100644 --- a/rpm/redhat/main/common/pgbouncer/main/pgbouncer.spec +++ b/rpm/redhat/main/common/pgbouncer/main/pgbouncer.spec @@ -1,6 +1,6 @@ Name: pgbouncer -Version: 1.24.1 -Release: 43PGDG%{?dist} +Version: 1.25.0 +Release: 42PGDG%{?dist} Summary: Lightweight connection pooler for PostgreSQL License: MIT and BSD URL: https://www.pgbouncer.org/ @@ -9,6 +9,7 @@ Source2: %{name}.sysconfig Source3: %{name}.logrotate Source4: %{name}.service Source5: %{name}-sysusers.conf +Source6: %{name}-tmpfiles.d Patch0: %{name}-ini.patch Requires: python3 python3-psycopg2 @@ -16,7 +17,7 @@ Requires: python3 python3-psycopg2 BuildRequires: libevent-devel >= 2.0 Requires: libevent >= 2.0 -BuildRequires: openssl-devel pam-devel +BuildRequires: openssl-devel pam-devel pandoc %if 0%{?fedora} >= 41 || 0%{?rhel} >= 9 BuildRequires: c-ares-devel >= 1.13 @@ -27,19 +28,20 @@ BuildRequires: c-ares-devel >= 1.13 Requires: libcares2 >= 1.19 %endif +%if 0%{?suse_version} >= 1500 +BuildRequires: openldap2-devel +%else +BuildRequires: openldap-devel +%endif + BuildRequires: systemd # We require this to be present for %%{_prefix}/lib/tmpfiles.d Requires: systemd -%if 0%{?suse_version} -%if 0%{?suse_version} >= 1500 -Requires(post): systemd-sysvinit -%endif -%else -Requires(post): systemd-sysv Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%endif + +Provides: group(pgbouncer) user(pgbouncer) %description pgbouncer is a lightweight connection pooler for PostgreSQL. @@ -81,13 +83,8 @@ sed -i.fedora \ %{__install} -d %{buildroot}%{_unitdir} %{__install} -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service -# ... and make a tmpfiles script to recreate it at reboot. -%{__mkdir} -p %{buildroot}%{_tmpfilesdir} -cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf </dev/null 2>&1 || : %pre -groupadd -r pgbouncer >/dev/null 2>&1 || : -useradd -m -g pgbouncer -r -s /bin/bash \ - -c "PgBouncer Server" pgbouncer >/dev/null 2>&1 || : +%sysusers_create_package %{name} %SOURCE6 %preun %systemd_preun %{name}.service @@ -146,6 +141,10 @@ fi %attr(755,pgbouncer,pgbouncer) %dir /var/run/%{name} %changelog +* Mon Nov 10 2025 Devrim Gündüz - 1.25.0-42PGDG +- Update to 1.25.0, per changes described at: + http://www.pgbouncer.org/changelog.html#pgbouncer-125x + * Mon Sep 22 2025 Devrim Gündüz - 1.24.1-43PGDG - Add sysusers.d config file to allow rpm to create users/groups automatically. - Add c-ares support to SLES 15 as well. -- 2.39.5