sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

postgresql: update fix-hardcoded-paths.patch

Browse Source
This commit is contained in:
Leonid Pliushch 2020-10-19 21:32:03 +03:00
parent a4f2dfd225
commit 4347589111
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/postgresql/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Object-relational SQL database"
TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_LICENSE_FILE="COPYRIGHT" TERMUX_PKG_LICENSE_FILE="COPYRIGHT"
TERMUX_PKG_VERSION=13.0 TERMUX_PKG_VERSION=13.0
TERMUX_PKG_REVISION=2 TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2
TERMUX_PKG_SHA256=80e750be8d436b54197636a02636f8fd3263ba6779bf865b04832495ea592296 TERMUX_PKG_SHA256=80e750be8d436b54197636a02636f8fd3263ba6779bf865b04832495ea592296
TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu, zlib" TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu, zlib"

42
packages/postgresql/fix-hardcoded-paths.patch
View File

@ -1,6 +1,6 @@
diff -uNr postgresql-13.0/contrib/pg_trgm/trgm_regexp.c postgresql-13.0.mod/contrib/pg_trgm/trgm_regexp.c diff -uNr postgresql-13.0/contrib/pg_trgm/trgm_regexp.c postgresql-13.0.mod/contrib/pg_trgm/trgm_regexp.c
--- postgresql-13.0/contrib/pg_trgm/trgm_regexp.c 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/contrib/pg_trgm/trgm_regexp.c 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/contrib/pg_trgm/trgm_regexp.c 2020-10-19 20:20:32.875091545 +0300 +++ postgresql-13.0.mod/contrib/pg_trgm/trgm_regexp.c 2020-10-19 21:31:14.749878910 +0300
@@ -2173,7 +2173,7 @@ @@ -2173,7 +2173,7 @@
{ {
@ -8,11 +8,29 @@ diff -uNr postgresql-13.0/contrib/pg_trgm/trgm_regexp.c postgresql-13.0.mod/cont
- FILE *fp = fopen("/tmp/source.gv", "w"); - FILE *fp = fopen("/tmp/source.gv", "w");
+ FILE *fp = fopen("@TERMUX_PREFIX@/tmp/source.gv", "w"); + FILE *fp = fopen("@TERMUX_PREFIX@/tmp/source.gv", "w");
fprintf(fp, "%s", buf.data);
fclose(fp);
@@ -2235,7 +2235,7 @@
{
/* dot -Tpng -o /tmp/transformed.png < /tmp/transformed.gv */
- FILE *fp = fopen("/tmp/transformed.gv", "w");
+ FILE *fp = fopen("@TERMUX_PREFIX@/tmp/transformed.gv", "w");
fprintf(fp, "%s", buf.data);
fclose(fp);
@@ -2326,7 +2326,7 @@
{
/* dot -Tpng -o /tmp/packed.png < /tmp/packed.gv */
- FILE *fp = fopen("/tmp/packed.gv", "w");
+ FILE *fp = fopen("@TERMUX_PREFIX@/tmp/packed.gv", "w");
fprintf(fp, "%s", buf.data); fprintf(fp, "%s", buf.data);
fclose(fp); fclose(fp);
diff -uNr postgresql-13.0/src/bin/initdb/initdb.c postgresql-13.0.mod/src/bin/initdb/initdb.c diff -uNr postgresql-13.0/src/bin/initdb/initdb.c postgresql-13.0.mod/src/bin/initdb/initdb.c
--- postgresql-13.0/src/bin/initdb/initdb.c 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/src/bin/initdb/initdb.c 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/src/bin/initdb/initdb.c 2020-10-19 20:20:44.907210164 +0300 +++ postgresql-13.0.mod/src/bin/initdb/initdb.c 2020-10-19 21:31:14.749878910 +0300
@@ -1095,7 +1095,7 @@ @@ -1095,7 +1095,7 @@
#else #else
snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''"); snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
@ -24,7 +42,7 @@ diff -uNr postgresql-13.0/src/bin/initdb/initdb.c postgresql-13.0.mod/src/bin/in
#if DEF_PGPORT != 5432 #if DEF_PGPORT != 5432
diff -uNr postgresql-13.0/src/bin/pg_ctl/pg_ctl.c postgresql-13.0.mod/src/bin/pg_ctl/pg_ctl.c diff -uNr postgresql-13.0/src/bin/pg_ctl/pg_ctl.c postgresql-13.0.mod/src/bin/pg_ctl/pg_ctl.c
--- postgresql-13.0/src/bin/pg_ctl/pg_ctl.c 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/src/bin/pg_ctl/pg_ctl.c 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/src/bin/pg_ctl/pg_ctl.c 2020-10-19 20:17:25.837231316 +0300 +++ postgresql-13.0.mod/src/bin/pg_ctl/pg_ctl.c 2020-10-19 21:31:14.749878910 +0300
@@ -494,7 +494,7 @@ @@ -494,7 +494,7 @@
snprintf(cmd, MAXPGPATH, "exec \"%s\" %s%s < \"%s\" 2>&1", snprintf(cmd, MAXPGPATH, "exec \"%s\" %s%s < \"%s\" 2>&1",
exec_path, pgdata_opt, post_opts, DEVNULL); exec_path, pgdata_opt, post_opts, DEVNULL);
@ -36,7 +54,7 @@ diff -uNr postgresql-13.0/src/bin/pg_ctl/pg_ctl.c postgresql-13.0.mod/src/bin/pg
write_stderr(_("%s: could not start server: %s\n"), write_stderr(_("%s: could not start server: %s\n"),
diff -uNr postgresql-13.0/src/bin/pg_upgrade/check.c postgresql-13.0.mod/src/bin/pg_upgrade/check.c diff -uNr postgresql-13.0/src/bin/pg_upgrade/check.c postgresql-13.0.mod/src/bin/pg_upgrade/check.c
--- postgresql-13.0/src/bin/pg_upgrade/check.c 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/src/bin/pg_upgrade/check.c 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/src/bin/pg_upgrade/check.c 2020-10-19 20:17:25.837231316 +0300 +++ postgresql-13.0.mod/src/bin/pg_upgrade/check.c 2020-10-19 21:31:14.753878949 +0300
@@ -474,7 +474,7 @@ @@ -474,7 +474,7 @@
#ifndef WIN32 #ifndef WIN32
@ -57,7 +75,7 @@ diff -uNr postgresql-13.0/src/bin/pg_upgrade/check.c postgresql-13.0.mod/src/bin
/* delete old cluster's default tablespace */ /* delete old cluster's default tablespace */
diff -uNr postgresql-13.0/src/bin/psql/command.c postgresql-13.0.mod/src/bin/psql/command.c diff -uNr postgresql-13.0/src/bin/psql/command.c postgresql-13.0.mod/src/bin/psql/command.c
--- postgresql-13.0/src/bin/psql/command.c 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/src/bin/psql/command.c 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/src/bin/psql/command.c 2020-10-19 20:18:07.733650936 +0300 +++ postgresql-13.0.mod/src/bin/psql/command.c 2020-10-19 21:31:14.753878949 +0300
@@ -3577,7 +3577,7 @@ @@ -3577,7 +3577,7 @@
if (result == -1) if (result == -1)
pg_log_error("could not start editor \"%s\"", editorName); pg_log_error("could not start editor \"%s\"", editorName);
@ -87,13 +105,13 @@ diff -uNr postgresql-13.0/src/bin/psql/command.c postgresql-13.0.mod/src/bin/psq
* CMD.EXE is in different places in different Win32 releases so we * CMD.EXE is in different places in different Win32 releases so we
diff -uNr postgresql-13.0/src/include/pg_config_manual.h postgresql-13.0.mod/src/include/pg_config_manual.h diff -uNr postgresql-13.0/src/include/pg_config_manual.h postgresql-13.0.mod/src/include/pg_config_manual.h
--- postgresql-13.0/src/include/pg_config_manual.h 2020-09-21 23:47:36.000000000 +0300 --- postgresql-13.0/src/include/pg_config_manual.h 2020-09-21 23:47:36.000000000 +0300
+++ postgresql-13.0.mod/src/include/pg_config_manual.h 2020-10-19 20:22:20.620150044 +0300 +++ postgresql-13.0.mod/src/include/pg_config_manual.h 2020-10-19 21:31:30.978039951 +0300
@@ -203,7 +203,7 @@ @@ -201,7 +201,7 @@
* support them yet.
*/
#ifndef WIN32 #ifndef WIN32
#define DEFAULT_PGSOCKET_DIR "/tmp" -#define DEFAULT_PGSOCKET_DIR "/tmp"
+#define DEFAULT_PGSOCKET_DIR "@TERMUX_PREFIX@/tmp"
#else #else
-#define DEFAULT_PGSOCKET_DIR "" #define DEFAULT_PGSOCKET_DIR ""
+#define DEFAULT_PGSOCKET_DIR "@TERMUX_PREFIX@/tmp"
#endif #endif
/*