From ba1957f1d2c149758c1b81d7b1d745b3e26781e4bd5aa8d8e6d48b7d9b311e13 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 22 Oct 2019 13:34:32 +0000 Subject: [PATCH 1/3] Accepting request 741843 from home:darix:branches:server:database:postgresql - bump to 12 OBS-URL: https://build.opensuse.org/request/show/741843 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=118 --- postgresql.changes | 5 +++++ postgresql.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/postgresql.changes b/postgresql.changes index 5b5ab86..66668df 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 22 13:08:50 UTC 2019 - Marcus Rueckert + +- bump to 12 + ------------------------------------------------------------------- Mon Oct 7 08:26:39 UTC 2019 - Reinhard Max diff --git a/postgresql.spec b/postgresql.spec index 48d936b..7404ba6 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -32,7 +32,7 @@ Name: postgresql Summary: Basic Clients and Utilities for PostgreSQL License: PostgreSQL Group: Productivity/Databases/Tools -Version: 11 +Version: 12 Release: 0 Url: https://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build From e646e1cba39354f268030be3a3d405c0a0308592f36096e898d119661bd1fa8d Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 14 Nov 2019 12:38:52 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=119 --- postgresql.changes | 5 +++++ postgresql.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/postgresql.changes b/postgresql.changes index 66668df..d0935ea 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 12:36:59 UTC 2019 - Reinhard Max + +- Sync ownership of /run/postgresql in the file list with tmpfiles. + ------------------------------------------------------------------- Tue Oct 22 13:08:50 UTC 2019 - Marcus Rueckert diff --git a/postgresql.spec b/postgresql.spec index 7404ba6..b030f8b 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -268,7 +268,6 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL %install mkdir -p %buildroot/var/lib/pgsql/ -mkdir -p %buildroot/var/run/postgresql install -m755 -d %buildroot%{_fillupdir} install -m644 %{S:1} %buildroot%{_fillupdir}/sysconfig.postgresql @@ -393,10 +392,10 @@ fi %_tmpfilesdir/postgresql.conf %_unitdir/ /usr/share/postgresql/postgresql-script -%ghost %dir %attr(1775,root,root) /run/postgresql +%ghost %dir %attr(1775,postgres,postgres) /run/postgresql %else %config /etc/init.d/postgresql -%dir %attr(1775,root,root) /var/run/postgresql +%dir %attr(1775,postgres,postgres) /var/run/postgresql %endif %files test From b7322d4c9b44d42b4e0f921a90ddafd486b716b7eb11e941427fb3187f717e91 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 17 Dec 2019 10:48:51 +0000 Subject: [PATCH 3/3] - Fix a mistake in the creation of /var/lib/pgsql/.bash_profile with the tmpfiles mechanism (bsc#1159335). OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=120 --- postgresql-tmpfiles.conf | 2 +- postgresql.changes | 6 ++++++ postgresql.spec | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/postgresql-tmpfiles.conf b/postgresql-tmpfiles.conf index 77b0953..fad55d4 100644 --- a/postgresql-tmpfiles.conf +++ b/postgresql-tmpfiles.conf @@ -1,3 +1,3 @@ # For the PostgreSQL server's unix domain socket d /run/postgresql 1775 postgres postgres - - -f /var/lib/pgsql/.bash_profile 0640 postgres postgres - /usr/share/postgresql/bash_profile +C /var/lib/pgsql/.bash_profile 0640 postgres postgres - /usr/share/postgresql/bash_profile diff --git a/postgresql.changes b/postgresql.changes index d0935ea..a3e5984 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 17 10:27:02 UTC 2019 - Reinhard Max + +- Fix a mistake in the creation of /var/lib/pgsql/.bash_profile + with the tmpfiles mechanism (bsc#1159335). + ------------------------------------------------------------------- Thu Nov 14 12:36:59 UTC 2019 - Reinhard Max diff --git a/postgresql.spec b/postgresql.spec index b030f8b..b848d10 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -325,6 +325,14 @@ fi %post server %fillup_only -n postgresql %if %{with systemd} +PROFILE="/var/lib/pgsql/.bash_profile" +if test -r "$PROFILE" && test "`cat $PROFILE`" = "/usr/share/postgresql/bash_profile" +then + # Correct a mistake in /usr/lib/tmpfiles.d/postgresql.conf + # that created /var/lib/pgsql/.bash_profile with invalid + # content (bsc#1159335). + rm "$PROFILE" +fi %tmpfiles_create %_tmpfilesdir/postgresql.conf %service_add_post postgresql.service %endif