X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=socket-dir-fixes.patch;h=380ac7310893646efe9718c0d7673ca56876c726;hb=4138e72c38adeb0d9c83de197164aad4139b7372;hp=61cd4eb6819675b765b36dd23e6ccb03f0f8f851;hpb=e3bed88e2502a74b99d20051bd51bf8890677837;p=packages%2Fpostgresql.git

diff --git a/socket-dir-fixes.patch b/socket-dir-fixes.patch
index 61cd4eb..380ac73 100644
--- a/socket-dir-fixes.patch
+++ b/socket-dir-fixes.patch
@@ -1,27 +1,31 @@
-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");
+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;
 +#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
-@@ -181,7 +181,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
+ 			/*
+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 @@
+  * support them yet.
   */
+ #ifndef WIN32
 -#define DEFAULT_PGSOCKET_DIR  "/tmp"
 +#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * This is the default event source for Windows event log.
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif