CVS commit: pkgsrc/security

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 6 Feb 2021 10:26:54 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb  6 10:26:54 UTC 2021

Modified Files:
        pkgsrc/security: Makefile
        pkgsrc/security/pinentry: Makefile Makefile.common buildlink3.mk
            distinfo
        pkgsrc/security/pinentry-fltk: Makefile
        pkgsrc/security/pinentry-gnome3: Makefile
        pkgsrc/security/pinentry-gtk2: Makefile
Added Files:
        pkgsrc/security/pinentry-qt5: DESCR Makefile PLIST distinfo
        pkgsrc/security/pinentry-qt5/patches: patch-m4_qt.m4
Removed Files:
        pkgsrc/security/pinentry-fltk: distinfo
        pkgsrc/security/pinentry-fltk/patches: patch-fltk_main.cxx
        pkgsrc/security/pinentry-qt4: DESCR Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.800 -r1.801 pkgsrc/security/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/security/pinentry/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/pinentry/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/pinentry/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/pinentry/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pinentry-fltk/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/security/pinentry-fltk/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/pinentry-fltk/patches/patch-fltk_main.cxx
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pinentry-gnome3/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/pinentry-gtk2/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/security/pinentry-qt4/DESCR \
    pkgsrc/security/pinentry-qt4/PLIST
cvs rdiff -u -r1.43 -r0 pkgsrc/security/pinentry-qt4/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pinentry-qt5/DESCR \
    pkgsrc/security/pinentry-qt5/Makefile pkgsrc/security/pinentry-qt5/PLIST \
    pkgsrc/security/pinentry-qt5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/pinentry-qt5/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/Makefile
diff -u pkgsrc/security/Makefile:1.800 pkgsrc/security/Makefile:1.801
--- pkgsrc/security/Makefile:1.800      Sat Jan 23 10:59:55 2021
+++ pkgsrc/security/Makefile    Sat Feb  6 10:26:53 2021
@@ -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

Index: pkgsrc/security/pinentry/Makefile
diff -u pkgsrc/security/pinentry/Makefile:1.51 pkgsrc/security/pinentry/Makefile:1.52
--- pkgsrc/security/pinentry/Makefile:1.51      Tue Nov  5 18:55:18 2019
+++ pkgsrc/security/pinentry/Makefile   Sat Feb  6 10:26:53 2021
@@ -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

Index: pkgsrc/security/pinentry/Makefile.common
diff -u pkgsrc/security/pinentry/Makefile.common:1.14 pkgsrc/security/pinentry/Makefile.common:1.15
--- pkgsrc/security/pinentry/Makefile.common:1.14       Sun Aug 30 23:53:59 2020
+++ pkgsrc/security/pinentry/Makefile.common    Sat Feb  6 10:26:53 2021
@@ -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/gcryp
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-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

Index: pkgsrc/security/pinentry/buildlink3.mk
diff -u pkgsrc/security/pinentry/buildlink3.mk:1.9 pkgsrc/security/pinentry/buildlink3.mk:1.10
--- pkgsrc/security/pinentry/buildlink3.mk:1.9  Sun Jan  7 13:04:30 2018
+++ pkgsrc/security/pinentry/buildlink3.mk      Sat Feb  6 10:26:53 2021
@@ -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
 

Index: pkgsrc/security/pinentry/distinfo
diff -u pkgsrc/security/pinentry/distinfo:1.24 pkgsrc/security/pinentry/distinfo:1.25
--- pkgsrc/security/pinentry/distinfo:1.24      Wed Jan 10 12:29:38 2018
+++ pkgsrc/security/pinentry/distinfo   Sat Feb  6 10:26:53 2021
@@ -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

Index: pkgsrc/security/pinentry-fltk/Makefile
diff -u pkgsrc/security/pinentry-fltk/Makefile:1.4 pkgsrc/security/pinentry-fltk/Makefile:1.5
--- pkgsrc/security/pinentry-fltk/Makefile:1.4  Mon Aug 17 20:20:00 2020
+++ pkgsrc/security/pinentry-fltk/Makefile      Sat Feb  6 10:26:53 2021
@@ -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-curs
 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

Index: pkgsrc/security/pinentry-gnome3/Makefile
diff -u pkgsrc/security/pinentry-gnome3/Makefile:1.1 pkgsrc/security/pinentry-gnome3/Makefile:1.2
--- pkgsrc/security/pinentry-gnome3/Makefile:1.1        Sun Aug 30 23:53:23 2020
+++ pkgsrc/security/pinentry-gnome3/Makefile    Sat Feb  6 10:26:53 2021
@@ -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-emac
 #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

Index: pkgsrc/security/pinentry-gtk2/Makefile
diff -u pkgsrc/security/pinentry-gtk2/Makefile:1.52 pkgsrc/security/pinentry-gtk2/Makefile:1.53
--- pkgsrc/security/pinentry-gtk2/Makefile:1.52 Mon Aug 17 20:20:00 2020
+++ pkgsrc/security/pinentry-gtk2/Makefile      Sat Feb  6 10:26:54 2021
@@ -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-emac
 #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"

Added files:

Index: pkgsrc/security/pinentry-qt5/DESCR
diff -u /dev/null pkgsrc/security/pinentry-qt5/DESCR:1.1
--- /dev/null   Sat Feb  6 10:26:54 2021
+++ pkgsrc/security/pinentry-qt5/DESCR  Sat Feb  6 10:26:54 2021
@@ -0,0 +1,6 @@
+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.
Index: pkgsrc/security/pinentry-qt5/Makefile
diff -u /dev/null pkgsrc/security/pinentry-qt5/Makefile:1.1
--- /dev/null   Sat Feb  6 10:26:54 2021
+++ pkgsrc/security/pinentry-qt5/Makefile       Sat Feb  6 10:26:54 2021
@@ -0,0 +1,31 @@
+# $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"
Index: pkgsrc/security/pinentry-qt5/PLIST
diff -u /dev/null pkgsrc/security/pinentry-qt5/PLIST:1.1
--- /dev/null   Sat Feb  6 10:26:54 2021
+++ pkgsrc/security/pinentry-qt5/PLIST  Sat Feb  6 10:26:54 2021
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/06 10:26:54 wiz Exp $
+bin/pinentry-qt
Index: pkgsrc/security/pinentry-qt5/distinfo
diff -u /dev/null pkgsrc/security/pinentry-qt5/distinfo:1.1
--- /dev/null   Sat Feb  6 10:26:54 2021
+++ pkgsrc/security/pinentry-qt5/distinfo       Sat Feb  6 10:26:54 2021
@@ -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

Index: pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4
diff -u /dev/null pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4:1.1
--- /dev/null   Sat Feb  6 10:26:54 2021
+++ pkgsrc/security/pinentry-qt5/patches/patch-m4_qt.m4 Sat Feb  6 10:26:54 2021
@@ -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)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index