]> TLD Linux GIT Repositories - packages/postgresql.git/commitdiff
- updated to 15.2
authorMarcin Krol <hawk@tld-linux.org>
Wed, 8 Mar 2023 00:05:05 +0000 (01:05 +0100)
committerMarcin Krol <hawk@tld-linux.org>
Wed, 8 Mar 2023 00:05:05 +0000 (01:05 +0100)
postgresql-absolute_dbpaths.patch
postgresql-autoconf.patch
postgresql-conf.patch
postgresql-heimdal.patch
postgresql-link.patch
postgresql-python3.patch [deleted file]
postgresql-tests.patch
postgresql.spec
socket-dir-fixes.patch

index 9e06dbaab2aacd1a0096158a68be88ec7d18bf95..14379627cc398bc2d3495fe1f56fe44c55120b3d 100644 (file)
@@ -1,11 +1,11 @@
---- postgresql-7.3.1/configure.ac-orig Thu Jan 16 19:53:28 2003
-+++ postgresql-7.3.1/configure.ac      Thu Jan 16 19:54:20 2003
-@@ -539,7 +539,7 @@
+--- postgresql-15.2/configure.ac       2023-03-07 23:33:54.935049910 +0100
++++ postgresql-15.2/configure.ac       2023-03-07 23:34:17.590329155 +0100
+@@ -1106,7 +1106,7 @@
+ # Assignments
+ #
  
 -CPPFLAGS="$CPPFLAGS $INCLUDES"
 +CPPFLAGS="$CPPFLAGS -DALLOW_ABSOLUTE_DBPATHS $INCLUDES"
  LDFLAGS="$LDFLAGS $LIBDIRS"
  
- AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
+ AC_ARG_VAR(LDFLAGS_EX, [extra linker flags for linking executables only])
index 844ac4660a69c7530dff783f76b9bfb82024aef0..72d522096e7c2d8c676ad3266a51e7175b687a83 100644 (file)
@@ -1,13 +1,13 @@
---- postgresql-14.2/configure.ac       2022-04-04 11:12:41.193989512 +0200
-+++ postgresql-14.2/configure.ac       2022-04-04 11:14:21.316215579 +0200
+--- postgresql-15.2/configure.ac       2023-03-07 23:41:18.334515306 +0100
++++ postgresql-15.2/configure.ac       2023-03-07 23:42:03.131067994 +0100
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [14.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [15.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
 -recommended.  You can remove the check from 'configure.ac' but it is then
 -your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2022, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
index ebedf2df4e5ef623d160aa7d354a0f40e761be19..c147f22f76c2f34e951daff35b7581747ab80576 100644 (file)
@@ -1,20 +1,21 @@
---- postgresql-14.0/src/backend/utils/misc/postgresql.conf.sample      2021-11-01 12:40:10.778965880 +0100
-+++ postgresql-14.0/src/backend/utils/misc/postgresql.conf.sample      2021-11-01 14:01:02.459020587 +0100
-@@ -430,27 +430,27 @@
+--- postgresql-15.2/src/backend/utils/misc/postgresql.conf.sample      2023-03-07 23:29:21.289677003 +0100
++++ postgresql-15.2/src/backend/utils/misc/postgresql.conf.sample      2023-03-07 23:32:49.321241168 +0100
+@@ -441,28 +441,28 @@
  
  # - Where to Log -
  
 -#log_destination = 'stderr'           # Valid values are combinations of
 +log_destination = 'stderr'            # Valid values are combinations of
-                                       # stderr, csvlog, syslog, and eventlog,
-                                       # depending on platform.  csvlog
-                                       # requires logging_collector to be on.
+                                       # stderr, csvlog, jsonlog, syslog, and
+                                       # eventlog, depending on platform.
+                                       # csvlog and jsonlog require
+                                       # logging_collector to be on.
  
  # This is used when logging to stderr:
--#logging_collector = off              # Enable capturing of stderr and csvlog
-+logging_collector = on                        # Enable capturing of stderr and csvlog
-                                       # into log files. Required to be on for
-                                       # csvlogs.
+-#logging_collector = off              # Enable capturing of stderr, jsonlog,
++logging_collector = on                        # Enable capturing of stderr, jsonlog,
+                                       # and csvlog into log files. Required
+                                       # to be on for csvlogs and jsonlogs.
                                        # (change requires restart)
  
  # These are only used if logging_collector is on:
@@ -22,7 +23,7 @@
 +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-14.log'    # log file name pattern,
++log_filename = 'postgresql-15.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,
@@ -35,7 +36,7 @@
                                        # happen after that much log output.
                                        # 0 disables.
  #log_truncate_on_rotation = off               # If on, an existing log file with the
-@@ -463,9 +463,9 @@
+@@ -475,9 +475,9 @@
                                        # in all cases.
  
  # These are relevant when logging to syslog:
 -#syslog_ident = 'postgres'
 -#syslog_sequence_numbers = on
 +syslog_facility = 'LOCAL0'
-+syslog_ident = 'postgresql-14'
++syslog_ident = 'postgresql-15'
 +syslog_sequence_numbers = on
  #syslog_split_messages = on
  
  # This is only relevant when logging to eventlog (Windows):
-@@ -534,12 +534,12 @@
+@@ -551,12 +551,12 @@
                                        # actions running at least this number
                                        # of milliseconds.
- #log_checkpoints = off
+ #log_checkpoints = on
 -#log_connections = off
 -#log_disconnections = off
 +log_connections = on
@@ -60,7 +61,7 @@
  #log_error_verbosity = default                # terse, default, or verbose messages
  #log_hostname = off
 -#log_line_prefix = '%m [%p] '         # special values:
-+log_line_prefix = '%m [%p] %q%h/%a %u/%d '    # special values:
++#log_line_prefix = '%m [%p] %q%h/%a %u/%d '   # special values:
                                        #   %a = application name
                                        #   %u = user name
                                        #   %d = database name
index c88045c49fa0f83f34b0471dab73750748ff8aac..044c8be2d251d493d68ec75370c47b570fe199b7 100644 (file)
@@ -1,7 +1,6 @@
-diff -ur postgresql-14.0.orig/configure.ac postgresql-14.0/configure.ac
---- postgresql-14.0.orig/configure.ac  2021-11-01 14:51:09.840575983 +0100
-+++ postgresql-14.0/configure.ac       2021-11-01 14:52:27.718774543 +0100
-@@ -1217,7 +1217,7 @@
+--- postgresql-15.2/configure.ac       2023-03-07 23:36:40.389089270 +0100
++++ postgresql-15.2/configure.ac       2023-03-07 23:36:49.325199415 +0100
+@@ -1307,7 +1307,7 @@
  
  if test "$with_gssapi" = yes ; then
    if test "$PORTNAME" != "win32"; then
index cf79e14a979f67c9d38426f20c590f677639e9c6..4c6cefbed4eaa76760198591d7c4c71483488436 100644 (file)
@@ -1,7 +1,6 @@
-diff -ur postgresql-14.0.orig/configure.ac postgresql-14.0/configure.ac
---- postgresql-14.0.orig/configure.ac  2021-11-01 14:52:54.420842615 +0100
-+++ postgresql-14.0/configure.ac       2021-11-01 14:53:49.104982037 +0100
-@@ -1494,6 +1494,7 @@
+--- postgresql-15.2/configure.ac       2023-03-07 23:37:05.721401513 +0100
++++ postgresql-15.2/configure.ac       2023-03-07 23:37:22.414607273 +0100
+@@ -1603,6 +1603,7 @@
  
  if test "$with_bonjour" = yes ; then
    AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
@@ -9,7 +8,7 @@ diff -ur postgresql-14.0.orig/configure.ac postgresql-14.0/configure.ac
  dnl At some point we might add something like
  dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
  dnl but right now, what that would mainly accomplish is to encourage
-@@ -1501,6 +1502,7 @@
+@@ -1610,6 +1611,7 @@
  dnl If you want to use Apple's own Bonjour code on another platform,
  dnl just add -ldns_sd to LIBS manually.
  fi
@@ -17,10 +16,9 @@ diff -ur postgresql-14.0.orig/configure.ac postgresql-14.0/configure.ac
  
  # for contrib/uuid-ossp
  if test "$with_uuid" = bsd ; then
-diff -ur postgresql-14.0.orig/src/backend/Makefile postgresql-14.0/src/backend/Makefile
---- postgresql-14.0.orig/src/backend/Makefile  2021-11-01 14:52:54.349842434 +0100
-+++ postgresql-14.0/src/backend/Makefile       2021-11-01 14:53:49.105982039 +0100
-@@ -63,7 +63,7 @@
+--- postgresql-15.2/src/backend/Makefile       2023-03-07 23:37:05.607400108 +0100
++++ postgresql-15.2/src/backend/Makefile       2023-03-07 23:37:22.415607285 +0100
+@@ -64,7 +64,7 @@
  ifneq ($(PORTNAME), aix)
  
  postgres: $(OBJS)
@@ -29,9 +27,8 @@ diff -ur postgresql-14.0.orig/src/backend/Makefile postgresql-14.0/src/backend/M
  
  endif
  endif
-diff -ur postgresql-14.0.orig/src/Makefile.global.in postgresql-14.0/src/Makefile.global.in
---- postgresql-14.0.orig/src/Makefile.global.in        2021-11-01 14:52:54.297842301 +0100
-+++ postgresql-14.0/src/Makefile.global.in     2021-11-01 14:53:49.105982039 +0100
+--- postgresql-15.2/src/Makefile.global.in     2023-03-07 23:37:05.481398555 +0100
++++ postgresql-15.2/src/Makefile.global.in     2023-03-07 23:37:22.415607285 +0100
 @@ -172,6 +172,7 @@
  pgxsdir = $(pkglibdir)/pgxs
  bitcodedir = $(pkglibdir)/bitcode
diff --git a/postgresql-python3.patch b/postgresql-python3.patch
deleted file mode 100644 (file)
index 1bb24e4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- postgresql-14.3/config/python.m4   2022-05-09 23:14:45.000000000 +0200
-+++ postgresql-14.3/config/python.m4   2022-05-28 17:13:50.058076647 +0200
-@@ -16,7 +16,7 @@
- # "python2" and "python3", in which case it's reasonable to prefer the
- # newer version.
- AC_DEFUN([PGAC_PATH_PYTHON],
--[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
-+[PGAC_PATH_PROGS(PYTHON, [python3 python2 python])
- AC_ARG_VAR(PYTHON, [Python program])dnl
- if test x"$PYTHON" = x""; then
-   AC_MSG_ERROR([Python not found])
index 95942ecddef476071fa71812f4171423707277e5..e7d0845d07497771d3cd10b72bc2c2738628da76 100644 (file)
@@ -1,7 +1,6 @@
-diff -ur postgresql-14.0.orig/src/test/regress/pg_regress.c postgresql-14.0/src/test/regress/pg_regress.c
---- postgresql-14.0.orig/src/test/regress/pg_regress.c 2021-11-01 14:50:12.561429947 +0100
-+++ postgresql-14.0/src/test/regress/pg_regress.c      2021-11-01 14:50:27.681468493 +0100
-@@ -2482,6 +2482,7 @@
+--- postgresql-15.2/src/test/regress/pg_regress.c      2023-03-07 23:35:49.928467300 +0100
++++ postgresql-15.2/src/test/regress/pg_regress.c      2023-03-07 23:36:01.693612316 +0100
+@@ -2386,6 +2386,7 @@
                header(_("starting postmaster"));
                snprintf(buf, sizeof(buf),
                                 "\"%s%spostgres\" -D \"%s/data\" -F%s "
index 0f8fa810b08e6349585ba5023ce5441cc453c47f..53e90b0751d1f5f5c73d000e49d4d62a731031d8 100644 (file)
@@ -14,8 +14,8 @@
 #
 
 %define beta %{nil}
-%define pgsqlversion 14
-%define pgsqlpriority 140
+%define pgsqlversion 15
+%define pgsqlpriority 150
 
 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}.7
+Version:       %{pgsqlversion}.2
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5: 2f02e1f0c6c302c52f1e74973a8a38ff
+# Source0-md5: 968418dbdd700caaccfeabcee7516496
 Source1:       postgresql.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -48,7 +48,6 @@ Patch5:               postgresql-heimdal.patch
 Patch6:                postgresql-link.patch
 Patch7:                socket-dir-fixes.patch
 Patch8:                postgresql-autoconf.patch
-Patch9:                postgresql-python3.patch
 URL:           http://www.postgresql.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
@@ -111,7 +110,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # omitted contribs:
 # spi, test_decoding, worker_spi - examples/tests
 # tsearch2 - old module for compatibility only
-%define        contrib_modules adminpack amcheck auth_delay auto_explain bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name old_snapshot pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
+%define        contrib_modules adminpack amcheck auth_delay auto_explain basebackup_to_shell basic_archive bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name old_snapshot pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pg_walinspect pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
 
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
@@ -602,7 +601,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
@@ -1004,6 +1002,7 @@ fi
 %{_includedir}/postgres_ext.h
 %dir %{_includedir}/postgresql/internal
 %{_includedir}/postgresql/internal/c.h
+%{_includedir}/postgresql/internal/fe-auth-sasl.h
 %{_includedir}/postgresql/internal/libpq-int.h
 %{_includedir}/postgresql/internal/port.h
 %{_includedir}/postgresql/internal/postgres_fe.h
@@ -1143,6 +1142,8 @@ fi
 %attr(755,root,root) %{moduledir}/auth_delay.so
 %attr(755,root,root) %{moduledir}/auto_explain.so
 %attr(755,root,root) %{moduledir}/autoinc.so
+%attr(755,root,root) %{moduledir}/basebackup_to_shell.so
+%attr(755,root,root) %{moduledir}/basic_archive.so
 %attr(755,root,root) %{moduledir}/bloom.so
 %attr(755,root,root) %{moduledir}/btree_gin.so
 %attr(755,root,root) %{moduledir}/btree_gist.so
@@ -1165,6 +1166,7 @@ fi
 %attr(755,root,root) %{moduledir}/pg_stat_statements.so
 %attr(755,root,root) %{moduledir}/pg_surgery.so
 %attr(755,root,root) %{moduledir}/pg_visibility.so
+%attr(755,root,root) %{moduledir}/pg_walinspect.so
 %attr(755,root,root) %{moduledir}/pgrowlocks.so
 %attr(755,root,root) %{moduledir}/pgstattuple.so
 %attr(755,root,root) %{moduledir}/postgres_fdw.so
@@ -1232,6 +1234,8 @@ fi
 %{extensiondir}/pg_surgery.control
 %{extensiondir}/pg_visibility--*.sql
 %{extensiondir}/pg_visibility.control
+%{extensiondir}/pg_walinspect--*.sql
+%{extensiondir}/pg_walinspect.control
 %{extensiondir}/pgrowlocks--*.sql
 %{extensiondir}/pgrowlocks.control
 %{extensiondir}/pgstattuple--*.sql
@@ -1275,22 +1279,10 @@ fi
 %attr(755,root,root) %{moduledir}/hstore_plpython3.so
 %attr(755,root,root) %{moduledir}/jsonb_plpython3.so
 %attr(755,root,root) %{moduledir}/ltree_plpython3.so
-%{extensiondir}/hstore_plpythonu--*.sql
-%{extensiondir}/hstore_plpythonu.control
-%{extensiondir}/hstore_plpython2u--*.sql
-%{extensiondir}/hstore_plpython2u.control
 %{extensiondir}/hstore_plpython3u--*.sql
 %{extensiondir}/hstore_plpython3u.control
-%{extensiondir}/jsonb_plpythonu--*.sql
-%{extensiondir}/jsonb_plpythonu.control
-%{extensiondir}/jsonb_plpython2u--*.sql
-%{extensiondir}/jsonb_plpython2u.control
 %{extensiondir}/jsonb_plpython3u--*.sql
 %{extensiondir}/jsonb_plpython3u.control
-%{extensiondir}/ltree_plpythonu--*.sql
-%{extensiondir}/ltree_plpythonu.control
-%{extensiondir}/ltree_plpython2u--*.sql
-%{extensiondir}/ltree_plpython2u.control
 %{extensiondir}/ltree_plpython3u--*.sql
 %{extensiondir}/ltree_plpython3u.control
 %endif
index 380ac7310893646efe9718c0d7673ca56876c726..5b63aba4f760f4f97f046c84c04b4bdd0ba6c35a 100644 (file)
@@ -1,26 +1,24 @@
-diff -ur postgresql-14.0.orig/src/bin/pg_upgrade/option.c postgresql-14.0/src/bin/pg_upgrade/option.c
---- postgresql-14.0.orig/src/bin/pg_upgrade/option.c   2021-11-01 14:54:18.782057697 +0100
-+++ postgresql-14.0/src/bin/pg_upgrade/option.c        2021-11-01 14:54:35.649100699 +0100
-@@ -476,8 +476,14 @@
-        */
-       if (GET_MAJOR_VERSION(cluster->major_version) >= 901)
-       {
--              if (!live_check)
-+              if (!live_check) {
-                       cluster->sockdir = user_opts.socketdir;
+--- postgresql-15.2/src/bin/pg_upgrade/option.c        2023-03-07 23:37:50.271950638 +0100
++++ postgresql-15.2/src/bin/pg_upgrade/option.c        2023-03-07 23:40:28.343899006 +0100
+@@ -445,8 +445,14 @@
+ get_sock_dir(ClusterInfo *cluster, bool live_check)
+ {
+ #if defined(HAVE_UNIX_SOCKETS) && !defined(WIN32)
+-      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 -ur postgresql-14.0.orig/src/include/pg_config_manual.h postgresql-14.0/src/include/pg_config_manual.h
---- postgresql-14.0.orig/src/include/pg_config_manual.h        2021-11-01 14:54:18.575057170 +0100
-+++ postgresql-14.0/src/include/pg_config_manual.h     2021-11-01 14:54:35.767101001 +0100
-@@ -207,7 +207,7 @@
++              if (strlen(cluster->sockdir) >= UNIX_PATH_MAX - sizeof(".s.PGSQL.50432"))
++                      strcpy(cluster->sockdir, "/tmp"); /* fall back to tmp */
++      }
+       else
+       {
+               /*
+--- postgresql-15.2/src/include/pg_config_manual.h     2023-03-07 23:37:50.153949183 +0100
++++ postgresql-15.2/src/include/pg_config_manual.h     2023-03-07 23:38:28.898426739 +0100
+@@ -224,7 +224,7 @@
   * support them yet.
   */
  #ifndef WIN32