Leonid Plyushch
6 years ago
committed by
GitHub
GitHub
302 changed files with 4929 additions and 2740 deletions
|
After Width: | Height: | Size: 17 KiB |
File diff suppressed because it is too large
@ -1,14 +0,0 @@ |
|||
--- /home/builder/cstddef.orig 2017-07-15 01:17:10.637496279 +0000 |
|||
+++ ./cstddef 2017-07-15 10:28:28.526713523 +0000 |
|||
@@ -40,7 +40,11 @@ |
|||
#endif |
|||
|
|||
// Don't include our own <stddef.h>; we don't want to declare ::nullptr_t. |
|||
+#ifdef __clang__ |
|||
#include_next <stddef.h> |
|||
+#else |
|||
+#include "../../../lib/gcc/@TERMUX_HOST_PLATFORM@/4.9.x/include/stddef.h" |
|||
+#endif |
|||
#include <__nullptr> |
|||
|
|||
_LIBCPP_BEGIN_NAMESPACE_STD |
|||
@ -1,12 +0,0 @@ |
|||
diff -u -r ../bash-4.2/lib/readline/complete.c ./lib/readline/complete.c
|
|||
--- ../bash-4.2/lib/readline/complete.c 2011-01-16 21:32:57.000000000 +0100
|
|||
+++ ./lib/readline/complete.c 2014-01-13 12:28:56.338866643 +0100
|
|||
@@ -2021,7 +2021,7 @@
|
|||
const char *text; |
|||
int state; |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT)
|
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
|
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/error.c bash-5.0.mod/error.c
|
|||
--- bash-5.0/error.c 2018-10-08 22:16:07.000000000 +0300
|
|||
+++ bash-5.0.mod/error.c 2019-02-20 14:19:39.265261705 +0200
|
|||
@@ -430,7 +430,7 @@
|
|||
static FILE *tracefp = (FILE *)NULL; |
|||
|
|||
if (tracefp == NULL) |
|||
- tracefp = fopen("/tmp/bash-trace.log", "a+");
|
|||
+ tracefp = fopen("@TERMUX_PREFIX@/tmp/bash-trace.log", "a+");
|
|||
|
|||
if (tracefp == NULL) |
|||
tracefp = stderr; |
|||
@ -1,39 +0,0 @@ |
|||
diff -u -r ../bash-4.2/lib/readline/complete.c ./lib/readline/complete.c |
|||
--- ../bash-4.2/lib/readline/complete.c 2011-01-16 21:32:57.000000000 +0100 |
|||
+++ ./lib/readline/complete.c 2014-01-13 12:28:56.338866643 +0100 |
|||
@@ -2021,7 +2021,7 @@ |
|||
const char *text; |
|||
int state; |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT) |
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__) |
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
|||
diff -u -r ../bash-4.2/shell.c ./shell.c |
|||
--- ../bash-4.2/shell.c 2011-01-02 22:04:51.000000000 +0100 |
|||
+++ ./shell.c 2014-01-13 12:43:01.070846472 +0100 |
|||
@@ -1638,6 +1638,7 @@ |
|||
/* Don't fetch this more than once. */ |
|||
if (current_user.user_name == 0) |
|||
{ |
|||
+#ifndef __ANDROID__ |
|||
entry = getpwuid (current_user.uid); |
|||
if (entry) |
|||
{ |
|||
@@ -1649,12 +1650,15 @@ |
|||
} |
|||
else |
|||
{ |
|||
+#endif |
|||
current_user.user_name = _("I have no name!"); |
|||
current_user.user_name = savestring (current_user.user_name); |
|||
current_user.shell = savestring ("/bin/sh"); |
|||
current_user.home_dir = savestring ("/"); |
|||
+#ifndef __ANDROID__ |
|||
} |
|||
endpwent (); |
|||
+#endif |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/malloc/stats.c bash-5.0.mod/lib/malloc/stats.c
|
|||
--- bash-5.0/lib/malloc/stats.c 2018-06-19 22:24:52.000000000 +0300
|
|||
+++ bash-5.0.mod/lib/malloc/stats.c 2019-02-20 14:17:52.094412438 +0200
|
|||
@@ -142,7 +142,7 @@
|
|||
_print_malloc_stats (s, fp); |
|||
} |
|||
|
|||
-#define TRACEROOT "/var/tmp/maltrace/stats."
|
|||
+#define TRACEROOT "@TERMUX_PREFIX@/var/tmp/maltrace/stats."
|
|||
|
|||
void |
|||
trace_malloc_stats (s, fn) |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/malloc/table.c bash-5.0.mod/lib/malloc/table.c
|
|||
--- bash-5.0/lib/malloc/table.c 2016-01-15 15:47:26.000000000 +0200
|
|||
+++ bash-5.0.mod/lib/malloc/table.c 2019-02-20 14:18:05.854521552 +0200
|
|||
@@ -390,7 +390,7 @@
|
|||
_location_dump_table (stderr); |
|||
} |
|||
|
|||
-#define LOCROOT "/var/tmp/maltrace/locations."
|
|||
+#define LOCROOT "@TERMUX_PREFIX@/var/tmp/maltrace/locations."
|
|||
|
|||
void |
|||
mlocation_write_table () |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/malloc/trace.c bash-5.0.mod/lib/malloc/trace.c
|
|||
--- bash-5.0/lib/malloc/trace.c 2016-01-15 15:48:23.000000000 +0200
|
|||
+++ bash-5.0.mod/lib/malloc/trace.c 2019-02-20 14:17:59.184468664 +0200
|
|||
@@ -108,7 +108,7 @@
|
|||
#endif |
|||
} |
|||
|
|||
-#define TRACEROOT "/var/tmp/maltrace/trace."
|
|||
+#define TRACEROOT "@TERMUX_PREFIX@/var/tmp/maltrace/trace."
|
|||
|
|||
void |
|||
malloc_set_tracefn (s, fn) |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/readline/complete.c bash-5.0.mod/lib/readline/complete.c
|
|||
--- bash-5.0/lib/readline/complete.c 2017-07-05 02:43:20.000000000 +0300
|
|||
+++ bash-5.0.mod/lib/readline/complete.c 2019-02-20 14:15:49.683440481 +0200
|
|||
@@ -2231,7 +2231,7 @@
|
|||
char * |
|||
rl_username_completion_function (const char *text, int state) |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT)
|
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
|
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/readline/rlconf.h bash-5.0.mod/lib/readline/rlconf.h
|
|||
--- bash-5.0/lib/readline/rlconf.h 2017-02-21 17:25:30.000000000 +0200
|
|||
+++ bash-5.0.mod/lib/readline/rlconf.h 2019-02-20 14:16:17.230326111 +0200
|
|||
@@ -43,7 +43,7 @@
|
|||
#define DEFAULT_INPUTRC "~/.inputrc" |
|||
|
|||
/* The ultimate last-ditch filename for an init file -- system-wide. */ |
|||
-#define SYS_INPUTRC "/etc/inputrc"
|
|||
+#define SYS_INPUTRC "@TERMUX_PREFIX@/etc/inputrc"
|
|||
|
|||
/* If defined, expand tabs to spaces. */ |
|||
#define DISPLAY_TABS |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bash-5.0/lib/readline/util.c bash-5.0.mod/lib/readline/util.c
|
|||
--- bash-5.0/lib/readline/util.c 2017-06-15 23:27:17.000000000 +0300
|
|||
+++ bash-5.0.mod/lib/readline/util.c 2019-02-20 14:18:24.271334221 +0200
|
|||
@@ -506,7 +506,7 @@
|
|||
if (x == 0) |
|||
x = "."; |
|||
#else |
|||
- x = "/var/tmp";
|
|||
+ x = "@TERMUX_PREFIX@/var/tmp";
|
|||
#endif |
|||
snprintf (fnbuf, sizeof (fnbuf), "%s/rltrace.%ld", x, (long)getpid()); |
|||
unlink(fnbuf); |
|||
@ -0,0 +1,21 @@ |
|||
diff -uNr bash-5.0/lib/sh/tmpfile.c bash-5.0.mod/lib/sh/tmpfile.c
|
|||
--- bash-5.0/lib/sh/tmpfile.c 2016-08-11 18:05:58.000000000 +0300
|
|||
+++ bash-5.0.mod/lib/sh/tmpfile.c 2019-02-20 14:17:08.270731426 +0200
|
|||
@@ -74,15 +74,11 @@
|
|||
return sys_tmpdir; |
|||
#endif |
|||
|
|||
- sys_tmpdir = "/tmp";
|
|||
+ sys_tmpdir = "@TERMUX_PREFIX@/tmp";
|
|||
if (file_iswdir (sys_tmpdir)) |
|||
return sys_tmpdir; |
|||
|
|||
- sys_tmpdir = "/var/tmp";
|
|||
- if (file_iswdir (sys_tmpdir))
|
|||
- return sys_tmpdir;
|
|||
-
|
|||
- sys_tmpdir = "/usr/tmp";
|
|||
+ sys_tmpdir = "@TERMUX_PREFIX@/var/tmp";
|
|||
if (file_iswdir (sys_tmpdir)) |
|||
return sys_tmpdir; |
|||
|
|||
@ -1,5 +1,6 @@ |
|||
--- ../bash-4.2/pathnames.h.in 2009-01-04 20:32:40.000000000 +0100
|
|||
+++ ./pathnames.h.in 2014-02-04 18:34:17.000000000 +0100
|
|||
diff -uNr bash-5.0/pathnames.h.in bash-5.0.mod/pathnames.h.in
|
|||
--- bash-5.0/pathnames.h.in 2009-01-04 21:32:40.000000000 +0200
|
|||
+++ bash-5.0.mod/pathnames.h.in 2019-02-20 14:15:56.880164371 +0200
|
|||
@@ -22,10 +22,10 @@
|
|||
#define _PATHNAMES_H_ |
|||
|
|||
@ -0,0 +1,19 @@ |
|||
diff -uNr bash-5.0/shell.c bash-5.0.mod/shell.c
|
|||
--- bash-5.0/shell.c 2018-12-06 18:28:21.000000000 +0200
|
|||
+++ bash-5.0.mod/shell.c 2019-02-20 14:19:29.808520144 +0200
|
|||
@@ -339,12 +339,12 @@
|
|||
{ |
|||
struct stat sb; |
|||
|
|||
- if (stat ("/tmp", &sb) < 0)
|
|||
- internal_warning (_("could not find /tmp, please create!"));
|
|||
+ if (stat ("@TERMUX_PREFIX@/tmp", &sb) < 0)
|
|||
+ internal_warning (_("could not find @TERMUX_PREFIX@/tmp, please create!"));
|
|||
else |
|||
{ |
|||
if (S_ISDIR (sb.st_mode) == 0) |
|||
- internal_warning (_("/tmp must be a valid directory name"));
|
|||
+ internal_warning (_("@TERMUX_PREFIX@/tmp must be a valid directory name"));
|
|||
} |
|||
} |
|||
#endif /* __CYGWIN__ */ |
|||
@ -1,13 +0,0 @@ |
|||
Fix breakage on android-21 due "conflicting type for '__errno'" |
|||
|
|||
diff -u -r ../bash-4.3/y.tab.c ./y.tab.c
|
|||
--- ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500
|
|||
+++ ./y.tab.c 2014-12-16 05:39:58.047338124 -0500
|
|||
@@ -280,7 +280,6 @@
|
|||
extern int bash_input_fd_changed; |
|||
#endif |
|||
|
|||
-extern int errno;
|
|||
/* **************************************************************** */ |
|||
/* */ |
|||
/* "Forward" declarations */ |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr busybox-1.30.1/util-linux/setarch.c busybox-1.30.1.mod/util-linux/setarch.c
|
|||
--- busybox-1.30.1/util-linux/setarch.c 2018-12-30 17:14:20.000000000 +0200
|
|||
+++ busybox-1.30.1.mod/util-linux/setarch.c 2019-03-02 14:06:38.150442254 +0200
|
|||
@@ -98,7 +98,7 @@
|
|||
|
|||
argv += optind; |
|||
if (!argv[0]) |
|||
- (--argv)[0] = (char*)"/bin/sh";
|
|||
+ (--argv)[0] = (char*)"@TERMUX_PREFIX@/bin/sh";
|
|||
|
|||
/* Try to execute the program */ |
|||
BB_EXECVP_or_die(argv); |
|||
@ -1,8 +1,21 @@ |
|||
--- ../../cache/calcurse-4.1.0/src/io.c 2016-03-27 12:26:18.000000000 +0200
|
|||
+++ ./src/io.c 2016-05-09 00:00:16.402558225 +0200
|
|||
@@ -1430,4 +1430,3 @@ void io_stop_psave_thread(void)
|
|||
io_save_mutex_lock(); |
|||
diff -u -r ../calcurse-4.4.0/src/io.c ./src/io.c
|
|||
--- ../calcurse-4.4.0/src/io.c 2019-02-04 20:44:04.000000000 +0000
|
|||
+++ ./src/io.c 2019-03-01 20:49:16.393057747 +0000
|
|||
@@ -1399,7 +1399,6 @@
|
|||
EXIT_IF(delay < 0, _("Invalid delay")); |
|||
char *mesg = _("Periodic save: data files have changed. Save cancelled."); |
|||
|
|||
- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
|
|||
for (;;) { |
|||
sleep(delay * MININSEC); |
|||
pthread_mutex_lock(&io_periodic_save_mutex); |
|||
@@ -1424,8 +1423,7 @@
|
|||
|
|||
/* Lock the mutex to avoid cancelling the thread during saving. */ |
|||
pthread_mutex_lock(&io_periodic_save_mutex); |
|||
- pthread_cancel(io_t_psave);
|
|||
- pthread_join(io_t_psave, NULL);
|
|||
+ pthread_kill(io_t_psave, 0);
|
|||
io_save_mutex_unlock(); |
|||
pthread_mutex_unlock(&io_periodic_save_mutex); |
|||
io_t_psave = pthread_self(); |
|||
} |
|||
|
|||
@ -1,8 +0,0 @@ |
|||
--- ../../cache/calcurse-4.1.0/src/notify.c 2016-03-27 12:26:18.000000000 +0200
|
|||
+++ ./src/notify.c 2016-05-09 00:01:31.495324279 +0200
|
|||
@@ -193,4 +193,3 @@ void notify_stop_main_thread(void)
|
|||
if (notify_t_main) { |
|||
- pthread_cancel(notify_t_main);
|
|||
- pthread_join(notify_t_main, NULL);
|
|||
+ pthread_kill(notify_t_main, 0);
|
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
diff -u -r ../calcurse-4.4.0/src/notify.c ./src/notify.c
|
|||
--- ../calcurse-4.4.0/src/notify.c 2019-01-18 22:38:58.000000000 +0000
|
|||
+++ ./src/notify.c 2019-03-01 20:45:55.019585998 +0000
|
|||
@@ -196,8 +196,7 @@
|
|||
if (pthread_equal(notify_t_main, pthread_self())) |
|||
return; |
|||
|
|||
- pthread_cancel(notify_t_main);
|
|||
- pthread_join(notify_t_main, NULL);
|
|||
+ pthread_kill(notify_t_main, 0);
|
|||
notify_t_main = pthread_self(); |
|||
} |
|||
|
|||
@ -0,0 +1,13 @@ |
|||
diff -u -r ../calcurse-4.4.0/src/ui-calendar.c ./src/ui-calendar.c
|
|||
--- ../calcurse-4.4.0/src/ui-calendar.c 2019-01-18 22:38:58.000000000 +0000
|
|||
+++ ./src/ui-calendar.c 2019-03-01 20:47:58.622033795 +0000
|
|||
@@ -123,8 +123,7 @@
|
|||
if (pthread_equal(ui_calendar_t_date, pthread_self())) |
|||
return; |
|||
|
|||
- pthread_cancel(ui_calendar_t_date);
|
|||
- pthread_join(ui_calendar_t_date, NULL);
|
|||
+ pthread_kill(ui_calendar_t_date, 0);
|
|||
ui_calendar_t_date = pthread_self(); |
|||
} |
|||
|
|||
@ -1,8 +0,0 @@ |
|||
--- ../../cache/calcurse-4.1.0/src/ui-calendar.c 2016-03-27 12:26:18.000000000 +0200
|
|||
+++ ./src/ui-calendar.c 2016-05-09 00:01:52.327536161 +0200
|
|||
@@ -145,4 +145,3 @@ void ui_calendar_stop_date_thread(void)
|
|||
if (ui_calendar_t_date) { |
|||
- pthread_cancel(ui_calendar_t_date);
|
|||
- pthread_join(ui_calendar_t_date, NULL);
|
|||
+ pthread_kill(ui_calendar_t_date, 0);
|
|||
} |
|||
@ -0,0 +1,92 @@ |
|||
diff -uNr coreutils-8.30/lib/getusershell.c coreutils-8.30.mod/lib/getusershell.c
|
|||
--- coreutils-8.30/lib/getusershell.c 2018-05-14 07:20:31.000000000 +0300
|
|||
+++ coreutils-8.30.mod/lib/getusershell.c 2019-03-01 20:16:36.731319198 +0200
|
|||
@@ -56,7 +56,7 @@
|
|||
static char const* const default_shells[] = |
|||
{ |
|||
ADDITIONAL_DEFAULT_SHELLS |
|||
- "/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
|
|||
+ "@TERMUX_PREFIX@/bin/sh", "@TERMUX_PREFIX@/bin/bash", "@TERMUX_PREFIX@/bin/ash", "@TERMUX_PREFIX@/bin/csh", NULL
|
|||
}; |
|||
|
|||
/* Index of the next shell in 'default_shells' to return. |
|||
diff -uNr coreutils-8.30/lib/tempname.c coreutils-8.30.mod/lib/tempname.c
|
|||
--- coreutils-8.30/lib/tempname.c 2018-05-14 07:22:38.000000000 +0300
|
|||
+++ coreutils-8.30.mod/lib/tempname.c 2019-03-01 20:14:04.073892964 +0200
|
|||
@@ -33,7 +33,7 @@
|
|||
|
|||
#include <stdio.h> |
|||
#ifndef P_tmpdir |
|||
-# define P_tmpdir "/tmp"
|
|||
+# define P_tmpdir "@TERMUX_PREFIX@/tmp"
|
|||
#endif |
|||
#ifndef TMP_MAX |
|||
# define TMP_MAX 238328 |
|||
@@ -149,8 +149,8 @@
|
|||
{ |
|||
if (direxists (P_tmpdir)) |
|||
dir = P_tmpdir; |
|||
- else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
|
|||
- dir = "/tmp";
|
|||
+ else if (strcmp (P_tmpdir, "@TERMUX_PREFIX@/tmp") != 0 && direxists ("@TERMUX_PREFIX@/tmp"))
|
|||
+ dir = "@TERMUX_PREFIX@/tmp";
|
|||
else |
|||
{ |
|||
__set_errno (ENOENT); |
|||
diff -uNr coreutils-8.30/src/mktemp.c coreutils-8.30.mod/src/mktemp.c
|
|||
--- coreutils-8.30/src/mktemp.c 2018-05-14 07:20:24.000000000 +0300
|
|||
+++ coreutils-8.30.mod/src/mktemp.c 2019-03-01 20:12:37.923442265 +0200
|
|||
@@ -270,7 +270,7 @@
|
|||
else if (dest_dir_arg && *dest_dir_arg) |
|||
dest_dir = dest_dir_arg; |
|||
else |
|||
- dest_dir = "/tmp";
|
|||
+ dest_dir = "@TERMUX_PREFIX@/tmp";
|
|||
|
|||
if (last_component (template) != template) |
|||
die (EXIT_FAILURE, 0, |
|||
@@ -284,7 +284,7 @@
|
|||
else |
|||
{ |
|||
char *env = getenv ("TMPDIR"); |
|||
- dest_dir = (env && *env ? env : "/tmp");
|
|||
+ dest_dir = (env && *env ? env : "@TERMUX_PREFIX@/tmp");
|
|||
} |
|||
if (IS_ABSOLUTE_FILE_NAME (template)) |
|||
die (EXIT_FAILURE, 0, |
|||
diff -uNr coreutils-8.30/src/sort.c coreutils-8.30.mod/src/sort.c
|
|||
--- coreutils-8.30/src/sort.c 2018-05-14 07:20:24.000000000 +0300
|
|||
+++ coreutils-8.30.mod/src/sort.c 2019-03-01 20:13:40.883773368 +0200
|
|||
@@ -105,7 +105,7 @@
|
|||
#endif |
|||
|
|||
#ifndef DEFAULT_TMPDIR |
|||
-# define DEFAULT_TMPDIR "/tmp"
|
|||
+# define DEFAULT_TMPDIR "@TERMUX_PREFIX@/tmp"
|
|||
#endif |
|||
|
|||
/* Maximum number of lines to merge every time a NODE is taken from |
|||
diff -uNr coreutils-8.30/src/split.c coreutils-8.30.mod/src/split.c
|
|||
--- coreutils-8.30/src/split.c 2018-05-14 07:20:24.000000000 +0300
|
|||
+++ coreutils-8.30.mod/src/split.c 2019-03-01 20:15:52.004434545 +0200
|
|||
@@ -481,7 +481,7 @@
|
|||
pid_t child_pid; |
|||
char const *shell_prog = getenv ("SHELL"); |
|||
if (shell_prog == NULL) |
|||
- shell_prog = "/bin/sh";
|
|||
+ shell_prog = "@TERMUX_PREFIX@/bin/sh";
|
|||
if (setenv ("FILE", name, 1) != 0) |
|||
die (EXIT_FAILURE, errno, |
|||
_("failed to set FILE environment variable")); |
|||
diff -uNr coreutils-8.30/src/tac.c coreutils-8.30.mod/src/tac.c
|
|||
--- coreutils-8.30/src/tac.c 2018-05-14 07:20:24.000000000 +0300
|
|||
+++ coreutils-8.30.mod/src/tac.c 2019-03-01 20:13:29.470380749 +0200
|
|||
@@ -67,7 +67,7 @@
|
|||
|
|||
|
|||
#ifndef DEFAULT_TMPDIR |
|||
-# define DEFAULT_TMPDIR "/tmp"
|
|||
+# define DEFAULT_TMPDIR "@TERMUX_PREFIX@/tmp"
|
|||
#endif |
|||
|
|||
/* The number of bytes per atomic read. */ |
|||
@ -1,21 +0,0 @@ |
|||
diff -u -r ../coreutils-8.22/src/mktemp.c ./src/mktemp.c
|
|||
--- ../coreutils-8.22/src/mktemp.c 2013-12-04 15:48:30.000000000 +0100
|
|||
+++ ./src/mktemp.c 2014-06-03 11:31:58.351787119 +0200
|
|||
@@ -269,7 +269,7 @@
|
|||
else if (dest_dir_arg && *dest_dir_arg) |
|||
dest_dir = dest_dir_arg; |
|||
else |
|||
- dest_dir = "/tmp";
|
|||
+ dest_dir = "@TERMUX_PREFIX@/tmp";
|
|||
|
|||
if (last_component (template) != template) |
|||
error (EXIT_FAILURE, 0, |
|||
@@ -283,7 +283,7 @@
|
|||
else |
|||
{ |
|||
char *env = getenv ("TMPDIR"); |
|||
- dest_dir = (env && *env ? env : "/tmp");
|
|||
+ dest_dir = (env && *env ? env : "@TERMUX_PREFIX@/tmp");
|
|||
} |
|||
if (IS_ABSOLUTE_FILE_NAME (template)) |
|||
error (EXIT_FAILURE, 0, |
|||
@ -1,7 +1,6 @@ |
|||
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/ddrescue/ |
|||
TERMUX_PKG_DESCRIPTION="GNU data recovery tool" |
|||
TERMUX_PKG_LICENSE="GPL-3.0" |
|||
TERMUX_PKG_VERSION=1.23 |
|||
TERMUX_PKG_REVISION=1 |
|||
TERMUX_PKG_SHA256=a9ae2dd44592bf386c9c156a5dacaeeb901573c9867ada3608f887d401338d8d |
|||
TERMUX_PKG_VERSION=1.24 |
|||
TERMUX_PKG_SHA256=4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087 |
|||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ddrescue/ddrescue-${TERMUX_PKG_VERSION}.tar.lz |
|||
|
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr bind-9.13.6/lib/irs/context.c bind-9.13.6.mod/lib/irs/context.c
|
|||
--- bind-9.13.6/lib/irs/context.c 2019-02-07 01:44:09.000000000 +0200
|
|||
+++ bind-9.13.6.mod/lib/irs/context.c 2019-03-02 02:39:12.188552664 +0200
|
|||
@@ -42,7 +42,7 @@
|
|||
|
|||
#ifndef DNS_CONF |
|||
/*% location of dns.conf */ |
|||
-#define DNS_CONF "/etc/dns.conf"
|
|||
+#define DNS_CONF "@TERMUX_PREFIX@/etc/dns.conf"
|
|||
#endif |
|||
|
|||
static bool thread_key_initialized = false; |
|||
@ -0,0 +1,21 @@ |
|||
diff -uNr ffmpeg-4.1.1/libavutil/file_open.c ffmpeg-4.1.1.mod/libavutil/file_open.c
|
|||
--- ffmpeg-4.1.1/libavutil/file_open.c 2019-02-09 22:56:02.000000000 +0200
|
|||
+++ ffmpeg-4.1.1.mod/libavutil/file_open.c 2019-03-02 01:54:58.775236751 +0200
|
|||
@@ -119,7 +119,7 @@
|
|||
#undef free |
|||
free(ptr); |
|||
#else |
|||
- size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
|
|||
+ size_t len = strlen(prefix) + strlen("@TERMUX_PREFIX@/tmp/") + 7; /* room for "@TERMUX_PREFIX@/tmp/" and "XXXXXX\0" */
|
|||
*filename = av_malloc(len); |
|||
#endif |
|||
/* -----common section-----*/ |
|||
@@ -136,7 +136,7 @@
|
|||
# endif |
|||
fd = open(*filename, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600); |
|||
#else |
|||
- snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
|
|||
+ snprintf(*filename, len, "@TERMUX_PREFIX@/tmp/%sXXXXXX", prefix);
|
|||
fd = mkstemp(*filename); |
|||
#if defined(_WIN32) || defined (__ANDROID__) |
|||
if (fd < 0) { |
|||
@ -0,0 +1,24 @@ |
|||
diff -uNr file-5.35/src/compress.c file-5.35.mod/src/compress.c
|
|||
--- file-5.35/src/compress.c 2018-10-15 19:29:16.000000000 +0300
|
|||
+++ file-5.35.mod/src/compress.c 2019-03-02 01:49:14.754069208 +0200
|
|||
@@ -410,7 +410,7 @@
|
|||
ssize_t r; |
|||
int tfd; |
|||
|
|||
- (void)strlcpy(buf, "/tmp/file.XXXXXX", sizeof buf);
|
|||
+ (void)strlcpy(buf, "@TERMUX_PREFIX@/tmp/file.XXXXXX", sizeof buf);
|
|||
#ifndef HAVE_MKSTEMP |
|||
{ |
|||
char *ptr = mktemp(buf); |
|||
diff -uNr file-5.35/src/file.h file-5.35.mod/src/file.h
|
|||
--- file-5.35/src/file.h 2018-10-15 19:29:16.000000000 +0300
|
|||
+++ file-5.35.mod/src/file.h 2019-03-02 01:49:41.984157713 +0200
|
|||
@@ -79,7 +79,7 @@
|
|||
#define ENABLE_CONDITIONALS |
|||
|
|||
#ifndef MAGIC |
|||
-#define MAGIC "/etc/magic"
|
|||
+#define MAGIC "@TERMUX_PREFIX@/etc/magic"
|
|||
#endif |
|||
|
|||
#if defined(__EMX__) || defined (WIN32) |
|||
@ -1,12 +0,0 @@ |
|||
diff -u -r ../gdk-pixbuf-2.36.9/Makefile.in ./Makefile.in
|
|||
--- ../gdk-pixbuf-2.36.9/Makefile.in 2017-08-19 17:24:08.000000000 +0000
|
|||
+++ ./Makefile.in 2017-12-02 00:17:57.592766016 +0000
|
|||
@@ -451,7 +451,7 @@
|
|||
top_build_prefix = @top_build_prefix@ |
|||
top_builddir = @top_builddir@ |
|||
top_srcdir = @top_srcdir@ |
|||
-SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32
|
|||
+SUBDIRS = gdk-pixbuf po docs tests contrib win32
|
|||
meson_files = \ |
|||
meson.build \ |
|||
meson_options.txt \ |
|||
@ -1,12 +1,13 @@ |
|||
TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/gdk-pixbuf/ |
|||
TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation" |
|||
TERMUX_PKG_LICENSE="LGPL-2.1" |
|||
TERMUX_PKG_VERSION=2.36.12 |
|||
TERMUX_PKG_SHA256=fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334 |
|||
TERMUX_PKG_VERSION=2.38.1 |
|||
TERMUX_PKG_SHA256=f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a |
|||
TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz |
|||
TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo" |
|||
TERMUX_PKG_DEVPACKAGE_DEPENDS="libpng-dev, glib-dev" |
|||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" |
|||
gio_can_sniff=no |
|||
--disable-glibtest |
|||
-Dgio_sniffing=false |
|||
-Dgir=false |
|||
-Dx11=false |
|||
" |
|||
|
|||
@ -1,42 +0,0 @@ |
|||
diff -u -r ../gnupg-2.1.22/dirmngr/dns.c ./dirmngr/dns.c
|
|||
--- ../gnupg-2.1.22/dirmngr/dns.c 2017-07-25 09:37:05.000000000 +0200
|
|||
+++ ./dirmngr/dns.c 2017-07-29 20:54:37.445647974 +0200
|
|||
@@ -5424,7 +5424,7 @@
|
|||
if (!(resconf = dns_resconf_open(&error))) |
|||
goto error; |
|||
|
|||
- if ((error = dns_resconf_loadpath(resconf, "/etc/resolv.conf"))) {
|
|||
+ if ((error = dns_resconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/resolv.conf"))) {
|
|||
/* |
|||
* NOTE: Both the glibc and BIND9 resolvers ignore a missing |
|||
* /etc/resolv.conf, defaulting to a nameserver of |
|||
@@ -5436,7 +5436,7 @@
|
|||
goto error; |
|||
} |
|||
|
|||
- if ((error = dns_nssconf_loadpath(resconf, "/etc/nsswitch.conf"))) {
|
|||
+ if ((error = dns_nssconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/nsswitch.conf"))) {
|
|||
if (error != ENOENT) |
|||
goto error; |
|||
} |
|||
@@ -10407,7 +10407,7 @@
|
|||
panic("dns_resconf_open: %s", dns_strerror(error)); |
|||
|
|||
if (!MAIN.resconf.count) |
|||
- MAIN.resconf.path[MAIN.resconf.count++] = "/etc/resolv.conf";
|
|||
+ MAIN.resconf.path[MAIN.resconf.count++] = "@TERMUX_PREFIX@/etc/resolv.conf";
|
|||
|
|||
for (i = 0; i < MAIN.resconf.count; i++) { |
|||
path = MAIN.resconf.path[i]; |
|||
diff -u -r ../gnupg-2.1.22/dirmngr/dns-stuff.c ./dirmngr/dns-stuff.c
|
|||
--- ../gnupg-2.1.22/dirmngr/dns-stuff.c 2017-05-25 20:24:30.000000000 +0200
|
|||
+++ ./dirmngr/dns-stuff.c 2017-07-29 20:54:00.414067929 +0200
|
|||
@@ -114,7 +114,7 @@
|
|||
#define DEFAULT_TIMEOUT 30 |
|||
|
|||
|
|||
-#define RESOLV_CONF_NAME "/etc/resolv.conf"
|
|||
+#define RESOLV_CONF_NAME "@TERMUX_PREFIX@/etc/resolv.conf"
|
|||
|
|||
/* Two flags to enable verbose and debug mode. */ |
|||
static int opt_verbose; |
|||
@ -0,0 +1,240 @@ |
|||
diff -uNr gnupg-2.2.13/dirmngr/certcache.c gnupg-2.2.13.mod/dirmngr/certcache.c
|
|||
--- gnupg-2.2.13/dirmngr/certcache.c 2018-04-25 13:38:04.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/dirmngr/certcache.c 2019-03-02 01:32:08.653821497 +0200
|
|||
@@ -674,11 +674,8 @@
|
|||
#ifdef DEFAULT_TRUST_STORE_FILE |
|||
{ DEFAULT_TRUST_STORE_FILE } |
|||
#else |
|||
- { "/etc/ssl/ca-bundle.pem" },
|
|||
- { "/etc/ssl/certs/ca-certificates.crt" },
|
|||
- { "/etc/pki/tls/cert.pem" },
|
|||
- { "/usr/local/share/certs/ca-root-nss.crt" },
|
|||
- { "/etc/ssl/cert.pem" }
|
|||
+ { "@TERMUX_PREFIX@/etc/tls/cert.pem" },
|
|||
+ { "@TERMUX_PREFIX@/etc/ssl/cert.pem" }
|
|||
#endif /*!DEFAULT_TRUST_STORE_FILE*/ |
|||
}; |
|||
int idx; |
|||
diff -uNr gnupg-2.2.13/dirmngr/dns.c gnupg-2.2.13.mod/dirmngr/dns.c
|
|||
--- gnupg-2.2.13/dirmngr/dns.c 2018-12-18 09:26:53.000000000 +0200
|
|||
+++ gnupg-2.2.13.mod/dirmngr/dns.c 2019-03-02 01:33:24.937449148 +0200
|
|||
@@ -5112,7 +5112,7 @@
|
|||
if (!(hosts = dns_hosts_open(&error))) |
|||
goto error; |
|||
|
|||
- if ((error = dns_hosts_loadpath(hosts, "/etc/hosts")))
|
|||
+ if ((error = dns_hosts_loadpath(hosts, "@TERMUX_PREFIX@/etc/hosts")))
|
|||
goto error; |
|||
|
|||
return hosts; |
|||
@@ -5428,7 +5428,7 @@
|
|||
if (!(resconf = dns_resconf_open(&error))) |
|||
goto error; |
|||
|
|||
- if ((error = dns_resconf_loadpath(resconf, "/etc/resolv.conf"))) {
|
|||
+ if ((error = dns_resconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/resolv.conf"))) {
|
|||
/* |
|||
* NOTE: Both the glibc and BIND9 resolvers ignore a missing |
|||
* /etc/resolv.conf, defaulting to a nameserver of |
|||
@@ -5440,7 +5440,7 @@
|
|||
goto error; |
|||
} |
|||
|
|||
- if ((error = dns_nssconf_loadpath(resconf, "/etc/nsswitch.conf"))) {
|
|||
+ if ((error = dns_nssconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/nsswitch.conf"))) {
|
|||
if (error != ENOENT) |
|||
goto error; |
|||
} |
|||
@@ -10436,7 +10436,7 @@
|
|||
panic("dns_resconf_open: %s", dns_strerror(error)); |
|||
|
|||
if (!MAIN.resconf.count) |
|||
- MAIN.resconf.path[MAIN.resconf.count++] = "/etc/resolv.conf";
|
|||
+ MAIN.resconf.path[MAIN.resconf.count++] = "@TERMUX_PREFIX@/etc/resolv.conf";
|
|||
|
|||
for (i = 0; i < MAIN.resconf.count; i++) { |
|||
path = MAIN.resconf.path[i]; |
|||
@@ -10485,11 +10485,11 @@
|
|||
return *hosts; |
|||
|
|||
if (!MAIN.hosts.count) { |
|||
- MAIN.hosts.path[MAIN.hosts.count++] = "/etc/hosts";
|
|||
+ MAIN.hosts.path[MAIN.hosts.count++] = "@TERMUX_PREFIX@/etc/hosts";
|
|||
|
|||
/* Explicitly test dns_hosts_local() */ |
|||
if (!(*hosts = dns_hosts_local(&error))) |
|||
- panic("%s: %s", "/etc/hosts", dns_strerror(error));
|
|||
+ panic("%s: %s", "@TERMUX_PREFIX@/etc/hosts", dns_strerror(error));
|
|||
|
|||
return *hosts; |
|||
} |
|||
diff -uNr gnupg-2.2.13/dirmngr/dns-stuff.c gnupg-2.2.13.mod/dirmngr/dns-stuff.c
|
|||
--- gnupg-2.2.13/dirmngr/dns-stuff.c 2018-07-03 12:54:26.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/dirmngr/dns-stuff.c 2019-03-02 01:32:38.027267980 +0200
|
|||
@@ -114,7 +114,7 @@
|
|||
#define DEFAULT_TIMEOUT 30 |
|||
|
|||
|
|||
-#define RESOLV_CONF_NAME "/etc/resolv.conf"
|
|||
+#define RESOLV_CONF_NAME "@TERMUX_PREFIX@/etc/resolv.conf"
|
|||
|
|||
/* Two flags to enable verbose and debug mode. */ |
|||
static int opt_verbose; |
|||
@@ -602,7 +602,7 @@
|
|||
derr = dns_hosts_loadpath (ld.hosts, hosts_path); |
|||
xfree (hosts_path); |
|||
#else |
|||
- derr = dns_hosts_loadpath (ld.hosts, "/etc/hosts");
|
|||
+ derr = dns_hosts_loadpath (ld.hosts, "@TERMUX_PREFIX@/etc/hosts");
|
|||
#endif |
|||
if (derr) |
|||
{ |
|||
diff -uNr gnupg-2.2.13/dirmngr/ks-engine-ldap.c gnupg-2.2.13.mod/dirmngr/ks-engine-ldap.c
|
|||
--- gnupg-2.2.13/dirmngr/ks-engine-ldap.c 2018-10-25 18:37:53.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/dirmngr/ks-engine-ldap.c 2019-03-02 01:32:08.667154882 +0200
|
|||
@@ -1947,9 +1947,9 @@
|
|||
|
|||
if (dump_modlist) |
|||
{ |
|||
- dump = es_fopen("/tmp/modlist.txt", "w");
|
|||
+ dump = es_fopen("@TERMUX_PREFIX@/tmp/modlist.txt", "w");
|
|||
if (! dump) |
|||
- log_error ("Failed to open /tmp/modlist.txt: %s\n",
|
|||
+ log_error ("Failed to open @TERMUX_PREFIX@/tmp/modlist.txt: %s\n",
|
|||
strerror (errno)); |
|||
|
|||
if (dump) |
|||
diff -uNr gnupg-2.2.13/g10/exec.c gnupg-2.2.13.mod/g10/exec.c
|
|||
--- gnupg-2.2.13/g10/exec.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/g10/exec.c 2019-03-02 01:32:08.667154882 +0200
|
|||
@@ -180,7 +180,7 @@
|
|||
tmp="<Wimp$ScrapDir>.GnuPG"; |
|||
mkdir(tmp,0700); /* Error checks occur later on */ |
|||
#else |
|||
- tmp="/tmp";
|
|||
+ tmp="@TERMUX_PREFIX@/tmp";
|
|||
#endif |
|||
} |
|||
} |
|||
@@ -383,7 +383,7 @@
|
|||
char *shell=getenv("SHELL"); |
|||
|
|||
if(shell==NULL) |
|||
- shell="/bin/sh";
|
|||
+ shell="@TERMUX_PREFIX@/bin/sh";
|
|||
|
|||
/* I'm the child */ |
|||
|
|||
diff -uNr gnupg-2.2.13/g13/be-encfs.c gnupg-2.2.13.mod/g13/be-encfs.c
|
|||
--- gnupg-2.2.13/g13/be-encfs.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/g13/be-encfs.c 2019-03-02 01:32:08.670488228 +0200
|
|||
@@ -410,7 +410,7 @@
|
|||
if (err) |
|||
goto leave; |
|||
|
|||
- mountpoint = xtrystrdup ("/tmp/.#g13_XXXXXX");
|
|||
+ mountpoint = xtrystrdup ("@TERMUX_PREFIX@/tmp/.#g13_XXXXXX");
|
|||
if (!mountpoint) |
|||
{ |
|||
err = gpg_error_from_syserror (); |
|||
@@ -420,7 +420,7 @@
|
|||
{ |
|||
err = gpg_error_from_syserror (); |
|||
log_error (_("can't create directory '%s': %s\n"), |
|||
- "/tmp/.#g13_XXXXXX", gpg_strerror (err));
|
|||
+ "@TERMUX_PREFIX@/tmp/.#g13_XXXXXX", gpg_strerror (err));
|
|||
goto leave; |
|||
} |
|||
|
|||
diff -uNr gnupg-2.2.13/g13/mount.c gnupg-2.2.13.mod/g13/mount.c
|
|||
--- gnupg-2.2.13/g13/mount.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/g13/mount.c 2019-03-02 01:32:08.670488228 +0200
|
|||
@@ -82,14 +82,14 @@
|
|||
|
|||
if (!mountpoint) |
|||
{ |
|||
- mountpoint_buffer = xtrystrdup ("/tmp/g13-XXXXXX");
|
|||
+ mountpoint_buffer = xtrystrdup ("@TERMUX_PREFIX@/tmp/g13-XXXXXX");
|
|||
if (!mountpoint_buffer) |
|||
return gpg_error_from_syserror (); |
|||
if (!gnupg_mkdtemp (mountpoint_buffer)) |
|||
{ |
|||
err = gpg_error_from_syserror (); |
|||
log_error (_("can't create directory '%s': %s\n"), |
|||
- "/tmp/g13-XXXXXX", gpg_strerror (err));
|
|||
+ "@TERMUX_PREFIX@/tmp/g13-XXXXXX", gpg_strerror (err));
|
|||
xfree (mountpoint_buffer); |
|||
return err; |
|||
} |
|||
diff -uNr gnupg-2.2.13/scd/scdaemon.c gnupg-2.2.13.mod/scd/scdaemon.c
|
|||
--- gnupg-2.2.13/scd/scdaemon.c 2018-03-21 20:43:33.000000000 +0200
|
|||
+++ gnupg-2.2.13.mod/scd/scdaemon.c 2019-03-02 01:32:08.670488228 +0200
|
|||
@@ -766,10 +766,10 @@
|
|||
write. */ |
|||
if (allow_coredump) |
|||
{ |
|||
- if (chdir("/tmp"))
|
|||
- log_debug ("chdir to '/tmp' failed: %s\n", strerror (errno));
|
|||
+ if (chdir("@TERMUX_PREFIX@/tmp"))
|
|||
+ log_debug ("chdir to '@TERMUX_PREFIX@/tmp' failed: %s\n", strerror (errno));
|
|||
else |
|||
- log_debug ("changed working directory to '/tmp'\n");
|
|||
+ log_debug ("changed working directory to '@TERMUX_PREFIX@/tmp'\n");
|
|||
} |
|||
|
|||
/* In multi server mode we need to listen on an additional |
|||
diff -uNr gnupg-2.2.13/tests/gpgscm/ffi.c gnupg-2.2.13.mod/tests/gpgscm/ffi.c
|
|||
--- gnupg-2.2.13/tests/gpgscm/ffi.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/tests/gpgscm/ffi.c 2019-03-02 01:32:08.673821575 +0200
|
|||
@@ -355,7 +355,7 @@
|
|||
FFI_RETURN_STRING (sc, "/temp"); |
|||
FFI_RETURN_STRING (sc, buffer); |
|||
#else |
|||
- FFI_RETURN_STRING (sc, "/tmp");
|
|||
+ FFI_RETURN_STRING (sc, "@TERMUX_PREFIX@/tmp");
|
|||
#endif |
|||
} |
|||
|
|||
diff -uNr gnupg-2.2.13/tools/addgnupghome gnupg-2.2.13.mod/tools/addgnupghome
|
|||
--- gnupg-2.2.13/tools/addgnupghome 2018-12-11 09:44:33.000000000 +0200
|
|||
+++ gnupg-2.2.13.mod/tools/addgnupghome 2019-03-02 01:32:08.673821575 +0200
|
|||
@@ -70,10 +70,10 @@
|
|||
return |
|||
fi |
|||
for f in $filelist; do |
|||
- if [ -d /etc/skel/.gnupg/$f ]; then
|
|||
+ if [ -d @TERMUX_PREFIX@/etc/skel/.gnupg/$f ]; then
|
|||
mkdir $f |
|||
else |
|||
- cp /etc/skel/.gnupg/$f $f
|
|||
+ cp @TERMUX_PREFIX@/etc/skel/.gnupg/$f $f
|
|||
fi |
|||
if ! chown $user $f ; then |
|||
error "error changing ownership of \`$f'" |
|||
@@ -102,11 +102,11 @@
|
|||
info "please note that only users from /etc/passwd are checked" |
|||
fi |
|||
|
|||
-if [ ! -d /etc/skel/.gnupg ]; then
|
|||
- error "skeleton directory \`/etc/skel/.gnupg' does not exist"
|
|||
+if [ ! -d @TERMUX_PREFIX@/etc/skel/.gnupg ]; then
|
|||
+ error "skeleton directory \`@TERMUX_PREFIX@/etc/skel/.gnupg' does not exist"
|
|||
exit 1 |
|||
fi |
|||
-cd "/etc/skel/.gnupg" || (error "error cd-ing to \`/etc/skel/.gnupg'"; exit 1)
|
|||
+cd "@TERMUX_PREFIX@/etc/skel/.gnupg" || (error "error cd-ing to \`@TERMUX_PREFIX@/etc/skel/.gnupg'"; exit 1)
|
|||
filelist=$(find . \( -type f -o -type d \) '!' -name '*~' '!' -name . -print) |
|||
|
|||
|
|||
diff -uNr gnupg-2.2.13/tools/symcryptrun.c gnupg-2.2.13.mod/tools/symcryptrun.c
|
|||
--- gnupg-2.2.13/tools/symcryptrun.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.13.mod/tools/symcryptrun.c 2019-03-02 01:32:08.673821575 +0200
|
|||
@@ -319,7 +319,7 @@
|
|||
|
|||
p = getenv ("TMPDIR"); |
|||
if (!p || !*p) |
|||
- p = "/tmp";
|
|||
+ p = "@TERMUX_PREFIX@/tmp";
|
|||
if (p[strlen (p) - 1] == '/') |
|||
name = xstrconcat (p, "gpg-XXXXXX", NULL); |
|||
else |
|||
@ -1,12 +0,0 @@ |
|||
diff -uNr gnupg-2.2.8/g10/exec.c gnupg-2.2.8.mod/g10/exec.c
|
|||
--- gnupg-2.2.8/g10/exec.c 2017-08-28 13:22:54.000000000 +0300
|
|||
+++ gnupg-2.2.8.mod/g10/exec.c 2018-06-19 19:08:38.918070875 +0300
|
|||
@@ -383,7 +383,7 @@
|
|||
char *shell=getenv("SHELL"); |
|||
|
|||
if(shell==NULL) |
|||
- shell="/bin/sh";
|
|||
+ shell="@TERMUX_PREFIX@/bin/sh";
|
|||
|
|||
/* I'm the child */ |
|||
|
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr gzip-1.10/zdiff.in gzip-1.10.mod/zdiff.in
|
|||
--- gzip-1.10/zdiff.in 2018-03-31 06:55:32.000000000 +0300
|
|||
+++ gzip-1.10.mod/zdiff.in 2019-03-01 18:41:43.685032331 +0200
|
|||
@@ -119,7 +119,7 @@
|
|||
case $TMPDIR in |
|||
/ | /*/) ;; |
|||
/*) TMPDIR=$TMPDIR/;; |
|||
- *) TMPDIR=/tmp/;;
|
|||
+ *) TMPDIR=@TERMUX_PREFIX@/tmp/;;
|
|||
esac |
|||
if type mktemp >/dev/null 2>&1; then |
|||
tmp=`mktemp "${TMPDIR}zdiffXXXXXXXXX"` || |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr gzip-1.10/zgrep.in gzip-1.10.mod/zgrep.in
|
|||
--- gzip-1.10/zgrep.in 2018-03-31 06:55:32.000000000 +0300
|
|||
+++ gzip-1.10.mod/zgrep.in 2019-03-01 18:41:31.001645453 +0200
|
|||
@@ -136,7 +136,7 @@
|
|||
case $TMPDIR in |
|||
/ | /*/) ;; |
|||
/*) TMPDIR=$TMPDIR/;; |
|||
- *) TMPDIR=/tmp/;;
|
|||
+ *) TMPDIR=@TERMUX_PREFIX@/tmp/;;
|
|||
esac |
|||
if type mktemp >/dev/null 2>&1; then |
|||
pattmp=$(mktemp "${TMPDIR}zgrepXXXXXXXXX") || exit 2 |
|||
@ -0,0 +1,42 @@ |
|||
diff -uNr irssi-1.2.0/src/fe-common/core/fe-exec.c irssi-1.2.0.mod/src/fe-common/core/fe-exec.c
|
|||
--- irssi-1.2.0/src/fe-common/core/fe-exec.c 2019-02-11 19:27:58.000000000 +0200
|
|||
+++ irssi-1.2.0.mod/src/fe-common/core/fe-exec.c 2019-03-01 20:46:39.912473788 +0200
|
|||
@@ -281,7 +281,7 @@
|
|||
|
|||
static void process_exec(PROCESS_REC *rec, const char *cmd) |
|||
{ |
|||
- const char *shell_args[4] = { "/bin/sh", "-c", NULL, NULL };
|
|||
+ const char *shell_args[4] = { "@TERMUX_PREFIX@/bin/sh", "-c", NULL, NULL };
|
|||
char **args; |
|||
int in[2], out[2]; |
|||
int n; |
|||
@@ -339,7 +339,7 @@
|
|||
if (rec->shell) { |
|||
execvp(shell_args[0], (char **) shell_args); |
|||
|
|||
- fprintf(stderr, "Exec: /bin/sh: %s\n", g_strerror(errno));
|
|||
+ fprintf(stderr, "Exec: @TERMUX_PREFIX@/bin/sh: %s\n", g_strerror(errno));
|
|||
} else { |
|||
args = g_strsplit(cmd, " ", -1); |
|||
execvp(args[0], args); |
|||
diff -uNr irssi-1.2.0/src/fe-fuzz/fe-common/core/theme-load.c irssi-1.2.0.mod/src/fe-fuzz/fe-common/core/theme-load.c
|
|||
--- irssi-1.2.0/src/fe-fuzz/fe-common/core/theme-load.c 2019-02-11 19:27:58.000000000 +0200
|
|||
+++ irssi-1.2.0.mod/src/fe-fuzz/fe-common/core/theme-load.c 2019-03-01 20:47:09.179339329 +0200
|
|||
@@ -38,7 +38,7 @@
|
|||
int LLVMFuzzerInitialize(int *argc, char ***argv) { |
|||
core_register_options(); |
|||
fe_common_core_register_options(); |
|||
- char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
|
|||
+ char *irssi_argv[] = {*argv[0], "--home", "@TERMUX_PREFIX@/tmp/irssi", NULL};
|
|||
int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1; |
|||
args_execute(irssi_argc, irssi_argv); |
|||
core_preinit((*argv)[0]); |
|||
@@ -52,7 +52,7 @@
|
|||
int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { |
|||
gchar *copy = g_strndup((const gchar *)data, size); |
|||
|
|||
- FILE *fp = fopen("/tmp/irssi/fuzz.theme", "wb");
|
|||
+ FILE *fp = fopen("@TERMUX_PREFIX@/tmp/irssi/fuzz.theme", "wb");
|
|||
if (fp) { |
|||
fwrite(copy, strlen(copy), 1, fp); |
|||
fclose(fp); |
|||
@ -0,0 +1,12 @@ |
|||
diff -uNr libarchive-3.3.3/libarchive/archive_util.c libarchive-3.3.3.mod/libarchive/archive_util.c
|
|||
--- libarchive-3.3.3/libarchive/archive_util.c 2018-09-02 09:05:18.000000000 +0300
|
|||
+++ libarchive-3.3.3.mod/libarchive/archive_util.c 2019-03-02 02:14:39.252942170 +0200
|
|||
@@ -374,7 +374,7 @@
|
|||
#ifdef _PATH_TMP |
|||
tmp = _PATH_TMP; |
|||
#else |
|||
- tmp = "/tmp";
|
|||
+ tmp = "@TERMUX_PREFIX@/tmp";
|
|||
#endif |
|||
archive_strcpy(temppath, tmp); |
|||
if (temppath->s[temppath->length-1] != '/') |
|||
@ -0,0 +1,21 @@ |
|||
diff -uNr bzip2-1.0.6/bzdiff bzip2-1.0.6.mod/bzdiff
|
|||
--- bzip2-1.0.6/bzdiff 2007-01-03 04:00:55.000000000 +0200
|
|||
+++ bzip2-1.0.6.mod/bzdiff 2019-03-01 20:44:12.401418675 +0200
|
|||
@@ -37,7 +37,7 @@
|
|||
echo "Usage: $prog [${comp}_options] file [file]" |
|||
exit 1 |
|||
fi |
|||
-tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
|
|||
+tmp=`mktemp ${TMPDIR:-@TERMUX_PREFIX@/tmp}/bzdiff.XXXXXXXXXX` || {
|
|||
echo 'cannot create a temporary file' >&2 |
|||
exit 1 |
|||
} |
|||
@@ -56,7 +56,7 @@
|
|||
bzip2 -cdfq "$2" > $tmp |
|||
bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp |
|||
STAT="$?" |
|||
- /bin/rm -f $tmp;;
|
|||
+ rm -f $tmp;;
|
|||
|
|||
*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" |
|||
STAT="$?";; |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue