parent
54e2ed21ee
commit
496b00a820
Binary file not shown.
|
@ -1,7 +1,7 @@
|
||||||
diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample
|
diff -ur postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample patched/src/backend/utils/misc/postgresql.conf.sample
|
||||||
--- postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample 2022-09-27 16:57:00.652909198 +0200
|
--- postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample 2022-10-10 22:57:37.000000000 +0200
|
||||||
+++ postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample 2022-09-27 17:01:56.073606108 +0200
|
+++ patched/src/backend/utils/misc/postgresql.conf.sample 2022-10-13 10:51:57.000000000 +0200
|
||||||
@@ -449,7 +449,7 @@
|
@@ -448,7 +448,7 @@
|
||||||
# logging_collector to be on.
|
# logging_collector to be on.
|
||||||
|
|
||||||
# This is used when logging to stderr:
|
# This is used when logging to stderr:
|
||||||
|
@ -10,7 +10,7 @@ diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample
|
||||||
# and csvlog into log files. Required
|
# and csvlog into log files. Required
|
||||||
# to be on for csvlogs and jsonlogs.
|
# to be on for csvlogs and jsonlogs.
|
||||||
# (change requires restart)
|
# (change requires restart)
|
||||||
@@ -457,16 +457,16 @@
|
@@ -456,16 +456,16 @@
|
||||||
# These are only used if logging_collector is on:
|
# These are only used if logging_collector is on:
|
||||||
#log_directory = 'log' # directory where log files are written,
|
#log_directory = 'log' # directory where log files are written,
|
||||||
# can be absolute or relative to PGDATA
|
# can be absolute or relative to PGDATA
|
||||||
|
@ -22,7 +22,8 @@ diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample
|
||||||
-#log_rotation_age = 1d # Automatic rotation of logfiles will
|
-#log_rotation_age = 1d # Automatic rotation of logfiles will
|
||||||
+log_rotation_age = 1d # Automatic rotation of logfiles will
|
+log_rotation_age = 1d # Automatic rotation of logfiles will
|
||||||
# happen after that time. 0 disables.
|
# happen after that time. 0 disables.
|
||||||
#log_rotation_size = 10MB # Automatic rotation of logfiles will
|
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
|
||||||
|
+log_rotation_size = 0 # Automatic rotation of logfiles will
|
||||||
# happen after that much log output.
|
# happen after that much log output.
|
||||||
# 0 disables.
|
# 0 disables.
|
||||||
-#log_truncate_on_rotation = off # If on, an existing log file with the
|
-#log_truncate_on_rotation = off # If on, an existing log file with the
|
||||||
|
|
|
@ -6,13 +6,13 @@ rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
|
||||||
that we'll have to fix only a minimal set of packages which really build
|
that we'll have to fix only a minimal set of packages which really build
|
||||||
PostgreSQL server modules.
|
PostgreSQL server modules.
|
||||||
|
|
||||||
diff -ur postgresql-14rc1/src/bin/pg_config/Makefile pgsql14/src/bin/pg_config/Makefile
|
diff -ur postgresql-16beta1/src/bin/pg_config/Makefile postgresql16_pg_config_patch/src/bin/pg_config/Makefile
|
||||||
--- postgresql-14rc1/src/bin/pg_config/Makefile 2021-09-20 23:33:01.000000000 +0200
|
--- postgresql-16beta1/src/bin/pg_config/Makefile 2023-05-22 23:08:08.000000000 +0200
|
||||||
+++ pgsql14/src/bin/pg_config/Makefile 2021-09-22 10:48:06.484093152 +0200
|
+++ postgresql16_pg_config_patch/src/bin/pg_config/Makefile 2023-06-05 13:51:30.000000000 +0200
|
||||||
@@ -11,6 +11,8 @@
|
@@ -11,6 +11,8 @@
|
||||||
PGFILEDESC = "pg_config - report configuration information"
|
PGFILEDESC = "pg_config - report configuration information"
|
||||||
PGAPPICON=win32
|
PGAPPICON=win32
|
||||||
|
|
||||||
+PG_CONFIG = pg_server_config$(X)
|
+PG_CONFIG = pg_server_config$(X)
|
||||||
+
|
+
|
||||||
subdir = src/bin/pg_config
|
subdir = src/bin/pg_config
|
||||||
|
@ -21,38 +21,37 @@ diff -ur postgresql-14rc1/src/bin/pg_config/Makefile pgsql14/src/bin/pg_config/M
|
||||||
@@ -19,22 +21,22 @@
|
@@ -19,22 +21,22 @@
|
||||||
$(WIN32RES) \
|
$(WIN32RES) \
|
||||||
pg_config.o
|
pg_config.o
|
||||||
|
|
||||||
-all: pg_config
|
-all: pg_config
|
||||||
+all: $(PG_CONFIG)
|
+all: $(PG_CONFIG)
|
||||||
|
|
||||||
-pg_config: $(OBJS) | submake-libpgport
|
-pg_config: $(OBJS) | submake-libpgport
|
||||||
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
|
||||||
+$(PG_CONFIG): $(OBJS) | submake-libpgport
|
+$(PG_CONFIG): $(OBJS) | submake-libpgport
|
||||||
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
|
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
|
||||||
|
|
||||||
install: all installdirs
|
install: all installdirs
|
||||||
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
|
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
|
||||||
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
||||||
|
|
||||||
installdirs:
|
installdirs:
|
||||||
$(MKDIR_P) '$(DESTDIR)$(bindir)'
|
$(MKDIR_P) '$(DESTDIR)$(bindir)'
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
|
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
|
||||||
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
|
||||||
|
|
||||||
clean distclean maintainer-clean:
|
clean distclean maintainer-clean:
|
||||||
- rm -f pg_config$(X) $(OBJS)
|
- rm -f pg_config$(X) $(OBJS)
|
||||||
+ rm -f $(PG_CONFIG) $(OBJS)
|
+ rm -f $(PG_CONFIG) $(OBJS)
|
||||||
rm -rf tmp_check
|
rm -rf tmp_check
|
||||||
|
|
||||||
check:
|
check:
|
||||||
diff -ur postgresql-15.0_original/src/bin/pg_config/nls.mk postgresql-15.0/src/bin/pg_config/nls.mk
|
diff -ur postgresql-16beta1/src/bin/pg_config/nls.mk postgresql16_pg_config_patch/src/bin/pg_config/nls.mk
|
||||||
--- postgresql-15.0_original/src/bin/pg_config/nls.mk 2022-09-05 23:12:45.000000000 +0200
|
--- postgresql-16beta1/src/bin/pg_config/nls.mk 2023-05-22 23:08:08.000000000 +0200
|
||||||
+++ postgresql-15.0/src/bin/pg_config/nls.mk 2022-09-27 17:04:14.618932977 +0200
|
+++ postgresql16_pg_config_patch/src/bin/pg_config/nls.mk 2023-06-05 13:49:37.000000000 +0200
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,3 +1,3 @@
|
||||||
# src/bin/pg_config/nls.mk
|
# src/bin/pg_config/nls.mk
|
||||||
-CATALOG_NAME = pg_config
|
-CATALOG_NAME = pg_config
|
||||||
+CATALOG_NAME = pg_server_config
|
+CATALOG_NAME = pg_server_config
|
||||||
AVAIL_LANGUAGES = cs de el es fr he it ja ka ko pl pt_BR ru sv tr uk vi zh_CN
|
|
||||||
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
|
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c
|
||||||
|
|
|
@ -12,37 +12,34 @@ server package update, without requiring any existing postgresql.conf
|
||||||
to be updated. (Of course, a user who dislikes this behavior can still
|
to be updated. (Of course, a user who dislikes this behavior can still
|
||||||
override it via postgresql.conf.)
|
override it via postgresql.conf.)
|
||||||
|
|
||||||
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
|
diff -ur -x 'cscope*' postgresql-16beta1/src/backend/utils/misc/guc_tables.c postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c
|
||||||
index 9481f2d..75532c7 100644
|
--- postgresql-16beta1/src/backend/utils/misc/guc_tables.c 2023-05-22 23:08:08.000000000 +0200
|
||||||
--- a/src/backend/utils/misc/guc.c
|
+++ postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c 2023-06-01 09:39:24.000000000 +0200
|
||||||
+++ b/src/backend/utils/misc/guc.c
|
@@ -4300,7 +4300,7 @@
|
||||||
@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
|
GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY
|
||||||
},
|
},
|
||||||
&Unix_socket_directories,
|
&Unix_socket_directories,
|
||||||
#ifdef HAVE_UNIX_SOCKETS
|
|
||||||
- DEFAULT_PGSOCKET_DIR,
|
- DEFAULT_PGSOCKET_DIR,
|
||||||
+ DEFAULT_PGSOCKET_DIR ", /tmp",
|
+ DEFAULT_PGSOCKET_DIR ", /tmp",
|
||||||
#else
|
NULL, NULL, NULL
|
||||||
"",
|
},
|
||||||
#endif
|
|
||||||
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
|
diff -ur -x 'cscope*' postgresql-16beta1/src/bin/initdb/initdb.c postgresql16_socket_patch/src/bin/initdb/initdb.c
|
||||||
index feeff9e..3e3d784 100644
|
--- postgresql-16beta1/src/bin/initdb/initdb.c 2023-05-22 23:08:08.000000000 +0200
|
||||||
--- a/src/bin/initdb/initdb.c
|
+++ postgresql16_socket_patch/src/bin/initdb/initdb.c 2023-06-01 09:42:16.000000000 +0200
|
||||||
+++ b/src/bin/initdb/initdb.c
|
@@ -1291,7 +1291,7 @@
|
||||||
@@ -1234,7 +1234,7 @@ setup_config(void)
|
* these are indeed defaults, keep the postgresql.conf lines commented.
|
||||||
|
*/
|
||||||
#ifdef HAVE_UNIX_SOCKETS
|
conflines = replace_guc_value(conflines, "unix_socket_directories",
|
||||||
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
|
- DEFAULT_PGSOCKET_DIR, true);
|
||||||
- DEFAULT_PGSOCKET_DIR);
|
+ DEFAULT_PGSOCKET_DIR ", /tmp", true);
|
||||||
+ DEFAULT_PGSOCKET_DIR ", /tmp");
|
|
||||||
#else
|
conflines = replace_guc_value(conflines, "port",
|
||||||
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
|
DEF_PGPORT_STR, true);
|
||||||
#endif
|
diff -ur -x 'cscope*' postgresql-16beta1/src/include/pg_config_manual.h postgresql16_socket_patch/src/include/pg_config_manual.h
|
||||||
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
|
--- postgresql-16beta1/src/include/pg_config_manual.h 2023-05-22 23:08:08.000000000 +0200
|
||||||
index e278fa0..9ee15d4 100644
|
+++ postgresql16_socket_patch/src/include/pg_config_manual.h 2023-06-01 09:43:19.000000000 +0200
|
||||||
--- a/src/include/pg_config_manual.h
|
@@ -206,7 +206,7 @@
|
||||||
+++ b/src/include/pg_config_manual.h
|
|
||||||
@@ -201,7 +201,7 @@
|
|
||||||
* support them yet.
|
* support them yet.
|
||||||
*/
|
*/
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue