PostgreSQL 17, 16, 15, 14 and 13: Make sure that user is created before we perform...

diff --git a/rpm/redhat/main/non-common/postgresql-13/main/postgresql-13.spec b/rpm/redhat/main/non-common/postgresql-13/main/postgresql-13.spec
index b137834f5dfd7cd17eb7079185ed4cefe7213a79..de5733e6defe85e834bec1380fdd049e740f3712 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-13/main/postgresql-13.spec
+++ b/rpm/redhat/main/non-common/postgresql-13/main/postgresql-13.spec
@@ -915,9 +915,13 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if ! %sysuserd
-# This is replaced by sysusers.d in recent OSes:
 %pre server
+%if %sysuserd
+# We need this user to be created ASAP so that we can set up
+# ownership of some directories:
+%sysusers_create_package %{name} %SOURCE20
+%else
+# This is replaced by sysusers.d in recent OSes:
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
        -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :

diff --git a/rpm/redhat/main/non-common/postgresql-14/main/postgresql-14.spec b/rpm/redhat/main/non-common/postgresql-14/main/postgresql-14.spec
index 9638833b7f7daa81bb806c3b3c6db9f6223e58ee..a8e726e38484637bdaf395bf55cb768672ab6fee 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-14/main/postgresql-14.spec
+++ b/rpm/redhat/main/non-common/postgresql-14/main/postgresql-14.spec
@@ -944,9 +944,13 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if ! %sysuserd
-# This is replaced by sysusers.d in recent OSes:
 %pre server
+%if %sysuserd
+# We need this user to be created ASAP so that we can set up
+# ownership of some directories:
+%sysusers_create_package %{name} %SOURCE20
+%else
+# This is replaced by sysusers.d in recent OSes:
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
        -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :

diff --git a/rpm/redhat/main/non-common/postgresql-15/main/postgresql-15.spec b/rpm/redhat/main/non-common/postgresql-15/main/postgresql-15.spec
index 710dc910223737c9172e266d9aec55a95df9faf6..349a2da9ffcfaa16feea690132f1f6513b019b33 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-15/main/postgresql-15.spec
+++ b/rpm/redhat/main/non-common/postgresql-15/main/postgresql-15.spec
@@ -949,9 +949,13 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if ! %sysuserd
-# This is replaced by sysusers.d in recent OSes:
 %pre server
+%if %sysuserd
+# We need this user to be created ASAP so that we can set up
+# ownership of some directories:
+%sysusers_create_package %{name} %SOURCE20
+%else
+# This is replaced by sysusers.d in recent OSes:
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
        -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :

diff --git a/rpm/redhat/main/non-common/postgresql-16/main/postgresql-16.spec b/rpm/redhat/main/non-common/postgresql-16/main/postgresql-16.spec
index 231df8640866b5db803a3684afe5486fd2128ca7..f002049909a24c58a02b6f23c133136b4e445502 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-16/main/postgresql-16.spec
+++ b/rpm/redhat/main/non-common/postgresql-16/main/postgresql-16.spec
@@ -806,9 +806,13 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if ! %sysuserd
-# This is replaced by sysusers.d in recent OSes:
 %pre server
+%if %sysuserd
+# We need this user to be created ASAP so that we can set up
+# ownership of some directories:
+%sysusers_create_package %{name} %SOURCE20
+%else
+# This is replaced by sysusers.d in recent OSes:
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
        -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :

diff --git a/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec b/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
index d98c202ead1aac0c63c947a1271e86b78df24067..c37c8ef3d702b601fb12985d0e0746f608155268 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
+++ b/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
@@ -779,9 +779,13 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if ! %sysuserd
-# This is replaced by sysusers.d in recent OSes:
 %pre server
+%if %sysuserd
+# We need this user to be created ASAP so that we can set up
+# ownership of some directories:
+%sysusers_create_package %{name} %SOURCE20
+%else
+# This is replaced by sysusers.d in recent OSes:
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
 useradd -M -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
        -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :