From f0d5110b0cf58b640be727c4a6ab988eeeb748ee Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 19 Jun 2018 17:45:19 +0300 Subject: [PATCH] libedit: update to 20180525-3.1 --- packages/libedit/build.sh | 4 ++-- packages/libedit/src-readline.c.patch | 15 ++++++++++++--- packages/libedit/src-vi.c.patch | 12 ++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 packages/libedit/src-vi.c.patch diff --git a/packages/libedit/build.sh b/packages/libedit/build.sh index ecf7a1f6d..4592e2c4d 100644 --- a/packages/libedit/build.sh +++ b/packages/libedit/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=http://thrysoee.dk/editline/ TERMUX_PKG_DESCRIPTION="Library providing line editing, history, and tokenization functions" -TERMUX_PKG_VERSION=20170329-3.1 +TERMUX_PKG_VERSION=20180525-3.1 TERMUX_PKG_SRCURL=http://thrysoee.dk/editline/libedit-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be +TERMUX_PKG_SHA256=c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116 TERMUX_PKG_DEPENDS="libandroid-support, ncurses" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man7/editline.7 share/man/man3/history.3" diff --git a/packages/libedit/src-readline.c.patch b/packages/libedit/src-readline.c.patch index 4bbc620f6..4d80734a1 100644 --- a/packages/libedit/src-readline.c.patch +++ b/packages/libedit/src-readline.c.patch @@ -1,6 +1,15 @@ -diff -u -r ../libedit-20170329-3.1/src/readline.c ./src/readline.c ---- ../libedit-20170329-3.1/src/readline.c 2017-03-29 20:15:04.000000000 +0200 -+++ ./src/readline.c 2017-04-07 02:16:41.501547191 +0200 +diff -uNr libedit-20170329-3.1/src/readline.c libedit-20170329-3.1.mod/src/readline.c +--- libedit-20170329-3.1/src/readline.c 2017-03-29 21:15:04.000000000 +0300 ++++ libedit-20170329-3.1.mod/src/readline.c 2018-06-19 17:16:05.344389818 +0300 +@@ -1198,7 +1198,7 @@ + return max_input_history != INT_MAX; + } + +-static const char _history_tmp_template[] = "/tmp/.historyXXXXXX"; ++static const char _history_tmp_template[] = "@TERMUX_PREFIX@/tmp/.historyXXXXXX"; + + int + history_truncate_file (const char *filename, int nlines) @@ -1772,6 +1772,9 @@ char * username_completion_function(const char *text, int state) diff --git a/packages/libedit/src-vi.c.patch b/packages/libedit/src-vi.c.patch new file mode 100644 index 000000000..c23542f53 --- /dev/null +++ b/packages/libedit/src-vi.c.patch @@ -0,0 +1,12 @@ +diff -uNr libedit-20170329-3.1/src/vi.c libedit-20170329-3.1.mod/src/vi.c +--- libedit-20170329-3.1/src/vi.c 2017-03-29 21:08:21.000000000 +0300 ++++ libedit-20170329-3.1.mod/src/vi.c 2018-06-19 17:16:24.144390787 +0300 +@@ -1004,7 +1004,7 @@ + pid_t pid; + ssize_t st; + int status; +- char tempfile[] = "/tmp/histedit.XXXXXXXXXX"; ++ char tempfile[] = "@TERMUX_PREFIX@/tmp/histedit.XXXXXXXXXX"; + char *cp = NULL; + size_t len; + wchar_t *line = NULL;