svn commit: r459560 - in head/security: . pinentry pinentry-fltk pinentry/files
Jason E. Hale
jhale at FreeBSD.org
Sun Jan 21 00:38:31 UTC 2018
Author: jhale
Date: Sun Jan 21 00:38:29 2018
New Revision: 459560
URL: https://svnweb.freebsd.org/changeset/ports/459560
Log:
Update security/pinentry* to 1.1.0 [1]
Add security/pinentry-fltk, fltk frontend [2]
PR: 225190 [1], 225191 [2]
Submitted by: Dmitri Goutnik <dg at syrec.org>
Added:
head/security/pinentry-fltk/
head/security/pinentry-fltk/Makefile (contents, props changed)
head/security/pinentry/files/patch-fltk_pinwindow.cxx (contents, props changed)
Deleted:
head/security/pinentry/files/patch-configure
Modified:
head/security/Makefile
head/security/pinentry/Makefile
head/security/pinentry/distinfo
Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile Sat Jan 20 23:59:11 2018 (r459559)
+++ head/security/Makefile Sun Jan 21 00:38:29 2018 (r459560)
@@ -838,6 +838,7 @@
SUBDIR += pidgin-otr
SUBDIR += pinentry
SUBDIR += pinentry-curses
+ SUBDIR += pinentry-fltk
SUBDIR += pinentry-gnome3
SUBDIR += pinentry-gtk2
SUBDIR += pinentry-qt4
Added: head/security/pinentry-fltk/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/pinentry-fltk/Makefile Sun Jan 21 00:38:29 2018 (r459560)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME= pinentry
+PORTREVISION= 0
+
+COMMENT= FLTK version of the GnuPG password dialog
+
+PINENTRY_GUI= fltk
+
+MASTERDIR= ${.CURDIR}/../pinentry
+
+.include "${MASTERDIR}/Makefile"
Modified: head/security/pinentry/Makefile
==============================================================================
--- head/security/pinentry/Makefile Sat Jan 20 23:59:11 2018 (r459559)
+++ head/security/pinentry/Makefile Sun Jan 21 00:38:29 2018 (r459560)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= pinentry
-PORTVERSION= 1.0.0
-PORTREVISION?= 3
+PORTVERSION= 1.1.0
+PORTREVISION?= 0
CATEGORIES= security
MASTER_SITES= GNUPG/pinentry
@@ -22,7 +22,7 @@ NO_BUILD= yes
PLIST_FILES= bin/pinentry
OPTIONS_SINGLE= FRONTEND
-OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 QT5 GNOME3
+OPTIONS_SINGLE_FRONTEND= TTY NCURSES FLTK GTK2 QT4 QT5 GNOME3
OPTIONS_DEFAULT= TTY
FRONTEND_DESC= Default frontend
@@ -35,6 +35,10 @@ NCURSES_DESC= Curses frontend
PINENTRY_NCURSES= pinentry-curses
NCURSES_RUN_DEPENDS= ${PINENTRY_NCURSES}:security/pinentry-curses
+FLTK_DESC= FLTK frontend
+PINENTRY_FLTK= pinentry-fltk
+FLTK_RUN_DEPENDS= ${PINENTRY_FLTK}:security/pinentry-fltk
+
GTK2_DESC= Gtk+ 2 frontend
PINENTRY_GTK2= pinentry-gtk-2
GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:security/pinentry-gtk2
@@ -110,6 +114,14 @@ USE_GNOME+= gtk20
PLIST_FILES= bin/pinentry-gtk-2
.else
CONFIGURE_ARGS+=--disable-pinentry-gtk2
+.endif
+
+.if ${PINENTRY_GUI} == "fltk"
+USES+= compiler:c++11-lib
+LIB_DEPENDS+= libfltk.so:x11-toolkits/fltk
+PLIST_FILES= bin/pinentry-fltk
+.else
+CONFIGURE_ARGS+=--disable-pinentry-fltk
.endif
.if ${PINENTRY_GUI} == "curses"
Modified: head/security/pinentry/distinfo
==============================================================================
--- head/security/pinentry/distinfo Sat Jan 20 23:59:11 2018 (r459559)
+++ head/security/pinentry/distinfo Sun Jan 21 00:38:29 2018 (r459560)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481880660
-SHA256 (pinentry-1.0.0.tar.bz2) = 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
-SIZE (pinentry-1.0.0.tar.bz2) = 436930
+TIMESTAMP = 1516041715
+SHA256 (pinentry-1.1.0.tar.bz2) = 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
+SIZE (pinentry-1.1.0.tar.bz2) = 467702
Added: head/security/pinentry/files/patch-fltk_pinwindow.cxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/pinentry/files/patch-fltk_pinwindow.cxx Sun Jan 21 00:38:29 2018 (r459560)
@@ -0,0 +1,23 @@
+Rename encrypt to encrypt_pixmap to avoid namespace conflict with
+unistd.h encrypt() on FreeBSD 10.4
+
+--- fltk/pinwindow.cxx.orig 2018-01-15 23:08:38 UTC
++++ fltk/pinwindow.cxx
+@@ -46,7 +46,7 @@ const char *PinWindow::PROMPT = "Passph
+
+ static const char *timeout_format = "%s(%d)";
+
+-static Fl_Pixmap encrypt(encrypt_xpm);
++static Fl_Pixmap encrypt_pixmap(encrypt_xpm);
+ static Fl_Pixmap icon(icon_xpm);
+
+ PinWindow::PinWindow() : window_(NULL)
+@@ -147,7 +147,7 @@ int PinWindow::init(const int cx, const
+ window_->icon(&app);
+
+ icon_ = new Fl_Box(10, 10, 64, 64);
+- icon_->image(encrypt);
++ icon_->image(encrypt_pixmap);
+
+ message_ = new Fl_Box(79, 5, cx-99, 44, PROMPT);
+ message_->align(Fl_Align(FL_ALIGN_LEFT_TOP | FL_ALIGN_WRAP | FL_ALIGN_INSIDE)); // left
More information about the svn-ports-all
mailing list