summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miśkiewicz2021-11-24 07:43:12 (GMT)
committerArkadiusz Miśkiewicz2021-11-24 07:43:12 (GMT)
commitd5785572cce10b7ebae5811cb9749404f97206aa (patch)
tree2b093a779bae4b605b50eb103679d79501c3cbf0
parent7abe6ff7b1363ec773020b04146a86a779339e2d (diff)
downloadpostgresql-d5785572cce10b7ebae5811cb9749404f97206aa.zip
postgresql-d5785572cce10b7ebae5811cb9749404f97206aa.tar.gz
Rediff patch + triggerpostun -> postun for rpm 4.16.
-rw-r--r--postgresql-conf.patch18
-rw-r--r--postgresql.spec4
2 files changed, 7 insertions, 15 deletions
diff --git a/postgresql-conf.patch b/postgresql-conf.patch
index 7ff48eb..912ff84 100644
--- a/postgresql-conf.patch
+++ b/postgresql-conf.patch
@@ -1,6 +1,7 @@
---- postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample.orig 2007-12-07 16:44:56.000000000 +0000
-+++ postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample 2008-01-07 22:19:56.904649611 +0000
-@@ -253,7 +253,7 @@
+diff -urNp -x '*.orig' postgresql-9.6.19.org/src/backend/utils/misc/postgresql.conf.sample postgresql-9.6.19/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.6.19.org/src/backend/utils/misc/postgresql.conf.sample 2020-08-10 23:21:12.000000000 +0200
++++ postgresql-9.6.19/src/backend/utils/misc/postgresql.conf.sample 2021-11-24 08:41:24.212264575 +0100
+@@ -329,7 +329,7 @@
# - Where to Log -
@@ -9,7 +10,7 @@
# stderr, csvlog, syslog, and eventlog,
# depending on platform. csvlog
# requires logging_collector to be on.
-@@ -262,8 +262,8 @@
+@@ -362,9 +362,9 @@
# 0 disables.
# These are relevant when logging to syslog:
@@ -22,12 +23,3 @@
#syslog_split_messages = on
# This is only relevant when logging to eventlog (win32):
-@@ -324,7 +324,7 @@
- #debug_print_plan = off
- #debug_pretty_print = off
- #log_checkpoints = off
--#log_connections = off
-+log_connections = on
- #log_disconnections = off
- #log_duration = off
- #log_hostname = off
diff --git a/postgresql.spec b/postgresql.spec
index 61c7e8c..fdaadf2 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -94,8 +94,8 @@ Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires(triggerpostun): /bin/id
-Requires(triggerpostun): /usr/sbin/usermod
+Requires(postun): /bin/id
+Requires(postun): /usr/sbin/usermod
Requires: %{name}-clients >= %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: rc-scripts >= 0.4.3.0