- updated to 12.0

diff --git a/postgresql-conf.patch b/postgresql-conf.patch
index b36b9f0454187b3c6bf6eb8c3545d3dac840c2a3..9a57ea359896333bba6bb39b3c7c9e4793c4650f 100644 (file)
--- a/postgresql-conf.patch
+++ b/postgresql-conf.patch
@@ -1,6 +1,6 @@
---- postgresql-11.1/src/backend/utils/misc/postgresql.conf.sample      2018-11-06 23:56:26.000000000 +0000
-+++ postgresql-11.1/src/backend/utils/misc/postgresql.conf.sample      2018-12-03 13:15:44.113403000 +0000
-@@ -361,23 +361,23 @@
+--- 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 @@
  
  # - 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-11.log'    # log file name pattern,
++log_filename = 'postgresql-12.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
-@@ -387,16 +387,16 @@
+@@ -442,16 +442,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-11'
++syslog_ident = 'postgresql-12'
 +syslog_sequence_numbers = on
  #syslog_split_messages = on
  
  # This is only relevant when logging to eventlog (win32):
-@@ -457,12 +457,12 @@
+@@ -504,12 +504,12 @@
  #debug_print_plan = off
  #debug_pretty_print = on
  #log_checkpoints = off

diff --git a/postgresql-link.patch b/postgresql-link.patch
index 032f381e2a173a484b92ed655b943247fbf2a6cd..84694890983041518a5ecb4dfe80fb49ee5b443e 100644 (file)
--- a/postgresql-link.patch
+++ b/postgresql-link.patch
@@ -18,12 +18,12 @@
  if test "$with_uuid" = bsd ; then
 --- postgresql-9.5.0/src/backend/Makefile.orig 2016-01-04 22:29:34.000000000 +0100
 +++ postgresql-9.5.0/src/backend/Makefile      2016-01-14 21:10:48.093976872 +0100
-@@ -54,7 +54,7 @@
+@@ -60,7 +60,7 @@
  ifneq ($(PORTNAME), aix)
  
  postgres: $(OBJS)
--      $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) -o $@
-+      $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) $(BONJOUR_LIBS) -o $@
+-      $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -o $@
++      $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) $(BONJOUR_LIBS) -o $@
  
  endif
  endif

diff --git a/postgresql.spec b/postgresql.spec
index 7bbed52b0feb0c33e7c24a6feb4a0d3f14f59c02..a501eeb021605e58ae5834bb219d117f27e2497e 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -14,8 +14,8 @@
 #
 
 %define beta %{nil}
-%define pgsqlversion 11
-%define pgsqlpriority 110
+%define pgsqlversion 12
+%define pgsqlpriority 120
 
 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}.0
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5: 580da94f6d85046ff2a228785ab2cc89
+# Source0-md5: 87545416ef021eee8621d31a93fcc899
 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_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_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_controldata pg_resetwal pg_rewind pg_upgrade pg_test_fsync pg_test_timing pg_waldump > main.lang
+       pg_basebackup pg_checksums pg_controldata pg_resetwal pg_rewind pg_upgrade pg_test_fsync pg_test_timing pg_waldump > main.lang
 merge_lang psql initdb \
        pg_archivecleanup pg_ctl pg_dump > clients.lang
 
@@ -857,12 +857,13 @@ fi
 
 %files -f main.lang
 %defattr(644,root,root,755)
-%doc COPYRIGHT README HISTORY doc/{bug.template,KNOWN_BUGS,MISSING_FEATURES,TODO}
+%doc COPYRIGHT README HISTORY doc/{KNOWN_BUGS,MISSING_FEATURES,TODO}
 %attr(754,root,root) /etc/rc.d/init.d/postgresql-%{pgsqlversion}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql-%{pgsqlversion}
 
 %attr(755,root,root) %{pgsqllibdir}/bin/initdb
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_basebackup
+%attr(755,root,root) %{pgsqllibdir}/bin/pg_checksums
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_controldata
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_ctl
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_resetwal
@@ -872,7 +873,6 @@ 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_verify_checksums
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_waldump
 %attr(755,root,root) %{pgsqllibdir}/bin/pgbench
 %attr(755,root,root) %{pgsqllibdir}/bin/postgres
@@ -908,6 +908,7 @@ fi
 
 %{pgsqldatadir}/man/man1/initdb.1*
 %{pgsqldatadir}/man/man1/pg_basebackup.1*
+%{pgsqldatadir}/man/man1/pg_checksums.1*
 %{pgsqldatadir}/man/man1/pg_controldata.1*
 %{pgsqldatadir}/man/man1/pg_ctl.1*
 %{pgsqldatadir}/man/man1/pg_resetwal.1*
@@ -918,7 +919,6 @@ fi
 %{pgsqldatadir}/man/man1/pg_test_fsync.1*
 %{pgsqldatadir}/man/man1/pg_test_timing.1*
 %{pgsqldatadir}/man/man1/pg_upgrade.1*
-%{pgsqldatadir}/man/man1/pg_verify_checksums.1*
 %{pgsqldatadir}/man/man1/pgbench.1*
 %{pgsqldatadir}/man/man1/postgres.1*
 %{pgsqldatadir}/man/man1/postmaster.1*
@@ -1022,6 +1022,8 @@ fi
 %{_libdir}/libpgcommon.a
 %{_libdir}/libpgfeutils.a
 %{_libdir}/libpgport.a
+%{_libdir}/libpgcommon_shlib.a
+%{_libdir}/libpgport_shlib.a
 
 %files clients -f clients.lang
 %defattr(644,root,root,755)

diff --git a/socket-dir-fixes.patch b/socket-dir-fixes.patch
index 61cd4eb6819675b765b36dd23e6ccb03f0f8f851..41a857715193d8fe940776eb518b41c7482d8022 100644 (file)
--- a/socket-dir-fixes.patch
+++ b/socket-dir-fixes.patch
@@ -1,18 +1,22 @@
 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
-@@ -460,6 +460,11 @@ get_sock_dir(ClusterInfo *cluster, bool
-                       cluster->sockdir = pg_malloc(MAXPGPATH);
-                       if (!getcwd(cluster->sockdir, MAXPGPATH))
-                               pg_fatal("could not determine current directory\n");
+@@ -474,8 +474,14 @@
+        */
+       if (GET_MAJOR_VERSION(cluster->major_version) >= 901)
+       {
+-              if (!live_check)
++              if (!live_check) {
+                       cluster->sockdir = user_opts.socketdir;
 +#ifndef UNIX_PATH_MAX
 +#define UNIX_PATH_MAX 108
 +#endif
 +                      if (strlen(cluster->sockdir) >= UNIX_PATH_MAX - sizeof(".s.PGSQL.50432"))
 +                              strcpy(cluster->sockdir, "/tmp"); /* fall back to tmp */
-               }
++              }
                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