pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security pinentry: update to 1.1.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/4cd887385697
branches: trunk
changeset: 446298:4cd887385697
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Feb 06 10:26:53 2021 +0000
description:
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.
diffstat:
security/Makefile | 4 +-
security/pinentry-fltk/Makefile | 6 +-
security/pinentry-fltk/distinfo | 7 -
security/pinentry-fltk/patches/patch-fltk_main.cxx | 87 ----------------------
security/pinentry-gnome3/Makefile | 3 +-
security/pinentry-gtk2/Makefile | 5 +-
security/pinentry-qt4/DESCR | 6 -
security/pinentry-qt4/Makefile | 27 ------
security/pinentry-qt4/PLIST | 2 -
security/pinentry-qt5/DESCR | 6 +
security/pinentry-qt5/Makefile | 31 +++++++
security/pinentry-qt5/PLIST | 2 +
security/pinentry-qt5/distinfo | 7 +
security/pinentry-qt5/patches/patch-m4_qt.m4 | 15 +++
security/pinentry/Makefile | 3 +-
security/pinentry/Makefile.common | 8 +-
security/pinentry/buildlink3.mk | 2 +-
security/pinentry/distinfo | 10 +-
18 files changed, 82 insertions(+), 149 deletions(-)
diffs (truncated from 379 to 300 lines):
diff -r d1b8ec89532b -r 4cd887385697 security/Makefile
--- a/security/Makefile Sat Feb 06 09:52:10 2021 +0000
+++ b/security/Makefile Sat Feb 06 10:26:53 2021 +0000
@@ -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
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-fltk/Makefile
--- a/security/pinentry-fltk/Makefile Sat Feb 06 09:52:10 2021 +0000
+++ b/security/pinentry-fltk/Makefile Sat Feb 06 10:26:53 2021 +0000
@@ -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
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-fltk/distinfo
--- a/security/pinentry-fltk/distinfo Sat Feb 06 09:52:10 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1 2019/02/13 17:40: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 (patch-fltk_main.cxx) = f74f3eb14f16e632386c46f5febea158700447fb
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-fltk/patches/patch-fltk_main.cxx
--- a/security/pinentry-fltk/patches/patch-fltk_main.cxx Sat Feb 06 09:52:10 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-$NetBSD: patch-fltk_main.cxx,v 1.1 2019/02/13 17:39:36 wiz Exp $
-
-Handle '_' in labels as keyboard shortcuts (used by GPG2).
-Fix format string handling (Patch from Debian).
-
---- fltk/main.cxx.orig 2017-12-03 16:13:05.000000000 +0000
-+++ fltk/main.cxx
-@@ -78,6 +78,44 @@ static std::string escape_accel_utf8(con
- return result;
- }
-
-+// For button labels
-+// Accelerator '_' (used e.g. by GPG2) is converted to '&' (for FLTK)
-+// '&' is escaped as in escape_accel_utf8()
-+static std::string convert_accel_utf8(const char *s)
-+{
-+ static bool last_was_underscore = false;
-+ std::string result;
-+ if (NULL != s)
-+ {
-+ result.reserve(strlen(s));
-+ for (const char *p = s; *p; ++p)
-+ {
-+ // & => &&
-+ if ('&' == *p)
-+ result.push_back(*p);
-+ // _ => & (handle '__' as escaped underscore)
-+ if ('_' == *p)
-+ {
-+ if (last_was_underscore)
-+ {
-+ result.push_back(*p);
-+ last_was_underscore = false;
-+ }
-+ else
-+ last_was_underscore = true;
-+ }
-+ else
-+ {
-+ if (last_was_underscore)
-+ result.push_back('&');
-+ result.push_back(*p);
-+ last_was_underscore = false;
-+ }
-+ }
-+ }
-+ return result;
-+}
-+
- class cancel_exception
- {
-
-@@ -111,8 +149,8 @@ static int fltk_cmd_handler(pinentry_t p
- // TODO: Add parent window to pinentry-fltk window
- //if (pe->parent_wid){}
- std::string title = !is_empty(pe->title)?pe->title:PGMNAME;
-- std::string ok = escape_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
-- std::string cancel = escape_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
-+ std::string ok = convert_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
-+ std::string cancel = convert_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
-
- if (!!pe->pin) // password (or confirmation)
- {
-@@ -241,12 +279,12 @@ static int fltk_cmd_handler(pinentry_t p
- if (pe->one_button)
- {
- fl_ok = ok.c_str();
-- fl_message(message);
-+ fl_message("%s", message);
- result = 1; // OK
- }
- else if (pe->notok)
- {
-- switch (fl_choice(message, ok.c_str(), cancel.c_str(), pe->notok))
-+ switch (fl_choice("%s", ok.c_str(), cancel.c_str(), pe->notok, message))
- {
- case 0: result = 1; break;
- case 2: result = 0; break;
-@@ -256,7 +294,7 @@ static int fltk_cmd_handler(pinentry_t p
- }
- else
- {
-- switch (fl_choice(message, ok.c_str(), cancel.c_str(), NULL))
-+ switch (fl_choice("%s", ok.c_str(), cancel.c_str(), NULL, message))
- {
- case 0: result = 1; break;
- default:
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-gnome3/Makefile
--- a/security/pinentry-gnome3/Makefile Sat Feb 06 09:52:10 2021 +0000
+++ b/security/pinentry-gnome3/Makefile Sat Feb 06 10:26:53 2021 +0000
@@ -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
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-gtk2/Makefile
--- a/security/pinentry-gtk2/Makefile Sat Feb 06 09:52:10 2021 +0000
+++ b/security/pinentry-gtk2/Makefile Sat Feb 06 10:26:53 2021 +0000
@@ -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"
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt4/DESCR
--- a/security/pinentry-qt4/DESCR Sat Feb 06 09:52:10 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-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 QT4 frontend.
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt4/Makefile
--- a/security/pinentry-qt4/Makefile Sat Feb 06 09:52:10 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2020/08/17 20:20:00 leot Exp $
-
-PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt4-/}
-PKGREVISION= 4
-COMMENT= Applications for entering PINs or Passphrases, qt4 enabled
-
-.include "../../security/pinentry/Makefile.common"
-
-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
-
-USE_LANGUAGES+= c c++
-USE_TOOLS+= pkg-config gmake
-
-INSTALL_DIRS= qt
-
-BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
-.include "../../x11/qt4-libs/buildlink3.mk"
-#.include "../../security/libgpg-error/buildlink3.mk"
-#.include "../../security/libksba/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt4/PLIST
--- a/security/pinentry-qt4/PLIST Sat Feb 06 09:52:10 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/30 19:56:42 wiz Exp $
-bin/pinentry-qt
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt5/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt5/DESCR Sat Feb 06 10:26:53 2021 +0000
@@ -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.
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt5/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt5/Makefile Sat Feb 06 10:26:53 2021 +0000
@@ -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"
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt5/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt5/PLIST Sat Feb 06 10:26:53 2021 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/06 10:26:54 wiz Exp $
+bin/pinentry-qt
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt5/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt5/distinfo Sat Feb 06 10:26:53 2021 +0000
@@ -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
diff -r d1b8ec89532b -r 4cd887385697 security/pinentry-qt5/patches/patch-m4_qt.m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt5/patches/patch-m4_qt.m4 Sat Feb 06 10:26:53 2021 +0000
@@ -0,0 +1,15 @@
Home |
Main Index |
Thread Index |
Old Index