X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=socket-dir-fixes.patch;h=5b63aba4f760f4f97f046c84c04b4bdd0ba6c35a;hb=4859a158f877a60e026064cc7647beeda4f89346;hp=3690d568fe51613e38c451c5a8ea8b27576d179d;hpb=1e0b71e627e8f106f0737b26f5c16806709a7dbc;p=packages%2Fpostgresql.git

diff --git a/socket-dir-fixes.patch b/socket-dir-fixes.patch
index 3690d56..5b63aba 100644
--- a/socket-dir-fixes.patch
+++ b/socket-dir-fixes.patch
@@ -1,26 +1,24 @@
-diff -urpa postgresql-13.1.orig/src/bin/pg_upgrade/option.c postgresql-13.1/src/bin/pg_upgrade/option.c
---- postgresql-13.1.orig/src/bin/pg_upgrade/option.c	2020-11-09 23:24:30.000000000 +0100
-+++ postgresql-13.1/src/bin/pg_upgrade/option.c	2020-12-03 20:58:30.431778786 +0100
-@@ -476,8 +476,14 @@ get_sock_dir(ClusterInfo *cluster, bool
- 	 */
- 	if (GET_MAJOR_VERSION(cluster->major_version) >= 901)
- 	{
--		if (!live_check)
-+		if (!live_check) {
- 			cluster->sockdir = user_opts.socketdir;
+--- postgresql-15.2/src/bin/pg_upgrade/option.c	2023-03-07 23:37:50.271950638 +0100
++++ postgresql-15.2/src/bin/pg_upgrade/option.c	2023-03-07 23:40:28.343899006 +0100
+@@ -445,8 +445,14 @@
+ get_sock_dir(ClusterInfo *cluster, bool live_check)
+ {
+ #if defined(HAVE_UNIX_SOCKETS) && !defined(WIN32)
+-	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-13.1.orig/src/include/pg_config_manual.h postgresql-13.1/src/include/pg_config_manual.h
---- postgresql-13.1.orig/src/include/pg_config_manual.h	2020-11-09 23:24:30.000000000 +0100
-+++ postgresql-13.1/src/include/pg_config_manual.h	2020-12-03 20:59:32.262778786 +0100
-@@ -201,7 +201,7 @@
++		if (strlen(cluster->sockdir) >= UNIX_PATH_MAX - sizeof(".s.PGSQL.50432"))
++			strcpy(cluster->sockdir, "/tmp"); /* fall back to tmp */
++	}
+ 	else
+ 	{
+ 		/*
+--- postgresql-15.2/src/include/pg_config_manual.h	2023-03-07 23:37:50.153949183 +0100
++++ postgresql-15.2/src/include/pg_config_manual.h	2023-03-07 23:38:28.898426739 +0100
+@@ -224,7 +224,7 @@
   * support them yet.
   */
  #ifndef WIN32