From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Mar 2017 13:49:35 +0000 (+0100)
Subject: postgresql: Patch away /bin/sh
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/ac48c2790d0de1f04c88513aa64d3d7158e7b35d?hp=77b0e6966779f5c498e41434b0eb712e36424778

postgresql: Patch away /bin/sh
---

diff --git a/disabled-packages/postgresql/src-bin-pg_ctl-pg_ctl.c.patch b/disabled-packages/postgresql/src-bin-pg_ctl-pg_ctl.c.patch
new file mode 100644
index 00000000..b1129b7b
--- /dev/null
+++ b/disabled-packages/postgresql/src-bin-pg_ctl-pg_ctl.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../postgresql-9.6.2/src/bin/pg_ctl/pg_ctl.c ./src/bin/pg_ctl/pg_ctl.c
+--- ../postgresql-9.6.2/src/bin/pg_ctl/pg_ctl.c	2017-02-06 22:45:25.000000000 +0100
++++ ./src/bin/pg_ctl/pg_ctl.c	2017-03-05 14:47:06.985823535 +0100
+@@ -466,7 +466,7 @@
+ 		snprintf(cmd, MAXPGPATH, "exec \"%s\" %s%s < \"%s\" 2>&1",
+ 				 exec_path, pgdata_opt, post_opts, DEVNULL);
+ 
+-	(void) execl("/bin/sh", "/bin/sh", "-c", cmd, (char *) NULL);
++	(void) execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (char *) NULL);
+ 
+ 	/* exec failed */
+ 	write_stderr(_("%s: could not start server: %s\n"),
diff --git a/disabled-packages/postgresql/src-bin-pg_upgrade-check.c.patch b/disabled-packages/postgresql/src-bin-pg_upgrade-check.c.patch
new file mode 100644
index 00000000..ac482847
--- /dev/null
+++ b/disabled-packages/postgresql/src-bin-pg_upgrade-check.c.patch
@@ -0,0 +1,21 @@
+diff -u -r ../postgresql-9.6.2/src/bin/pg_upgrade/check.c ./src/bin/pg_upgrade/check.c
+--- ../postgresql-9.6.2/src/bin/pg_upgrade/check.c	2017-02-06 22:45:25.000000000 +0100
++++ ./src/bin/pg_upgrade/check.c	2017-03-05 14:47:58.793188439 +0100
+@@ -436,7 +436,7 @@
+ 
+ #ifndef WIN32
+ 	/* add shebang header */
+-	fprintf(script, "#!/bin/sh\n\n");
++	fprintf(script, "#!@TERMUX_PREFIX@/bin/sh\n\n");
+ #else
+ 	/* suppress command echoing */
+ 	fprintf(script, "@echo off\n");
+@@ -564,7 +564,7 @@
+ 
+ #ifndef WIN32
+ 	/* add shebang header */
+-	fprintf(script, "#!/bin/sh\n\n");
++	fprintf(script, "#!@TERMUX_PREFIX@/bin/sh\n\n");
+ #endif
+ 
+ 	/* delete old cluster's default tablespace */
diff --git a/disabled-packages/postgresql/src-bin-psql-command.c.patch b/disabled-packages/postgresql/src-bin-psql-command.c.patch
new file mode 100644
index 00000000..2044bdc0
--- /dev/null
+++ b/disabled-packages/postgresql/src-bin-psql-command.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../postgresql-9.6.2/src/bin/psql/command.c ./src/bin/psql/command.c
+--- ../postgresql-9.6.2/src/bin/psql/command.c	2017-02-06 22:45:25.000000000 +0100
++++ ./src/bin/psql/command.c	2017-03-05 14:45:58.038668777 +0100
+@@ -3076,7 +3076,7 @@
+ 
+ 
+ #ifndef WIN32
+-#define DEFAULT_SHELL "/bin/sh"
++#define DEFAULT_SHELL "@TERMUX_PREFIX@/bin/sh"
+ #else
+ /*
+  *	CMD.EXE is in different places in different Win32 releases so we