Rebase to upstream release 13.0
This commit is contained in:
parent
82d1535e95
commit
5bfadce51b
@ -12,42 +12,15 @@ 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 -up postgresql-13.0/src/include/pg_config_manual.h.patch1 postgresql-13.0/src/include/pg_config_manual.h
|
||||||
index 9481f2d..75532c7 100644
|
--- postgresql-13.0/src/include/pg_config_manual.h.patch1 2020-10-23 10:18:12.204959024 +0200
|
||||||
--- a/src/backend/utils/misc/guc.c
|
+++ postgresql-13.0/src/include/pg_config_manual.h 2020-10-23 10:18:39.391208931 +0200
|
||||||
+++ b/src/backend/utils/misc/guc.c
|
@@ -201,7 +201,7 @@
|
||||||
@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
|
* support them yet.
|
||||||
},
|
|
||||||
&Unix_socket_directories,
|
|
||||||
#ifdef HAVE_UNIX_SOCKETS
|
|
||||||
- DEFAULT_PGSOCKET_DIR,
|
|
||||||
+ DEFAULT_PGSOCKET_DIR ", /tmp",
|
|
||||||
#else
|
|
||||||
"",
|
|
||||||
#endif
|
|
||||||
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
|
|
||||||
index feeff9e..3e3d784 100644
|
|
||||||
--- a/src/bin/initdb/initdb.c
|
|
||||||
+++ b/src/bin/initdb/initdb.c
|
|
||||||
@@ -1234,7 +1234,7 @@ setup_config(void)
|
|
||||||
|
|
||||||
#ifdef HAVE_UNIX_SOCKETS
|
|
||||||
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
|
|
||||||
- DEFAULT_PGSOCKET_DIR);
|
|
||||||
+ DEFAULT_PGSOCKET_DIR ", /tmp");
|
|
||||||
#else
|
|
||||||
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
|
|
||||||
#endif
|
|
||||||
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
|
|
||||||
index e278fa0..9ee15d4 100644
|
|
||||||
--- a/src/include/pg_config_manual.h
|
|
||||||
+++ b/src/include/pg_config_manual.h
|
|
||||||
@@ -169,7 +169,7 @@
|
|
||||||
* here's where to twiddle it. You can also override this at runtime
|
|
||||||
* with the postmaster's -k switch.
|
|
||||||
*/
|
*/
|
||||||
|
#ifndef WIN32
|
||||||
-#define DEFAULT_PGSOCKET_DIR "/tmp"
|
-#define DEFAULT_PGSOCKET_DIR "/tmp"
|
||||||
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
|
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
|
||||||
|
#else
|
||||||
/*
|
#define DEFAULT_PGSOCKET_DIR ""
|
||||||
* This is the default event source for Windows event log.
|
#endif
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
%global majorversion 12
|
%global majorversion 13
|
||||||
|
|
||||||
Summary: ECPG - Embedded SQL in C
|
Summary: ECPG - Embedded SQL in C
|
||||||
Name: libecpg
|
Name: libecpg
|
||||||
Version: %majorversion.4
|
Version: %majorversion.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: PostgreSQL
|
License: PostgreSQL
|
||||||
@ -127,6 +127,9 @@ find_lang_bins %name-devel.lst ecpg
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 23 2020 Honza Horak <hhorak@redhat.com> - 13.0-1
|
||||||
|
- Rebase to upstream release 13.0
|
||||||
|
|
||||||
* Tue Aug 25 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
|
* Tue Aug 25 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
|
||||||
- Rebase to upstream release 12.4
|
- Rebase to upstream release 12.4
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
|
SHA512 (postgresql-13.0.tar.bz2) = 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
|
||||||
SHA512 (postgresql-12.4.tar.bz2.sha256) = d5c6d9c6cf189f0ef9c4ebac18782f25c0ff8420d0b063217f4ac250cca4706ec782e983326ffcb23258bcd5bf17b481e53d84aeb85b5744bfd90ea1bd33431a
|
SHA512 (postgresql-13.0.tar.bz2.sha256) = 147e2fa96eb8aab3c80dfbfdcf2dbd220599ec9c2200bd890e30e5a8a65b3136b035835444ab2c98368ac53c8ae190d83999e344ee6b52c069b3cd6d157dd34e
|
||||||
|
Loading…
Reference in New Issue
Block a user