From 808639c2bc066ceba3a261d7f08049738e17e71e Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 5 Oct 2018 23:04:48 +0300 Subject: [PATCH] pinentry-gtk: fix paths (/tmp) --- .../pinentry-1.1.0_pinentry_pinentry-emacs.c.patch | 12 ++++++++++++ .../pinentry-1.1.0_pinentry_pinentry.c.patch | 14 ++++++++++++++ .../pinentry-gtk/pinentry-pinentry.c.patch | 14 -------------- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry-emacs.c.patch create mode 100644 x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry.c.patch delete mode 100644 x11-packages/pinentry-gtk/pinentry-pinentry.c.patch diff --git a/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry-emacs.c.patch b/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry-emacs.c.patch new file mode 100644 index 000000000..f594c512a --- /dev/null +++ b/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry-emacs.c.patch @@ -0,0 +1,12 @@ +diff -uNr pinentry-1.1.0/pinentry/pinentry-emacs.c pinentry-1.1.0.mod/pinentry/pinentry-emacs.c +--- pinentry-1.1.0/pinentry/pinentry-emacs.c 2017-12-03 18:13:05.000000000 +0200 ++++ pinentry-1.1.0.mod/pinentry/pinentry-emacs.c 2018-10-05 23:01:47.025402891 +0300 +@@ -134,7 +134,7 @@ + } + else + #endif +- tmpdir = "/tmp"; ++ tmpdir = "@TERMUX_PREFIX@/tmp"; + } + + socket_name_storage = malloc (strlen (tmpdir) diff --git a/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry.c.patch b/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry.c.patch new file mode 100644 index 000000000..f931f531f --- /dev/null +++ b/x11-packages/pinentry-gtk/pinentry-1.1.0_pinentry_pinentry.c.patch @@ -0,0 +1,14 @@ +diff -uNr pinentry-1.1.0/pinentry/pinentry.c pinentry-1.1.0.mod/pinentry/pinentry.c +--- pinentry-1.1.0/pinentry/pinentry.c 2017-12-03 18:13:15.000000000 +0200 ++++ pinentry-1.1.0.mod/pinentry/pinentry.c 2018-10-05 23:01:15.445377981 +0300 +@@ -258,8 +258,10 @@ + { + if (! lc_ctype_unknown_warning) + { ++#ifndef __ANDROID__ + fprintf (stderr, "%s: no LC_CTYPE known - assuming UTF-8\n", + this_pgmname); ++#endif + lc_ctype_unknown_warning = 1; + } + return strdup (text); diff --git a/x11-packages/pinentry-gtk/pinentry-pinentry.c.patch b/x11-packages/pinentry-gtk/pinentry-pinentry.c.patch deleted file mode 100644 index ca95e0927..000000000 --- a/x11-packages/pinentry-gtk/pinentry-pinentry.c.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r ../pinentry-0.9.7/pinentry/pinentry.c ./pinentry/pinentry.c ---- ../pinentry-0.9.7/pinentry/pinentry.c 2015-09-16 14:47:52.000000000 -0400 -+++ ./pinentry/pinentry.c 2016-01-20 16:28:14.364196578 -0500 -@@ -213,8 +213,10 @@ - { - if (! lc_ctype_unknown_warning) - { -+#ifndef __ANDROID__ - fprintf (stderr, "%s: no LC_CTYPE known - assuming UTF-8\n", - this_pgmname); -+#endif - lc_ctype_unknown_warning = 1; - } - return strdup (text);