pinentry: Bump to 1.2.1

This commit is contained in:
Tee KOBAYASHI 2022-09-27 07:30:59 +09:00 committed by xtkoba
parent c9185f74bb
commit 8a846fe9f6
3 changed files with 26 additions and 16 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/pinentry/index.html
TERMUX_PKG_DESCRIPTION="Dialog allowing secure password entry"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.2.0
TERMUX_PKG_VERSION=1.2.1
TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-$TERMUX_PKG_VERSION.tar.bz2
TERMUX_PKG_SHA256=10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470
TERMUX_PKG_SHA256=457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
TERMUX_PKG_DEPENDS="libandroid-support, libassuan, libiconv, ncurses"
TERMUX_PKG_BUILD_DEPENDS="libgpg-error"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pinentry-fltk --without-libcap"

View File

@ -0,0 +1,24 @@
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -156,8 +156,10 @@ pinentry_utf8_to_local (const char *lc_c
{
if (! lc_ctype_unknown_warning)
{
+#ifndef __ANDROID__
fprintf (stderr, "%s: no LC_CTYPE known - assuming UTF-8\n",
pgmname);
+#endif
lc_ctype_unknown_warning = 1;
}
return strdup (text);
@@ -223,8 +225,10 @@ pinentry_local_to_utf8 (char *lc_ctype,
{
if (! lc_ctype_unknown_warning)
{
+#ifndef __ANDROID__
fprintf (stderr, "%s: no LC_CTYPE known - assuming UTF-8\n",
pgmname);
+#endif
lc_ctype_unknown_warning = 1;
}
output_buf = secure? secmem_malloc (input_len) : malloc (input_len);

View File

@ -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);