Thu Jan 13 08:05:49 2022 UTC ()
pinentry: updated to 1.2.0

Noteworthy changes in version 1.2.0 (2021-08-25)
------------------------------------------------

 * qt: Show a warning if Caps Lock is on on Windows, X11 (requires
   libX11 and Qt5X11Extras), and Wayland (requires KF5WaylandClient).
   [T4950]

 * qt: Support password formatting.  This makes generated passwords
   easier to transcript. [T5517]

 * qt: Fix showing of pinentry window on Wayland.  [T5528]

 * qt: Check passphrase constraints before accepting passphrase if
   passphrase constraints are requested to be enforced.  [T5532]

 * qt: Improve detection of running in a GUI session.  [T3659]

 * qt: Improve accessibility when entering new password.


(adam)
diff -r1.52 -r1.53 pkgsrc/security/pinentry/Makefile
diff -r1.15 -r1.16 pkgsrc/security/pinentry/Makefile.common
diff -r1.27 -r1.28 pkgsrc/security/pinentry/distinfo
diff -r1.5 -r1.6 pkgsrc/security/pinentry-fltk/Makefile
diff -r1.3 -r1.4 pkgsrc/security/pinentry-gnome3/Makefile
diff -r1.54 -r1.55 pkgsrc/security/pinentry-gtk2/Makefile
diff -r1.3 -r1.4 pkgsrc/security/pinentry-qt5/Makefile
diff -r1.3 -r0 pkgsrc/security/pinentry-qt5/distinfo
diff -r1.1 -r0 pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4
diff -r0 -r1.1 pkgsrc/security/pinentry/patches/patch-m4_qt.m4
cvs diff -r1.52 -r1.53 pkgsrc/security/pinentry/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry/Makefile 2021/02/06 10:26:53 1.52
+++ pkgsrc/security/pinentry/Makefile 2022/01/13 08:05:48 1.53
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.52 2021/02/06 10:26:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.53 2022/01/13 08:05:48 adam Exp $
2 2
3COMMENT= Applications for entering PINs or Passphrases 3COMMENT= Applications for entering PINs or Passphrases
4 4
5CONFIGURE_ARGS+= --enable-pinentry-tty 5CONFIGURE_ARGS+= --enable-pinentry-tty
6CONFIGURE_ARGS+= --enable-pinentry-emacs 6CONFIGURE_ARGS+= --enable-pinentry-emacs
7CONFIGURE_ARGS+= --disable-pinentry-qt5 7CONFIGURE_ARGS+= --disable-pinentry-fltk
8CONFIGURE_ARGS+= --disable-pinentry-gnome3 8CONFIGURE_ARGS+= --disable-pinentry-gnome3
9CONFIGURE_ARGS+= --disable-pinentry-gtk2 9CONFIGURE_ARGS+= --disable-pinentry-gtk2
10CONFIGURE_ARGS+= --disable-pinentry-fltk 10CONFIGURE_ARGS+= --disable-pinentry-qt5
 11CONFIGURE_ARGS+= --disable-pinentry-tqt
11 12
12.include "../../security/pinentry/Makefile.common" 13.include "../../security/pinentry/Makefile.common"
13 14
14.if defined(PINENTRY_DEFAULT) 15.if defined(PINENTRY_DEFAULT)
15post-install: 16post-install:
16 cd ${DESTDIR}${PREFIX}/bin && \ 17 cd ${DESTDIR}${PREFIX}/bin && \
17 ${LN} -sf pinentry-${PINENTRY_DEFAULT} pinentry 18 ${LN} -sf pinentry-${PINENTRY_DEFAULT} pinentry
18.endif 19.endif
19 20
20.include "../../security/libksba/buildlink3.mk" 21.include "../../security/libksba/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/security/pinentry/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/pinentry/Makefile.common 2021/02/06 10:26:53 1.15
+++ pkgsrc/security/pinentry/Makefile.common 2022/01/13 08:05:48 1.16
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile.common,v 1.15 2021/02/06 10:26:53 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.16 2022/01/13 08:05:48 adam Exp $
2# -*- Makefile -*- 
3# 2#
4# used by security/pinentry/Makefile 3# used by security/pinentry/Makefile
5# used by security/pinentry-fltk/Makefile 4# used by security/pinentry-fltk/Makefile
6# used by security/pinentry-gnome3/Makefile 5# used by security/pinentry-gnome3/Makefile
7# used by security/pinentry-gtk2/Makefile 6# used by security/pinentry-gtk2/Makefile
8# used by security/pinentry-qt5/Makefile 7# used by security/pinentry-qt5/Makefile
9 8
10PINENTRY_VERSION= 1.1.1 9DISTNAME= pinentry-1.2.0
11DISTNAME= pinentry-${PINENTRY_VERSION} 
12 10
13CATEGORIES= security 11CATEGORIES= security
14MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 12MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
15EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
16 14
17MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
18HOMEPAGE= https://gnupg.org/related_software/pinentry/index.html 16HOMEPAGE= https://gnupg.org/related_software/pinentry/index.html
19LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
20 18
21#PATCHDIR= ${.CURDIR}/../../security/pinentry/patches 19DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
22DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo 20PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
23 21
24GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 23CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
26 
27INFO_FILES= yes 24INFO_FILES= yes
28 25
29.include "../../security/libassuan2/buildlink3.mk" 26.include "../../security/libassuan2/buildlink3.mk"
30BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.16 27BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.16
31.include "../../security/libgpg-error/buildlink3.mk" 28.include "../../security/libgpg-error/buildlink3.mk"
32.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
33.include "../../mk/curses.buildlink3.mk" 30.include "../../mk/curses.buildlink3.mk"
34.include "../../mk/pthread.buildlink3.mk" 31.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.27 -r1.28 pkgsrc/security/pinentry/distinfo (expand / switch to unified diff)

--- pkgsrc/security/pinentry/distinfo 2021/10/26 11:17:37 1.27
+++ pkgsrc/security/pinentry/distinfo 2022/01/13 08:05:48 1.28
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.27 2021/10/26 11:17:37 nia Exp $ 1$NetBSD: distinfo,v 1.28 2022/01/13 08:05:48 adam Exp $
2 2
3BLAKE2s (pinentry-1.1.1.tar.bz2) = c3a245e52cb3244e2a76f914baee022adc3164708a93d1eec98b6fc55091bf05 3BLAKE2s (pinentry-1.2.0.tar.bz2) = a79231dae318f09b9fe1f749f7b37d17ba80a29117ea53aad70d30342d838928
4SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12 4SHA512 (pinentry-1.2.0.tar.bz2) = 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
5Size (pinentry-1.1.1.tar.bz2) = 515723 bytes 5Size (pinentry-1.2.0.tar.bz2) = 498390 bytes
 6SHA1 (patch-m4_qt.m4) = eeb1e8fcba15c0458d9ccf8ab77a5bb66bc1bae8
cvs diff -r1.5 -r1.6 pkgsrc/security/pinentry-fltk/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-fltk/Makefile 2021/02/06 10:26:53 1.5
+++ pkgsrc/security/pinentry-fltk/Makefile 2022/01/13 08:05:48 1.6
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.5 2021/02/06 10:26:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2022/01/13 08:05:48 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-fltk-/} 3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-fltk-/}
4COMMENT= Applications for entering PINs or Passphrases, FLTK enabled 4COMMENT= Applications for entering PINs or Passphrases, FLTK enabled
5 5
6.include "../../security/pinentry/Makefile.common" 6.include "../../security/pinentry/Makefile.common"
7 7
8#DISTINFO_FILE= ${.CURDIR}/distinfo 
9USE_LANGUAGES+= c c++ 8USE_LANGUAGES+= c c++
10USE_TOOLS+= pkg-config 9USE_TOOLS+= pkg-config
11 10
12CONFIGURE_ARGS+= --disable-pinentry-gtk2 
13CONFIGURE_ARGS+= --disable-pinentry-qt 
14CONFIGURE_ARGS+= --disable-pinentry-curses 11CONFIGURE_ARGS+= --disable-pinentry-curses
 12CONFIGURE_ARGS+= --disable-pinentry-efl
15CONFIGURE_ARGS+= --disable-pinentry-emacs 13CONFIGURE_ARGS+= --disable-pinentry-emacs
16#CONFIGURE_ARGS+= --disable-fallback-curses 
17CONFIGURE_ARGS+= --disable-pinentry-gnome3 14CONFIGURE_ARGS+= --disable-pinentry-gnome3
18CONFIGURE_ARGS+= --disable-pinentry-efl 15CONFIGURE_ARGS+= --disable-pinentry-gtk2
 16CONFIGURE_ARGS+= --disable-pinentry-qt
19CONFIGURE_ARGS+= --disable-libsecret 17CONFIGURE_ARGS+= --disable-libsecret
 18CONFIGURE_ARGS+= --enable-pinentry-fltk
20 19
21INSTALL_DIRS= fltk 20INSTALL_DIRS= fltk
22 21
23.include "../../x11/fltk13/buildlink3.mk" 22.include "../../x11/fltk13/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/security/pinentry-gnome3/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gnome3/Makefile 2021/12/08 16:06:22 1.3
+++ pkgsrc/security/pinentry-gnome3/Makefile 2022/01/13 08:05:48 1.4
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:22 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2022/01/13 08:05:48 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gnome3-/} 3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gnome3-/}
4PKGREVISION= 1 4COMMENT= Applications for entering PINs or Passphrases, GNOME 3 enabled
5COMMENT= Applications for entering PINs or Passphrases, GNOME 3 enabled 
6 5
7.include "../../security/pinentry/Makefile.common" 6.include "../../security/pinentry/Makefile.common"
8 7
9USE_TOOLS+= pkg-config 8USE_TOOLS+= pkg-config
10CONFIGURE_ARGS+= --disable-pinentry-gtk2 
11CONFIGURE_ARGS+= --disable-pinentry-qt 
12CONFIGURE_ARGS+= --disable-pinentry-curses 9CONFIGURE_ARGS+= --disable-pinentry-curses
13CONFIGURE_ARGS+= --disable-pinentry-emacs 10CONFIGURE_ARGS+= --disable-pinentry-emacs
14#CONFIGURE_ARGS+= --disable-fallback-curses 
15CONFIGURE_ARGS+= --enable-pinentry-gnome3 
16CONFIGURE_ARGS+= --disable-pinentry-fltk 
17CONFIGURE_ARGS+= --disable-pinentry-efl 11CONFIGURE_ARGS+= --disable-pinentry-efl
 12CONFIGURE_ARGS+= --disable-pinentry-fltk
 13CONFIGURE_ARGS+= --disable-pinentry-gtk2
 14CONFIGURE_ARGS+= --disable-pinentry-qt
18CONFIGURE_ARGS+= --disable-libsecret 15CONFIGURE_ARGS+= --disable-libsecret
 16CONFIGURE_ARGS+= --enable-pinentry-gnome3
19 17
20INSTALL_DIRS= gnome3 18INSTALL_DIRS= gnome3
21 19
22.include "../../security/gcr/buildlink3.mk" 20.include "../../security/gcr/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/security/pinentry-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gtk2/Makefile 2021/12/08 16:06:22 1.54
+++ pkgsrc/security/pinentry-gtk2/Makefile 2022/01/13 08:05:48 1.55
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: Makefile,v 1.54 2021/12/08 16:06:22 adam Exp $ 1# $NetBSD: Makefile,v 1.55 2022/01/13 08:05:48 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/} 3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
4PKGREVISION= 1 4COMMENT= Applications for entering PINs or Passphrases, GTK+ enabled
5COMMENT= Applications for entering PINs or Passphrases, GTK+ enabled 
6 5
7.include "../../security/pinentry/Makefile.common" 6.include "../../security/pinentry/Makefile.common"
8 7
9USE_TOOLS+= pkg-config 8USE_TOOLS+= pkg-config
10CONFIGURE_ARGS+= --enable-pinentry-gtk2 9CONFIGURE_ARGS+= --enable-pinentry-gtk2
11CONFIGURE_ARGS+= --disable-pinentry-qt 
12CONFIGURE_ARGS+= --disable-pinentry-curses 10CONFIGURE_ARGS+= --disable-pinentry-curses
13CONFIGURE_ARGS+= --disable-pinentry-emacs 11CONFIGURE_ARGS+= --disable-pinentry-emacs
14#CONFIGURE_ARGS+= --disable-fallback-curses 
15CONFIGURE_ARGS+= --disable-pinentry-gnome3 
16CONFIGURE_ARGS+= --disable-pinentry-fltk 
17CONFIGURE_ARGS+= --disable-pinentry-efl 12CONFIGURE_ARGS+= --disable-pinentry-efl
 13CONFIGURE_ARGS+= --disable-pinentry-fltk
 14CONFIGURE_ARGS+= --disable-pinentry-gnome3
 15CONFIGURE_ARGS+= --disable-pinentry-qt
18CONFIGURE_ARGS+= --disable-libsecret 16CONFIGURE_ARGS+= --disable-libsecret
19 17
20INSTALL_DIRS= gtk+-2 18INSTALL_DIRS= gtk+-2
21 19
22BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0 20BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
23.include "../../x11/gtk2/buildlink3.mk" 21.include "../../x11/gtk2/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/security/pinentry-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-qt5/Makefile 2021/12/08 16:06:22 1.3
+++ pkgsrc/security/pinentry-qt5/Makefile 2022/01/13 08:05:49 1.4
@@ -1,32 +1,27 @@ @@ -1,32 +1,27 @@
1# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:22 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2022/01/13 08:05:49 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt5-/} 3PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt5-/}
4PKGREVISION= 2 4COMMENT= Applications for entering PINs or Passphrases, qt5 enabled
5COMMENT= Applications for entering PINs or Passphrases, qt5 enabled 5CONFLICTS= pinentry-qt4-[0-9]*
6CONFLICTS= pinentry-qt4-[0-9]* 
7 6
8.include "../../security/pinentry/Makefile.common" 7.include "../../security/pinentry/Makefile.common"
9 8
10DISTINFO_FILE= ${.CURDIR}/distinfo 
11USE_LANGUAGES+= c c++ 9USE_LANGUAGES+= c c++
12USE_TOOLS+= pkg-config gmake autoconf 10USE_TOOLS+= pkg-config gmake autoconf
13 
14CONFIGURE_ARGS+= --enable-pinentry-qt 
15CONFIGURE_ARGS+= --disable-pinentry-curses 11CONFIGURE_ARGS+= --disable-pinentry-curses
16CONFIGURE_ARGS+= --disable-pinentry-emacs 12CONFIGURE_ARGS+= --disable-pinentry-emacs
17#CONFIGURE_ARGS+= --disable-fallback-curses 13CONFIGURE_ARGS+= --disable-pinentry-efl
 14CONFIGURE_ARGS+= --disable-pinentry-fltk
18CONFIGURE_ARGS+= --disable-pinentry-gnome3 15CONFIGURE_ARGS+= --disable-pinentry-gnome3
19CONFIGURE_ARGS+= --disable-pinentry-gtk2 16CONFIGURE_ARGS+= --disable-pinentry-gtk2
20CONFIGURE_ARGS+= --disable-pinentry-fltk 
21CONFIGURE_ARGS+= --disable-pinentry-efl 
22CONFIGURE_ARGS+= --disable-libsecret 17CONFIGURE_ARGS+= --disable-libsecret
 18CONFIGURE_ARGS+= --enable-pinentry-qt
23 19
24INSTALL_DIRS= qt 20INSTALL_DIRS= qt
25 21
26pre-configure: 22pre-configure:
27 cd ${WRKSRC} && autoreconf -i -f 23 cd ${WRKSRC} && autoreconf -i -f
28 24
29BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 25BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
30.include "../../x11/qt5-qtbase/buildlink3.mk" 26.include "../../x11/qt5-qtbase/buildlink3.mk"
31 
32.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/security/pinentry-qt5/Attic/distinfo
File Deleted: pkgsrc/security/pinentry-qt5/patches/Attic/patch-m4_qt.m4
File Added: pkgsrc/security/pinentry/patches/patch-m4_qt.m4
$NetBSD: patch-m4_qt.m4,v 1.1 2022/01/13 08:05:48 adam Exp $

The "-rpath" option requires an equal sign.

--- m4/qt.m4.orig	2021-08-12 14:30:43.000000000 +0000
+++ m4/qt.m4
@@ -60,7 +60,7 @@ AC_DEFUN([FIND_QT],
     qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
     if test -n "$qtlibdir"; then
       if test "$enable_rpath" != "no"; then
-        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
+        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath=\"$qtlibdir\""
       fi
     fi