pinentry: update to 1.1.1

Provided by Michael Baeuerle via pkgsrc-wip.

Add pinentry-qt5, remove pinentry-qt4.

Noteworthy changes in version 1.1.1 (2021-01-21)
------------------------------------------------

  * A EFL-based pinentry has been contributed.

  * Disable echoing in backspace key is pressed first
    (GTK, Qt, TQt, and ncurses pinentries).

  * Support line editing in TTY pinentry.

  * Remove support for old GTK+2 (< 2.12.0).

  * Various minor fixes.

16 files changed, 60 insertions, 127 deletions

diff --git a/security/Makefile b/security/Makefile
index 45932b00aff..476bca07b9a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.800 2021/01/23 10:59:55 pin Exp $
+# $NetBSD: Makefile,v 1.801 2021/02/06 10:26:53 wiz Exp $
 #
 
 COMMENT=	Security tools
@@ -399,7 +399,7 @@ SUBDIR+=	pinentry-fltk
 SUBDIR+=	pinentry-gnome3
 SUBDIR+=	pinentry-gtk2
 SUBDIR+=	pinentry-mac
-SUBDIR+=	pinentry-qt4
+SUBDIR+=	pinentry-qt5
 SUBDIR+=	pinepgp
 SUBDIR+=	pius
 SUBDIR+=	pkcs11-helper
diff --git a/security/pinentry-fltk/Makefile b/security/pinentry-fltk/Makefile
index b900fe47ac2..602ccb1022f 100644
--- a/security/pinentry-fltk/Makefile
+++ b/security/pinentry-fltk/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2020/08/17 20:20:00 leot Exp $
+# $NetBSD: Makefile,v 1.5 2021/02/06 10:26:53 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-fltk-/}
-PKGREVISION=		1
 COMMENT=		Applications for entering PINs or Passphrases, FLTK enabled
 
 .include		"../../security/pinentry/Makefile.common"
 
-DISTINFO_FILE=		${.CURDIR}/distinfo
+#DISTINFO_FILE=		${.CURDIR}/distinfo
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config
 
@@ -16,6 +15,7 @@ CONFIGURE_ARGS+=	--disable-pinentry-curses
 CONFIGURE_ARGS+=	--disable-pinentry-emacs
 #CONFIGURE_ARGS+=	--disable-fallback-curses
 CONFIGURE_ARGS+=	--disable-pinentry-gnome3
+CONFIGURE_ARGS+=	--disable-pinentry-efl
 CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		fltk
diff --git a/security/pinentry-fltk/distinfo b/security/pinentry-fltk/distinfo
deleted file mode 100644
index a9405100d09..00000000000
--- a/security/pinentry-fltk/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1 2019/02/13 17:40:53 wiz Exp $
-
-SHA1 (pinentry-1.1.0.tar.bz2) = 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0
-RMD160 (pinentry-1.1.0.tar.bz2) = 33b1f9ae44172a0bba37ad4b7d264822e040fe9e
-SHA512 (pinentry-1.1.0.tar.bz2) = 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-Size (pinentry-1.1.0.tar.bz2) = 467702 bytes
-SHA1 (patch-fltk_main.cxx) = f74f3eb14f16e632386c46f5febea158700447fb
diff --git a/security/pinentry-fltk/patches/patch-fltk_main.cxx b/security/pinentry-fltk/patches/patch-fltk_main.cxx
deleted file mode 100644
index b68c0b7fd36..00000000000
--- a/security/pinentry-fltk/patches/patch-fltk_main.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-fltk_main.cxx,v 1.1 2019/02/13 17:39:36 wiz Exp $
-
-Handle '_' in labels as keyboard shortcuts (used by GPG2).
-Fix format string handling (Patch from Debian).
-
---- fltk/main.cxx.orig	2017-12-03 16:13:05.000000000 +0000
-+++ fltk/main.cxx
-@@ -78,6 +78,44 @@ static std::string escape_accel_utf8(con
- 	return result;
- }
- 
-+// For button labels
-+// Accelerator '_' (used e.g. by GPG2) is converted to '&' (for FLTK)
-+// '&' is escaped as in escape_accel_utf8()
-+static std::string convert_accel_utf8(const char *s)
-+{
-+	static bool last_was_underscore = false;
-+	std::string result;
-+	if (NULL != s)
-+	{
-+		result.reserve(strlen(s));
-+		for (const char *p = s; *p; ++p)
-+		{
-+			// & => &&
-+			if ('&' == *p)
-+				result.push_back(*p);
-+			// _ => & (handle '__' as escaped underscore)
-+			if ('_' == *p)
-+			{
-+				if (last_was_underscore)
-+				{
-+					result.push_back(*p);
-+					last_was_underscore = false;
-+				}
-+				else
-+					last_was_underscore = true;
-+			}
-+			else
-+			{
-+				if (last_was_underscore)
-+					result.push_back('&');
-+				result.push_back(*p);
-+				last_was_underscore = false;
-+			}
-+		}
-+	}
-+	return result;
-+}
-+
- class cancel_exception
- {
- 
-@@ -111,8 +149,8 @@ static int fltk_cmd_handler(pinentry_t p
- 		// TODO: Add parent window to pinentry-fltk window
- 		//if (pe->parent_wid){}
- 		std::string title  = !is_empty(pe->title)?pe->title:PGMNAME;
--		std::string ok 	   = escape_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
--		std::string cancel = escape_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
-+		std::string ok 	   = convert_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
-+		std::string cancel = convert_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
- 
- 		if (!!pe->pin) // password (or confirmation)
- 		{
-@@ -241,12 +279,12 @@ static int fltk_cmd_handler(pinentry_t p
- 				if (pe->one_button)
- 				{
- 					fl_ok = ok.c_str();
--					fl_message(message);
-+					fl_message("%s", message);
- 					result = 1; // OK
- 				}
- 				else if (pe->notok)
- 				{
--					switch (fl_choice(message, ok.c_str(), cancel.c_str(), pe->notok))
-+					switch (fl_choice("%s", ok.c_str(), cancel.c_str(), pe->notok, message))
- 					{
- 					case 0: result = 1; break;
- 					case 2: result = 0; break;
-@@ -256,7 +294,7 @@ static int fltk_cmd_handler(pinentry_t p
- 				}
- 				else
- 				{
--					switch (fl_choice(message, ok.c_str(), cancel.c_str(), NULL))
-+					switch (fl_choice("%s", ok.c_str(), cancel.c_str(), NULL, message))
- 					{
- 					case 0: result = 1; break;
- 					default:
diff --git a/security/pinentry-gnome3/Makefile b/security/pinentry-gnome3/Makefile
index 5d73bec3402..356a8dbb953 100644
--- a/security/pinentry-gnome3/Makefile
+++ b/security/pinentry-gnome3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/30 23:53:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2021/02/06 10:26:53 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-gnome3-/}
 COMMENT=		Applications for entering PINs or Passphrases, GNOME 3 enabled
@@ -13,6 +13,7 @@ CONFIGURE_ARGS+=	--disable-pinentry-emacs
 #CONFIGURE_ARGS+=	--disable-fallback-curses
 CONFIGURE_ARGS+=	--enable-pinentry-gnome3
 CONFIGURE_ARGS+=	--disable-pinentry-fltk
+CONFIGURE_ARGS+=	--disable-pinentry-efl
 CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		gnome3
diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
index 66c3367d57d..4529eebf72d 100644
--- a/security/pinentry-gtk2/Makefile
+++ b/security/pinentry-gtk2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2020/08/17 20:20:00 leot Exp $
+# $NetBSD: Makefile,v 1.53 2021/02/06 10:26:54 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-gtk2-/}
-PKGREVISION=		9
 COMMENT=		Applications for entering PINs or Passphrases, GTK+ enabled
 
 .include		"../../security/pinentry/Makefile.common"
@@ -14,9 +13,11 @@ CONFIGURE_ARGS+=	--disable-pinentry-emacs
 #CONFIGURE_ARGS+=	--disable-fallback-curses
 CONFIGURE_ARGS+=	--disable-pinentry-gnome3
 CONFIGURE_ARGS+=	--disable-pinentry-fltk
+CONFIGURE_ARGS+=	--disable-pinentry-efl
 CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		gtk+-2
 
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry-qt4/PLIST b/security/pinentry-qt4/PLIST
deleted file mode 100644
index e40cf66bf79..00000000000
--- a/security/pinentry-qt4/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/30 19:56:42 wiz Exp $
-bin/pinentry-qt
diff --git a/security/pinentry-qt4/DESCR b/security/pinentry-qt5/DESCR
index 4fb4c062781..3e3241b8629 100644
--- a/security/pinentry-qt4/DESCR
+++ b/security/pinentry-qt5/DESCR
@@ -3,4 +3,4 @@ utilize the Assuan protocol as described by the aegypten project.
 It provides programs for several graphical toolkits, such as GTK+ and
 QT, as well as for the console, using curses.
 
-This package contains the QT4 frontend.
+This package contains the QT5 frontend.
diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt5/Makefile
index 4314a355d0d..922d0c85657 100644
--- a/security/pinentry-qt4/Makefile
+++ b/security/pinentry-qt5/Makefile
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.43 2020/08/17 20:20:00 leot Exp $
+# $NetBSD: Makefile,v 1.1 2021/02/06 10:26:54 wiz Exp $
 
-PKGNAME=		${DISTNAME:S/pinentry-/pinentry-qt4-/}
-PKGREVISION=		4
-COMMENT=		Applications for entering PINs or Passphrases, qt4 enabled
+PKGNAME=		${DISTNAME:S/pinentry-/pinentry-qt5-/}
+COMMENT=		Applications for entering PINs or Passphrases, qt5 enabled
+CONFLICTS=		pinentry-qt4-[0-9]*
 
 .include		"../../security/pinentry/Makefile.common"
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		pkg-config gmake autoconf
+
 CONFIGURE_ARGS+=	--enable-pinentry-qt
 CONFIGURE_ARGS+=	--disable-pinentry-curses
 CONFIGURE_ARGS+=	--disable-pinentry-emacs
@@ -13,15 +17,15 @@ CONFIGURE_ARGS+=	--disable-pinentry-emacs
 CONFIGURE_ARGS+=	--disable-pinentry-gnome3
 CONFIGURE_ARGS+=	--disable-pinentry-gtk2
 CONFIGURE_ARGS+=	--disable-pinentry-fltk
-
-USE_LANGUAGES+=		c c++
-USE_TOOLS+=		pkg-config gmake
+CONFIGURE_ARGS+=	--disable-pinentry-efl
+CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		qt
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i -f
+
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
-.include "../../x11/qt4-libs/buildlink3.mk"
-#.include "../../security/libgpg-error/buildlink3.mk"
-#.include "../../security/libksba/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry-qt5/PLIST b/security/pinentry-qt5/PLIST
new file mode 100644
index 00000000000..07870ee665e
--- /dev/null
+++ b/security/pinentry-qt5/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/06 10:26:54 wiz Exp $
+bin/pinentry-qt
diff --git a/security/pinentry-qt5/distinfo b/security/pinentry-qt5/distinfo
new file mode 100644
index 00000000000..b8ad2edf48d
--- /dev/null
+++ b/security/pinentry-qt5/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2021/02/06 10:26:54 wiz Exp $
+
+SHA1 (pinentry-1.1.1.tar.bz2) = b8b88cab4fd844e3616d55aeba8f084f2b98fb0f
+RMD160 (pinentry-1.1.1.tar.bz2) = 1b1a42245564b57c0fc0695d1c3c2d68e1cbf3ba
+SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
+Size (pinentry-1.1.1.tar.bz2) = 515723 bytes
+SHA1 (patch-m4_qt.m4) = 70e9386c86e96e97ad2fd12312bd167005eeda65
diff --git a/security/pinentry-qt5/patches/patch-m4_qt.m4 b/security/pinentry-qt5/patches/patch-m4_qt.m4
new file mode 100644
index 00000000000..628b78b14a6
--- /dev/null
+++ b/security/pinentry-qt5/patches/patch-m4_qt.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-m4_qt.m4,v 1.1 2021/02/06 10:26:54 wiz Exp $
+
+The "-rpath" option requires an equal sign.
+
+--- m4/qt.m4.orig	2020-03-11 20:06:21.000000000 +0000
++++ m4/qt.m4
+@@ -59,7 +59,7 @@ AC_DEFUN([FIND_QT],
+ 
+     qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
+     if test -n "$qtlibdir"; then
+-        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
++        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath=\"$qtlibdir\""
+     fi
+ 
+     AC_CHECK_TOOL(MOC, moc)
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 1ab7bef0000..a5f2a77aeeb 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.51 2019/11/05 18:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2021/02/06 10:26:53 wiz Exp $
 
-PKGREVISION=		1
 COMMENT=		Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=	--enable-pinentry-tty
diff --git a/security/pinentry/Makefile.common b/security/pinentry/Makefile.common
index 63e62834b5e..f1cf835c17f 100644
--- a/security/pinentry/Makefile.common
+++ b/security/pinentry/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.14 2020/08/30 23:53:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2021/02/06 10:26:53 wiz Exp $
 # -*- Makefile -*-
 #
 # used by security/pinentry/Makefile
 # used by security/pinentry-fltk/Makefile
 # used by security/pinentry-gnome3/Makefile
 # used by security/pinentry-gtk2/Makefile
-# used by security/pinentry-qt4/Makefile
+# used by security/pinentry-qt5/Makefile
 
-PINENTRY_VERSION=	1.1.0
+PINENTRY_VERSION=	1.1.1
 DISTNAME=		pinentry-${PINENTRY_VERSION}
 
 CATEGORIES=		security
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+HOMEPAGE=		https://gnupg.org/related_software/pinentry/index.html
 LICENSE=		gnu-gpl-v2
 
 #PATCHDIR=		${.CURDIR}/../../security/pinentry/patches
diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk
index 68d1d8e7096..dc841acaf1c 100644
--- a/security/pinentry/buildlink3.mk
+++ b/security/pinentry/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:30 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2021/02/06 10:26:53 wiz Exp $
 
 BUILDLINK_TREE+=	pinentry
 
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index eb038e83ee8..5a306c0dc09 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2018/01/10 12:29:38 wiz Exp $
+$NetBSD: distinfo,v 1.25 2021/02/06 10:26:53 wiz Exp $
 
-SHA1 (pinentry-1.1.0.tar.bz2) = 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0
-RMD160 (pinentry-1.1.0.tar.bz2) = 33b1f9ae44172a0bba37ad4b7d264822e040fe9e
-SHA512 (pinentry-1.1.0.tar.bz2) = 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-Size (pinentry-1.1.0.tar.bz2) = 467702 bytes
+SHA1 (pinentry-1.1.1.tar.bz2) = b8b88cab4fd844e3616d55aeba8f084f2b98fb0f
+RMD160 (pinentry-1.1.1.tar.bz2) = 1b1a42245564b57c0fc0695d1c3c2d68e1cbf3ba
+SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
+Size (pinentry-1.1.1.tar.bz2) = 515723 bytes