X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostgresql.git;a=blobdiff_plain;f=socket-dir-fixes.patch;h=41a857715193d8fe940776eb518b41c7482d8022;hp=61cd4eb6819675b765b36dd23e6ccb03f0f8f851;hb=532b3dd175a4d4c40c4c5e3dac1ba6f8d070366e;hpb=7bd8f00f3a0eb9bbbf016d2912380da41ba74b99

diff --git a/socket-dir-fixes.patch b/socket-dir-fixes.patch
index 61cd4eb..41a8577 100644
--- a/socket-dir-fixes.patch
+++ b/socket-dir-fixes.patch
@@ -1,18 +1,22 @@
 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");
+@@ -474,8 +474,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