CVS commit: pkgsrc/security

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 13 Jan 2022 08:05:49 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan 13 08:05:49 UTC 2022

Modified Files:
        pkgsrc/security/pinentry: Makefile Makefile.common distinfo
        pkgsrc/security/pinentry-fltk: Makefile
        pkgsrc/security/pinentry-gnome3: Makefile
        pkgsrc/security/pinentry-gtk2: Makefile
        pkgsrc/security/pinentry-qt5: Makefile
Added Files:
        pkgsrc/security/pinentry/patches: patch-m4_qt.m4
Removed Files:
        pkgsrc/security/pinentry-qt5: distinfo
        pkgsrc/security/pinentry-qt5/patches: patch-m4_qt.m4

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/pinentry/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/pinentry/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/pinentry/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/pinentry-fltk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pinentry-gnome3/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/security/pinentry-gtk2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pinentry-qt5/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/security/pinentry-qt5/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pinentry/patches/patch-m4_qt.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pinentry/Makefile
diff -u pkgsrc/security/pinentry/Makefile:1.52 pkgsrc/security/pinentry/Makefile:1.53
--- pkgsrc/security/pinentry/Makefile:1.52      Sat Feb  6 10:26:53 2021
+++ pkgsrc/security/pinentry/Makefile   Thu Jan 13 08:05:48 2022
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.52 2021/02/06 10:26:53 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/01/13 08:05:48 adam Exp $
 
-COMMENT=               Applications for entering PINs or Passphrases
+COMMENT=       Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=       --enable-pinentry-tty
 CONFIGURE_ARGS+=       --enable-pinentry-emacs
-CONFIGURE_ARGS+=       --disable-pinentry-qt5
+CONFIGURE_ARGS+=       --disable-pinentry-fltk
 CONFIGURE_ARGS+=       --disable-pinentry-gnome3
 CONFIGURE_ARGS+=       --disable-pinentry-gtk2
-CONFIGURE_ARGS+=       --disable-pinentry-fltk
+CONFIGURE_ARGS+=       --disable-pinentry-qt5
+CONFIGURE_ARGS+=       --disable-pinentry-tqt
 
-.include               "../../security/pinentry/Makefile.common"
+.include "../../security/pinentry/Makefile.common"
 
 .if defined(PINENTRY_DEFAULT)
 post-install:

Index: pkgsrc/security/pinentry/Makefile.common
diff -u pkgsrc/security/pinentry/Makefile.common:1.15 pkgsrc/security/pinentry/Makefile.common:1.16
--- pkgsrc/security/pinentry/Makefile.common:1.15       Sat Feb  6 10:26:53 2021
+++ pkgsrc/security/pinentry/Makefile.common    Thu Jan 13 08:05:48 2022
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2021/02/06 10:26:53 wiz Exp $
-# -*- Makefile -*-
+# $NetBSD: Makefile.common,v 1.16 2022/01/13 08:05:48 adam Exp $
 #
 # used by security/pinentry/Makefile
 # used by security/pinentry-fltk/Makefile
@@ -7,23 +6,21 @@
 # used by security/pinentry-gtk2/Makefile
 # used by security/pinentry-qt5/Makefile
 
-PINENTRY_VERSION=      1.1.1
-DISTNAME=              pinentry-${PINENTRY_VERSION}
+DISTNAME=      pinentry-1.2.0
 
-CATEGORIES=            security
-MASTER_SITES=          ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX=          .tar.bz2
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://gnupg.org/related_software/pinentry/index.html
-LICENSE=               gnu-gpl-v2
+CATEGORIES=    security
+MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/pinentry/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://gnupg.org/related_software/pinentry/index.html
+LICENSE=       gnu-gpl-v2
 
-#PATCHDIR=             ${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE=         ${.CURDIR}/../../security/pinentry/distinfo
+DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
+PATCHDIR=      ${.CURDIR}/../../security/pinentry/patches
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-
 INFO_FILES=            yes
 
 .include "../../security/libassuan2/buildlink3.mk"

Index: pkgsrc/security/pinentry/distinfo
diff -u pkgsrc/security/pinentry/distinfo:1.27 pkgsrc/security/pinentry/distinfo:1.28
--- pkgsrc/security/pinentry/distinfo:1.27      Tue Oct 26 11:17:37 2021
+++ pkgsrc/security/pinentry/distinfo   Thu Jan 13 08:05:48 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 11:17:37 nia Exp $
+$NetBSD: distinfo,v 1.28 2022/01/13 08:05:48 adam Exp $
 
-BLAKE2s (pinentry-1.1.1.tar.bz2) = c3a245e52cb3244e2a76f914baee022adc3164708a93d1eec98b6fc55091bf05
-SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
-Size (pinentry-1.1.1.tar.bz2) = 515723 bytes
+BLAKE2s (pinentry-1.2.0.tar.bz2) = a79231dae318f09b9fe1f749f7b37d17ba80a29117ea53aad70d30342d838928
+SHA512 (pinentry-1.2.0.tar.bz2) = 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
+Size (pinentry-1.2.0.tar.bz2) = 498390 bytes
+SHA1 (patch-m4_qt.m4) = eeb1e8fcba15c0458d9ccf8ab77a5bb66bc1bae8

Index: pkgsrc/security/pinentry-fltk/Makefile
diff -u pkgsrc/security/pinentry-fltk/Makefile:1.5 pkgsrc/security/pinentry-fltk/Makefile:1.6
--- pkgsrc/security/pinentry-fltk/Makefile:1.5  Sat Feb  6 10:26:53 2021
+++ pkgsrc/security/pinentry-fltk/Makefile      Thu Jan 13 08:05:48 2022
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2021/02/06 10:26:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/13 08:05:48 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-fltk-/}
-COMMENT=               Applications for entering PINs or Passphrases, FLTK enabled
+PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-fltk-/}
+COMMENT=       Applications for entering PINs or Passphrases, FLTK enabled
 
-.include               "../../security/pinentry/Makefile.common"
+.include "../../security/pinentry/Makefile.common"
 
-#DISTINFO_FILE=                ${.CURDIR}/distinfo
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            pkg-config
 
-CONFIGURE_ARGS+=       --disable-pinentry-gtk2
-CONFIGURE_ARGS+=       --disable-pinentry-qt
 CONFIGURE_ARGS+=       --disable-pinentry-curses
+CONFIGURE_ARGS+=       --disable-pinentry-efl
 CONFIGURE_ARGS+=       --disable-pinentry-emacs
-#CONFIGURE_ARGS+=      --disable-fallback-curses
 CONFIGURE_ARGS+=       --disable-pinentry-gnome3
-CONFIGURE_ARGS+=       --disable-pinentry-efl
+CONFIGURE_ARGS+=       --disable-pinentry-gtk2
+CONFIGURE_ARGS+=       --disable-pinentry-qt
 CONFIGURE_ARGS+=       --disable-libsecret
+CONFIGURE_ARGS+=       --enable-pinentry-fltk
 
 INSTALL_DIRS=          fltk
 

Index: pkgsrc/security/pinentry-gnome3/Makefile
diff -u pkgsrc/security/pinentry-gnome3/Makefile:1.3 pkgsrc/security/pinentry-gnome3/Makefile:1.4
--- pkgsrc/security/pinentry-gnome3/Makefile:1.3        Wed Dec  8 16:06:22 2021
+++ pkgsrc/security/pinentry-gnome3/Makefile    Thu Jan 13 08:05:48 2022
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:22 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/13 08:05:48 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-gnome3-/}
-PKGREVISION=           1
-COMMENT=               Applications for entering PINs or Passphrases, GNOME 3 enabled
+PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-gnome3-/}
+COMMENT=       Applications for entering PINs or Passphrases, GNOME 3 enabled
 
-.include               "../../security/pinentry/Makefile.common"
+.include "../../security/pinentry/Makefile.common"
 
 USE_TOOLS+=            pkg-config
-CONFIGURE_ARGS+=       --disable-pinentry-gtk2
-CONFIGURE_ARGS+=       --disable-pinentry-qt
 CONFIGURE_ARGS+=       --disable-pinentry-curses
 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-pinentry-fltk
+CONFIGURE_ARGS+=       --disable-pinentry-gtk2
+CONFIGURE_ARGS+=       --disable-pinentry-qt
 CONFIGURE_ARGS+=       --disable-libsecret
+CONFIGURE_ARGS+=       --enable-pinentry-gnome3
 
 INSTALL_DIRS=          gnome3
 

Index: pkgsrc/security/pinentry-gtk2/Makefile
diff -u pkgsrc/security/pinentry-gtk2/Makefile:1.54 pkgsrc/security/pinentry-gtk2/Makefile:1.55
--- pkgsrc/security/pinentry-gtk2/Makefile:1.54 Wed Dec  8 16:06:22 2021
+++ pkgsrc/security/pinentry-gtk2/Makefile      Thu Jan 13 08:05:48 2022
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.54 2021/12/08 16:06:22 adam Exp $
+# $NetBSD: Makefile,v 1.55 2022/01/13 08:05:48 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
-PKGREVISION=           1
-COMMENT=               Applications for entering PINs or Passphrases, GTK+ enabled
+PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
+COMMENT=       Applications for entering PINs or Passphrases, GTK+ enabled
 
-.include               "../../security/pinentry/Makefile.common"
+.include "../../security/pinentry/Makefile.common"
 
 USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-pinentry-gtk2
-CONFIGURE_ARGS+=       --disable-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-fltk
 CONFIGURE_ARGS+=       --disable-pinentry-efl
+CONFIGURE_ARGS+=       --disable-pinentry-fltk
+CONFIGURE_ARGS+=       --disable-pinentry-gnome3
+CONFIGURE_ARGS+=       --disable-pinentry-qt
 CONFIGURE_ARGS+=       --disable-libsecret
 
 INSTALL_DIRS=          gtk+-2

Index: pkgsrc/security/pinentry-qt5/Makefile
diff -u pkgsrc/security/pinentry-qt5/Makefile:1.3 pkgsrc/security/pinentry-qt5/Makefile:1.4
--- pkgsrc/security/pinentry-qt5/Makefile:1.3   Wed Dec  8 16:06:22 2021
+++ pkgsrc/security/pinentry-qt5/Makefile       Thu Jan 13 08:05:49 2022
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:22 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/13 08:05:49 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/pinentry-/pinentry-qt5-/}
-PKGREVISION=           2
-COMMENT=               Applications for entering PINs or Passphrases, qt5 enabled
-CONFLICTS=             pinentry-qt4-[0-9]*
+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"
+.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-efl
+CONFIGURE_ARGS+=       --disable-pinentry-fltk
 CONFIGURE_ARGS+=       --disable-pinentry-gnome3
 CONFIGURE_ARGS+=       --disable-pinentry-gtk2
-CONFIGURE_ARGS+=       --disable-pinentry-fltk
-CONFIGURE_ARGS+=       --disable-pinentry-efl
 CONFIGURE_ARGS+=       --disable-libsecret
+CONFIGURE_ARGS+=       --enable-pinentry-qt
 
 INSTALL_DIRS=          qt
 
@@ -28,5 +24,4 @@ pre-configure:
 
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.0.0
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/security/pinentry/patches/patch-m4_qt.m4
diff -u /dev/null pkgsrc/security/pinentry/patches/patch-m4_qt.m4:1.1
--- /dev/null   Thu Jan 13 08:05:49 2022
+++ pkgsrc/security/pinentry/patches/patch-m4_qt.m4     Thu Jan 13 08:05:48 2022
@@ -0,0 +1,15 @@
+$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
+

Prev by Date: CVS commit: pkgsrc/security/gcr
Next by Date: CVS commit: pkgsrc/security/libksba
Previous by Thread: CVS commit: pkgsrc/security/gcr
Next by Thread: CVS commit: pkgsrc/security/libksba
Indexes:

Home | Main Index | Thread Index | Old Index