Sat Feb 6 10:26:54 2021 UTC ()
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.


(wiz)
diff -r1.800 -r1.801 pkgsrc/security/Makefile
diff -r1.51 -r1.52 pkgsrc/security/pinentry/Makefile
diff -r1.14 -r1.15 pkgsrc/security/pinentry/Makefile.common
diff -r1.9 -r1.10 pkgsrc/security/pinentry/buildlink3.mk
diff -r1.24 -r1.25 pkgsrc/security/pinentry/distinfo
diff -r1.4 -r1.5 pkgsrc/security/pinentry-fltk/Makefile
diff -r1.1 -r0 pkgsrc/security/pinentry-fltk/distinfo
diff -r1.1 -r0 pkgsrc/security/pinentry-fltk/patches/patch-fltk_main.cxx
diff -r1.1 -r1.2 pkgsrc/security/pinentry-gnome3/Makefile
diff -r1.52 -r1.53 pkgsrc/security/pinentry-gtk2/Makefile
diff -r1.2 -r0 pkgsrc/security/pinentry-qt4/DESCR
diff -r1.2 -r0 pkgsrc/security/pinentry-qt4/PLIST
diff -r1.43 -r0 pkgsrc/security/pinentry-qt4/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry-qt5/DESCR
diff -r0 -r1.1 pkgsrc/security/pinentry-qt5/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry-qt5/PLIST
diff -r0 -r1.1 pkgsrc/security/pinentry-qt5/distinfo
diff -r0 -r1.1 pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4

cvs diff -r1.800 -r1.801 pkgsrc/security/Makefile (expand / switch to context diff)
--- pkgsrc/security/Makefile 2021/01/23 10:59:55 1.800
+++ pkgsrc/security/Makefile 2021/02/06 10:26:53 1.801
@@ -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-gnome3
 SUBDIR+=	pinentry-gtk2
 SUBDIR+=	pinentry-mac
-SUBDIR+=	pinentry-qt4
+SUBDIR+=	pinentry-qt5
 SUBDIR+=	pinepgp
 SUBDIR+=	pius
 SUBDIR+=	pkcs11-helper

cvs diff -r1.51 -r1.52 pkgsrc/security/pinentry/Makefile (expand / switch to context diff)
--- pkgsrc/security/pinentry/Makefile 2019/11/05 18:55:18 1.51
+++ pkgsrc/security/pinentry/Makefile 2021/02/06 10:26:53 1.52
@@ -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

cvs diff -r1.14 -r1.15 pkgsrc/security/pinentry/Makefile.common (expand / switch to context diff)
--- pkgsrc/security/pinentry/Makefile.common 2020/08/30 23:53:59 1.14
+++ pkgsrc/security/pinentry/Makefile.common 2021/02/06 10:26:53 1.15
@@ -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 @@
 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

cvs diff -r1.9 -r1.10 pkgsrc/security/pinentry/buildlink3.mk (expand / switch to context diff)
--- pkgsrc/security/pinentry/buildlink3.mk 2018/01/07 13:04:30 1.9
+++ pkgsrc/security/pinentry/buildlink3.mk 2021/02/06 10:26:53 1.10
@@ -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
 

cvs diff -r1.24 -r1.25 pkgsrc/security/pinentry/distinfo (expand / switch to context diff)
--- pkgsrc/security/pinentry/distinfo 2018/01/10 12:29:38 1.24
+++ pkgsrc/security/pinentry/distinfo 2021/02/06 10:26:53 1.25
@@ -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
+SHA1 (pinentry-1.1.1.tar.bz2) = b8b88cab4fd844e3616d55aeba8f084f2b98fb0f
-RMD160 (pinentry-1.1.0.tar.bz2) = 33b1f9ae44172a0bba37ad4b7d264822e040fe9e
+RMD160 (pinentry-1.1.1.tar.bz2) = 1b1a42245564b57c0fc0695d1c3c2d68e1cbf3ba
-SHA512 (pinentry-1.1.0.tar.bz2) = 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
+SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
-Size (pinentry-1.1.0.tar.bz2) = 467702 bytes
+Size (pinentry-1.1.1.tar.bz2) = 515723 bytes

cvs diff -r1.4 -r1.5 pkgsrc/security/pinentry-fltk/Makefile (expand / switch to context diff)
--- pkgsrc/security/pinentry-fltk/Makefile 2020/08/17 20:20:00 1.4
+++ pkgsrc/security/pinentry-fltk/Makefile 2021/02/06 10:26:53 1.5
@@ -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-emacs
 #CONFIGURE_ARGS+=	--disable-fallback-curses
 CONFIGURE_ARGS+=	--disable-pinentry-gnome3
+CONFIGURE_ARGS+=	--disable-pinentry-efl
 CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		fltk

File Deleted: pkgsrc/security/pinentry-fltk/Attic/distinfo

File Deleted: pkgsrc/security/pinentry-fltk/patches/Attic/patch-fltk_main.cxx

cvs diff -r1.1 -r1.2 pkgsrc/security/pinentry-gnome3/Makefile (expand / switch to context diff)
--- pkgsrc/security/pinentry-gnome3/Makefile 2020/08/30 23:53:23 1.1
+++ pkgsrc/security/pinentry-gnome3/Makefile 2021/02/06 10:26:53 1.2
@@ -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-fallback-curses
 CONFIGURE_ARGS+=	--enable-pinentry-gnome3
 CONFIGURE_ARGS+=	--disable-pinentry-fltk
+CONFIGURE_ARGS+=	--disable-pinentry-efl
 CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		gnome3

cvs diff -r1.52 -r1.53 pkgsrc/security/pinentry-gtk2/Makefile (expand / switch to context diff)
--- pkgsrc/security/pinentry-gtk2/Makefile 2020/08/17 20:20:00 1.52
+++ pkgsrc/security/pinentry-gtk2/Makefile 2021/02/06 10:26:54 1.53
@@ -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-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"

File Deleted: pkgsrc/security/pinentry-qt4/Attic/DESCR

File Deleted: pkgsrc/security/pinentry-qt4/Attic/PLIST

File Deleted: pkgsrc/security/pinentry-qt4/Attic/Makefile

File Added: pkgsrc/security/pinentry-qt5/DESCR
This is a collection of simple PIN or passphrase entry dialogs which
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 QT5 frontend.

File Added: pkgsrc/security/pinentry-qt5/Makefile
# $NetBSD: Makefile,v 1.1 2021/02/06 10:26:54 wiz Exp $

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
#CONFIGURE_ARGS+=	--disable-fallback-curses
CONFIGURE_ARGS+=	--disable-pinentry-gnome3
CONFIGURE_ARGS+=	--disable-pinentry-gtk2
CONFIGURE_ARGS+=	--disable-pinentry-fltk
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/qt5-qtbase/buildlink3.mk"

.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/security/pinentry-qt5/PLIST
@comment $NetBSD: PLIST,v 1.1 2021/02/06 10:26:54 wiz Exp $
bin/pinentry-qt

File Added: pkgsrc/security/pinentry-qt5/Attic/distinfo
$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

File Added: pkgsrc/security/pinentry-qt5/patches/Attic/patch-m4_qt.m4
$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)