From 1e0b71e627e8f106f0737b26f5c16806709a7dbc Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 3 Dec 2020 22:09:14 +0100 Subject: [PATCH] - updated to 13.1 --- postgresql-conf.patch | 14 +++++++------- postgresql.spec | 17 ++++++++--------- socket-dir-fixes.patch | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/postgresql-conf.patch b/postgresql-conf.patch index 9a57ea3..396bebe 100644 --- a/postgresql-conf.patch +++ b/postgresql-conf.patch @@ -1,6 +1,6 @@ ---- postgresql-12.0/src/backend/utils/misc/postgresql.conf.sample 2019-09-30 22:06:55.000000000 +0200 -+++ postgresql-12.0/src/backend/utils/misc/postgresql.conf.sample 2019-10-07 21:05:24.551000000 +0200 -@@ -416,23 +416,23 @@ +--- postgresql-13.1/src/backend/utils/misc/postgresql.conf.sample 2020-11-09 23:24:30.000000000 +0100 ++++ postgresql-13.1/src/backend/utils/misc/postgresql.conf.sample 2020-12-03 20:55:41.832778786 +0100 +@@ -422,23 +422,23 @@ # - Where to Log - @@ -22,14 +22,14 @@ +log_directory = '/var/log/postgresql' # directory where log files are written, # can be absolute or relative to PGDATA -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, -+log_filename = 'postgresql-12.log' # log file name pattern, ++log_filename = 'postgresql-13.log' # log file name pattern, # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, +log_file_mode = 0640 # creation mode for log files, # begin with 0 to use octal notation #log_truncate_on_rotation = off # If on, an existing log file with the # same name as the new log file will be -@@ -442,16 +442,16 @@ +@@ -448,16 +448,16 @@ # or size-driven rotation. Default is # off, meaning append to existing files # in all cases. @@ -46,12 +46,12 @@ -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on +syslog_facility = 'LOCAL0' -+syslog_ident = 'postgresql-12' ++syslog_ident = 'postgresql-13' +syslog_sequence_numbers = on #syslog_split_messages = on # This is only relevant when logging to eventlog (win32): -@@ -504,12 +504,12 @@ +@@ -521,12 +521,12 @@ #debug_print_plan = off #debug_pretty_print = on #log_checkpoints = off diff --git a/postgresql.spec b/postgresql.spec index b102985..b0d20b2 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -14,8 +14,8 @@ # %define beta %{nil} -%define pgsqlversion 12 -%define pgsqlpriority 120 +%define pgsqlversion 13 +%define pgsqlpriority 130 Summary: PostgreSQL Data Base Management System Summary(de.UTF-8): PostgreSQL Datenbankverwaltungssystem @@ -28,12 +28,12 @@ Summary(tr.UTF-8): Veri Tabanı Yönetim Sistemi Summary(uk.UTF-8): PostgreSQL - система керування базами даних Summary(zh_CN.UTF-8): PostgreSQL 客户端程序和库文件 Name: postgresql-%{pgsqlversion} -Version: %{pgsqlversion}.5 +Version: %{pgsqlversion}.1 Release: 1 License: BSD Group: Applications/Databases Source0: http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -# Source0-md5: f19e48090bbd59ea81826b5fd99e7e97 +# Source0-md5: d843a4fcc0ed1493511028aa6c17117a Source1: postgresql.init Source2: pgsql-Database-HOWTO-html.tar.gz # Source2-md5: 5b656ddf1db41965761f85204a14398e @@ -697,7 +697,7 @@ tar zxf %{SOURCE2} -C howto # find locales for f in libpq5 pgscripts postgres psql initdb ecpg ecpglib6 \ plpgsql %{?with_perl:plperl} %{?with_python:plpython} \ - pg_archivecleanup pg_basebackup pg_checksums pg_config pg_controldata pg_ctl pg_dump pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_waldump; do + pg_archivecleanup pg_basebackup pg_checksums pg_config pg_controldata pg_ctl pg_dump pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump; do %find_lang $f-%{pgsqlversion} done # merge locales @@ -705,7 +705,7 @@ merge_lang() { cat $(for f in $@; do echo ${f}-%{pgsqlversion}.lang ; done) } merge_lang pgscripts postgres plpgsql \ - pg_basebackup pg_checksums pg_controldata pg_resetwal pg_rewind pg_upgrade pg_test_fsync pg_test_timing pg_waldump > main.lang + pg_basebackup pg_checksums pg_config pg_controldata pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump > main.lang merge_lang psql initdb \ pg_archivecleanup pg_ctl pg_dump > clients.lang @@ -873,12 +873,12 @@ fi %attr(755,root,root) %{pgsqllibdir}/bin/pg_test_fsync %attr(755,root,root) %{pgsqllibdir}/bin/pg_test_timing %attr(755,root,root) %{pgsqllibdir}/bin/pg_upgrade +%attr(755,root,root) %{pgsqllibdir}/bin/pg_verifybackup %attr(755,root,root) %{pgsqllibdir}/bin/pg_waldump %attr(755,root,root) %{pgsqllibdir}/bin/pgbench %attr(755,root,root) %{pgsqllibdir}/bin/postgres %attr(755,root,root) %{pgsqllibdir}/bin/postmaster -%attr(755,root,root) %{moduledir}/ascii_and_mic.so %attr(755,root,root) %{moduledir}/cyrillic_and_mic.so %attr(755,root,root) %{moduledir}/dict_int.so %attr(755,root,root) %{moduledir}/dict_snowball.so @@ -897,8 +897,6 @@ fi %{pgsqldatadir}/*.bki %{pgsqldatadir}/*.sample -%{pgsqldatadir}/*.description -%{pgsqldatadir}/*.shdescription %{pgsqldatadir}/*.sql %{pgsqldatadir}/*.txt %{pgsqldatadir}/timezonesets @@ -915,6 +913,7 @@ fi %{pgsqldatadir}/man/man1/pg_receivewal.1* %{pgsqldatadir}/man/man1/pg_recvlogical.1* %{pgsqldatadir}/man/man1/pg_rewind.1* +%{pgsqldatadir}/man/man1/pg_verifybackup.1* %{pgsqldatadir}/man/man1/pg_waldump.1* %{pgsqldatadir}/man/man1/pg_test_fsync.1* %{pgsqldatadir}/man/man1/pg_test_timing.1* diff --git a/socket-dir-fixes.patch b/socket-dir-fixes.patch index 41a8577..3690d56 100644 --- a/socket-dir-fixes.patch +++ b/socket-dir-fixes.patch @@ -1,7 +1,7 @@ -diff -urpa postgresql-10.5.orig/src/bin/pg_upgrade/option.c postgresql-10.5/src/bin/pg_upgrade/option.c ---- postgresql-10.5.orig/src/bin/pg_upgrade/option.c 2018-08-22 19:57:55.237373015 +0000 -+++ postgresql-10.5/src/bin/pg_upgrade/option.c 2018-08-22 19:59:10.944372163 +0000 -@@ -474,8 +474,14 @@ +diff -urpa postgresql-13.1.orig/src/bin/pg_upgrade/option.c postgresql-13.1/src/bin/pg_upgrade/option.c +--- postgresql-13.1.orig/src/bin/pg_upgrade/option.c 2020-11-09 23:24:30.000000000 +0100 ++++ postgresql-13.1/src/bin/pg_upgrade/option.c 2020-12-03 20:58:30.431778786 +0100 +@@ -476,8 +476,14 @@ get_sock_dir(ClusterInfo *cluster, bool */ if (GET_MAJOR_VERSION(cluster->major_version) >= 901) { @@ -17,15 +17,15 @@ diff -urpa postgresql-10.5.orig/src/bin/pg_upgrade/option.c postgresql-10.5/src/ else { /* -diff -urpa postgresql-10.5.orig/src/include/pg_config_manual.h postgresql-10.5/src/include/pg_config_manual.h ---- postgresql-10.5.orig/src/include/pg_config_manual.h 2018-08-22 19:57:55.095373017 +0000 -+++ postgresql-10.5/src/include/pg_config_manual.h 2018-08-22 19:58:30.664372616 +0000 -@@ -181,7 +181,7 @@ - * here's where to twiddle it. You can also override this at runtime - * with the postmaster's -k switch. +diff -urpa postgresql-13.1.orig/src/include/pg_config_manual.h postgresql-13.1/src/include/pg_config_manual.h +--- postgresql-13.1.orig/src/include/pg_config_manual.h 2020-11-09 23:24:30.000000000 +0100 ++++ postgresql-13.1/src/include/pg_config_manual.h 2020-12-03 20:59:32.262778786 +0100 +@@ -201,7 +201,7 @@ + * support them yet. */ + #ifndef WIN32 -#define DEFAULT_PGSOCKET_DIR "/tmp" +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" - - /* - * This is the default event source for Windows event log. + #else + #define DEFAULT_PGSOCKET_DIR "" + #endif -- 2.44.0