CVS commit: pkgsrc/security

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jul  6 06:57:47 UTC 2024

Modified Files:
        pkgsrc/security/pinentry: Makefile Makefile.common distinfo
        pkgsrc/security/pinentry-gnome3: Makefile
        pkgsrc/security/pinentry-gtk2: Makefile
        pkgsrc/security/pinentry-qt5: Makefile
        pkgsrc/security/pinentry-qt6: Makefile PLIST

Log Message:
pinentry: updated to 1.3.1

Noteworthy changes in version 1.3.1 (2024-07-03)

* qt: Install and use pinentry icon.
* qt: Small fix for Qt5.
* qt: Fix Windows build of Qt6.
* New envvar PINENTRY_KDE_USE_WALLET to enable the secret storage
  integration on KDE.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/security/pinentry/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/pinentry/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/pinentry/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/pinentry-gnome3/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/security/pinentry-gtk2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/pinentry-qt5/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pinentry-qt6/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pinentry-qt6/PLIST

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.55 pkgsrc/security/pinentry/Makefile:1.56
--- pkgsrc/security/pinentry/Makefile:1.55      Fri May  3 06:30:11 2024
+++ pkgsrc/security/pinentry/Makefile   Sat Jul  6 06:57:46 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.55 2024/05/03 06:30:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2024/07/06 06:57:46 adam Exp $
 
-PKGREVISION=   1
 COMMENT=       Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=       --disable-pinentry-fltk

Index: pkgsrc/security/pinentry/Makefile.common
diff -u pkgsrc/security/pinentry/Makefile.common:1.18 pkgsrc/security/pinentry/Makefile.common:1.19
--- pkgsrc/security/pinentry/Makefile.common:1.18       Wed Mar 20 15:46:37 2024
+++ pkgsrc/security/pinentry/Makefile.common    Sat Jul  6 06:57:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2024/03/20 15:46:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2024/07/06 06:57:46 adam Exp $
 #
 # used by security/pinentry/Makefile
 # used by security/pinentry-fltk/Makefile
@@ -7,10 +7,10 @@
 # used by security/pinentry-qt5/Makefile
 # used by security/pinentry-qt6/Makefile
 
-DISTNAME=      pinentry-1.3.0
+DISTNAME=      pinentry-1.3.1
 
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/pinentry/
+MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/pinentry/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/pinentry/distinfo
diff -u pkgsrc/security/pinentry/distinfo:1.30 pkgsrc/security/pinentry/distinfo:1.31
--- pkgsrc/security/pinentry/distinfo:1.30      Wed Mar 20 15:46:37 2024
+++ pkgsrc/security/pinentry/distinfo   Sat Jul  6 06:57:46 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2024/03/20 15:46:37 adam Exp $
+$NetBSD: distinfo,v 1.31 2024/07/06 06:57:46 adam Exp $
 
-BLAKE2s (pinentry-1.3.0.tar.bz2) = 39e01333ae946a46c30cbbb90672068f56a7ec94463ce66e162acc737dded6e5
-SHA512 (pinentry-1.3.0.tar.bz2) = 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732
-Size (pinentry-1.3.0.tar.bz2) = 610363 bytes
+BLAKE2s (pinentry-1.3.1.tar.bz2) = e19d311d13f8447f47c14b7bfabeb88784e9fff8036e853b1ea7849592dd9c51
+SHA512 (pinentry-1.3.1.tar.bz2) = 3b72034dc1792b1475acb6d605ff7c1bd7647a0f02d1b6bdcd475acdef24bc802f49e275055436c3271261c4b7a64168477a698aab812a145962146b2f67a0e2
+Size (pinentry-1.3.1.tar.bz2) = 611233 bytes
 SHA1 (patch-m4_qt5.m4) = 2c436880dc564386e7548a1834848c0a50252ad2

Index: pkgsrc/security/pinentry-gnome3/Makefile
diff -u pkgsrc/security/pinentry-gnome3/Makefile:1.14 pkgsrc/security/pinentry-gnome3/Makefile:1.15
--- pkgsrc/security/pinentry-gnome3/Makefile:1.14       Sun Apr  7 07:34:57 2024
+++ pkgsrc/security/pinentry-gnome3/Makefile    Sat Jul  6 06:57:46 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2024/04/07 07:34:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/07/06 06:57:46 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-gnome3-/}
-PKGREVISION=   2
 COMMENT=       Applications for entering PINs or Passphrases, GNOME 3 enabled
 
 .include "../../security/pinentry/Makefile.common"

Index: pkgsrc/security/pinentry-gtk2/Makefile
diff -u pkgsrc/security/pinentry-gtk2/Makefile:1.62 pkgsrc/security/pinentry-gtk2/Makefile:1.63
--- pkgsrc/security/pinentry-gtk2/Makefile:1.62 Sun Apr  7 07:34:57 2024
+++ pkgsrc/security/pinentry-gtk2/Makefile      Sat Jul  6 06:57:47 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2024/04/07 07:34:57 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2024/07/06 06:57:47 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
-PKGREVISION=   1
 COMMENT=       Applications for entering PINs or Passphrases, GTK+ enabled
 
 .include "../../security/pinentry/Makefile.common"

Index: pkgsrc/security/pinentry-qt5/Makefile
diff -u pkgsrc/security/pinentry-qt5/Makefile:1.17 pkgsrc/security/pinentry-qt5/Makefile:1.18
--- pkgsrc/security/pinentry-qt5/Makefile:1.17  Wed May 29 16:34:18 2024
+++ pkgsrc/security/pinentry-qt5/Makefile       Sat Jul  6 06:57:47 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2024/05/29 16:34:18 adam Exp $
+# $NetBSD: Makefile,v 1.18 2024/07/06 06:57:47 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-qt5-/}
-PKGREVISION=   2
 COMMENT=       Applications for entering PINs or Passphrases, Qt5 enabled
 CONFLICTS=     pinentry-qt4-[0-9]*
 
@@ -26,6 +25,10 @@ INSTALL_DIRS=                qt5
 pre-configure:
        cd ${WRKSRC} && autoreconf -i -f
 
+# XXX: conflicts with pinentry-qt6
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/share/pixmaps/pinentry.png
+
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.0.0
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/pinentry-qt6/Makefile
diff -u pkgsrc/security/pinentry-qt6/Makefile:1.3 pkgsrc/security/pinentry-qt6/Makefile:1.4
--- pkgsrc/security/pinentry-qt6/Makefile:1.3   Wed May 29 16:34:18 2024
+++ pkgsrc/security/pinentry-qt6/Makefile       Sat Jul  6 06:57:47 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2024/05/29 16:34:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2024/07/06 06:57:47 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/pinentry-/pinentry-qt6-/}
-PKGREVISION=   2
 COMMENT=       Applications for entering PINs or Passphrases, Qt6 enabled
 CONFLICTS=     pinentry-qt4-[0-9]*
 

Index: pkgsrc/security/pinentry-qt6/PLIST
diff -u pkgsrc/security/pinentry-qt6/PLIST:1.1 pkgsrc/security/pinentry-qt6/PLIST:1.2
--- pkgsrc/security/pinentry-qt6/PLIST:1.1      Wed Mar 20 15:46:38 2024
+++ pkgsrc/security/pinentry-qt6/PLIST  Sat Jul  6 06:57:47 2024
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/20 15:46:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/07/06 06:57:47 adam Exp $
 bin/pinentry-qt
 share/applications/org.gnupg.pinentry-qt.desktop
+share/pixmaps/pinentry.png