PostgreSQL 19: Adjust patches for v19 and also for the latest commits around GUC...

diff --git a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-conf.patch b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-conf.patch
index 3641a6f70164764ef8e1ed17af911eec49bd8d69..ff16cff6fbbf3538800f4df00451a8597eaa9130 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-conf.patch
+++ b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-conf.patch
@@ -1,6 +1,6 @@
---- src/backend/utils/misc/postgresql.conf.sample.old  2025-03-17 10:21:27.833589978 +0300
-+++ src/backend/utils/misc/postgresql.conf.sample      2025-03-17 10:22:53.648146234 +0300
-@@ -468,31 +468,31 @@
+--- src/backend/utils/misc/postgresql.conf.sample.old  2025-09-06 20:46:26.414734299 +0300
++++ src/backend/utils/misc/postgresql.conf.sample      2025-09-06 20:47:45.243773899 +0300
+@@ -481,31 +481,31 @@
  
  # - Where to Log -
  
@@ -23,7 +23,7 @@
 +log_directory = 'log'                 # 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-%a.log'    # log file name pattern,
++log_filename = 'postgresql-%a.log'            # log file name pattern,
                                                        # can include strftime() escapes
  #log_file_mode = 0600                 # creation mode for log files,
                                        # begin with 0 to use octal notation
@@ -39,7 +39,7 @@
                                        # same name as the new log file will be
                                        # truncated rather than appended to.
                                        # But such truncation only occurs on
-@@ -585,7 +585,7 @@
+@@ -598,7 +598,7 @@
  #log_duration = off # log statement duration
  #log_error_verbosity = default                # terse, default, or verbose messages
  #log_hostname = off

diff --git a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-rpm-pgsql.patch b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-rpm-pgsql.patch
index d6f896c6344abc43907fcf5422c50ccc1b8cdce3..24195df685e8e21532afbebbb18811ae80e1fe37 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-rpm-pgsql.patch
+++ b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-rpm-pgsql.patch
@@ -1,5 +1,5 @@
---- src/Makefile.global.in.old 2025-01-13 01:25:22.654145258 -0600
-+++ src/Makefile.global.in     2025-01-13 01:25:34.049330728 -0600
+--- src/Makefile.global.in.old 2025-09-06 20:44:38.123832668 +0300
++++ src/Makefile.global.in     2025-09-06 20:45:49.284366404 +0300
 @@ -82,7 +82,7 @@
  # Installation directories
  #
@@ -9,7 +9,7 @@
  # contain "pgsql" or "postgres", in order to avoid directory clutter.
  #
  # In a PGXS build, we cannot use the values inserted into Makefile.global
-@@ -103,14 +103,14 @@
+@@ -113,14 +113,14 @@
  datadir := @datadir@
  ifeq "$(findstring pgsql, $(datadir))" ""
  ifeq "$(findstring postgres, $(datadir))" ""
@@ -26,7 +26,7 @@
  endif
  endif
  
-@@ -119,7 +119,7 @@
+@@ -129,7 +129,7 @@
  pkglibdir = $(libdir)
  ifeq "$(findstring pgsql, $(pkglibdir))" ""
  ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -35,7 +35,7 @@
  endif
  endif
  
-@@ -128,7 +128,7 @@
+@@ -138,7 +138,7 @@
  pkgincludedir = $(includedir)
  ifeq "$(findstring pgsql, $(pkgincludedir))" ""
  ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -44,7 +44,7 @@
  endif
  endif
  
-@@ -137,7 +137,7 @@
+@@ -147,7 +147,7 @@
  docdir := @docdir@
  ifeq "$(findstring pgsql, $(docdir))" ""
  ifeq "$(findstring postgres, $(docdir))" ""

diff --git a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-var-run-socket.patch b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-var-run-socket.patch
index b7acf070e828b5629f429f131b3264e593b095ec..2d462a4aa491cdab6619e28082874fab300b1860 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-var-run-socket.patch
+++ b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19-var-run-socket.patch
@@ -1,22 +1,11 @@
---- src/backend/utils/misc/guc_tables.c.old    2025-01-13 01:27:40.440387857 -0600
-+++ src/backend/utils/misc/guc_tables.c        2025-01-13 01:28:11.679896303 -0600
-@@ -4508,7 +4508,7 @@
-                       GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY
-               },
-               &Unix_socket_directories,
--              DEFAULT_PGSOCKET_DIR,
-+              DEFAULT_PGSOCKET_DIR ", /tmp",
-               NULL, NULL, NULL
-       },
- 
---- src/include/pg_config_manual.h.old 2025-01-13 01:27:54.953624073 -0600
-+++ src/include/pg_config_manual.h     2025-01-13 01:28:11.679896303 -0600
-@@ -190,7 +190,7 @@
-  * support them yet.
-  */
+--- src/include/pg_config_manual.h.old 2025-09-06 20:41:28.744507084 +0300
++++ src/include/pg_config_manual.h     2025-09-06 20:42:51.360504025 +0300
+@@ -187,7 +187,7 @@
  #ifndef WIN32
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #define DEFAULT_PGSOCKET_DIR  "/tmp"
  #else
- #define DEFAULT_PGSOCKET_DIR ""
+-#define DEFAULT_PGSOCKET_DIR ""
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
  #endif
+ 
+ /*