Attachment #189772 for bug #225190

Lines 2-9 Link Here

(-)security/pinentry/Makefile (-3 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pinentry	4	PORTNAME= pinentry
5	PORTVERSION= 1.0.0	5	PORTVERSION= 1.1.0
6	PORTREVISION?= 3	6	PORTREVISION?= 0
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= GNUPG/pinentry	8	MASTER_SITES= GNUPG/pinentry
9		9
Lines 22-28 Link Here
22	PLIST_FILES= bin/pinentry	22	PLIST_FILES= bin/pinentry
23		23
24	OPTIONS_SINGLE= FRONTEND	24	OPTIONS_SINGLE= FRONTEND
25	OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 QT5 GNOME3	25	OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 QT5 GNOME3 FLTK
26	OPTIONS_DEFAULT= TTY	26	OPTIONS_DEFAULT= TTY
27		27
28	FRONTEND_DESC= Default frontend	28	FRONTEND_DESC= Default frontend
Lines 51-56 Link Here
51	PINENTRY_GNOME3= pinentry-gnome3	51	PINENTRY_GNOME3= pinentry-gnome3
52	GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3	52	GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3
53		53
		54	FLTK_DESC= FLTK frontend
		55	PINENTRY_FLTK= pinentry-fltk
		56	FLTK_RUN_DEPENDS= ${PINENTRY_FLTK}:security/pinentry-fltk
		57
54	.include <bsd.port.options.mk>	58	.include <bsd.port.options.mk>
55		59
56	.for gui in ${OPTIONS_SINGLE_FRONTEND}	60	.for gui in ${OPTIONS_SINGLE_FRONTEND}
Lines 112-117 Link Here
112	CONFIGURE_ARGS+=--disable-pinentry-gtk2	116	CONFIGURE_ARGS+=--disable-pinentry-gtk2
113	.endif	117	.endif
114		118
		119	.if ${PINENTRY_GUI} == "fltk"
		120	USES+= compiler:c++11-lib
		121	LIB_DEPENDS+= libfltk.so:x11-toolkits/fltk
		122	PLIST_FILES= bin/pinentry-fltk
		123	.else
		124	CONFIGURE_ARGS+=--disable-pinentry-fltk
		125	.endif
		126
115	.if ${PINENTRY_GUI} == "curses"	127	.if ${PINENTRY_GUI} == "curses"
116	PLIST_FILES= bin/pinentry-curses	128	PLIST_FILES= bin/pinentry-curses
117	.else	129	.else

Lines 1-3 Link Here

(-)security/pinentry/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1481880660	1	TIMESTAMP = 1516041715
2	SHA256 (pinentry-1.0.0.tar.bz2) = 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a	2	SHA256 (pinentry-1.1.0.tar.bz2) = 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
3	SIZE (pinentry-1.0.0.tar.bz2) = 436930	3	SIZE (pinentry-1.1.0.tar.bz2) = 467702




--- configure.orig	2016-11-22 08:01:14 UTC
+++ configure
@@ -9948,7 +9948,7 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
 $as_echo_n "checking moc version... " >&6; }
     mocversion=`$MOC -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -10046,7 +10046,7 @@ else
 fi
 
       mocversion=`$MOC2 -v 2>&1`
-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
       if test x"$mocversiongrep" != x"$mocversion"; then
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
@@ -10142,7 +10142,7 @@ fi
 
         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
         mocversion=`$qt5tooldir/moc -v 2>&1`
-        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
         if test x"$mocversiongrep" != x"$mocversion"; then
           # no valid moc found
           have_qt5_libs="no";




Rename encrypt to encrypt_pixmap to avoid namespace conflict with
unistd.h encrypt() on 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

Lines 1-4 Link Here

(-)security/pinentry/files/patch-secmem_secmem.c (-1 / +1 lines)
1	--- secmem/secmem.c.orig 2016-04-14 14:39:51 UTC	1	--- secmem/secmem.c.orig 2017-12-03 16:13:05 UTC
2	+++ secmem/secmem.c	2	+++ secmem/secmem.c
3	@@ -88,7 +88,7 @@ log_fatal(char *template, ...)	3	@@ -88,7 +88,7 @@ log_fatal(char *template, ...)
4	# define MAP_ANONYMOUS MAP_ANON	4	# define MAP_ANONYMOUS MAP_ANON

Return to bug 225190

Lines 1-29 Link Here

(-)security/pinentry/files/patch-configure (-29 lines)
1	--- configure.orig 2016-11-22 08:01:14 UTC
2	+++ configure
3	@@ -9948,7 +9948,7 @@ fi
4	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
5	$as_echo_n "checking moc version... " >&6; }
6	mocversion=`$MOC -v 2>&1`
7	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc 5"`
8	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc 5"`
9	if test x"$mocversiongrep" != x"$mocversion"; then
10	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11	$as_echo "no" >&6; }
12	@@ -10046,7 +10046,7 @@ else
13	fi
14
15	mocversion=`$MOC2 -v 2>&1`
16	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc-qt5 5\\|moc 5"`
17	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc-qt5 5\|moc 5"`
18	if test x"$mocversiongrep" != x"$mocversion"; then
19	if test -n "$ac_tool_prefix"; then
20	# Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
21	@@ -10142,7 +10142,7 @@ fi
22
23	qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env \| grep QTTOOLDIR \| cut -d '=' -f 2 \| cut -d \" -f 2`
24	mocversion=`$qt5tooldir/moc -v 2>&1`
25	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc 5"`
26	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc 5"`
27	if test x"$mocversiongrep" != x"$mocversion"; then
28	# no valid moc found
29	have_qt5_libs="no";

Line 0 Link Here

(-)security/pinentry/files/patch-fltk_pinwindow.cxx (+23 lines)
	1	Rename encrypt to encrypt_pixmap to avoid namespace conflict with
	2	unistd.h encrypt() on 10.4
	3
	4	--- fltk/pinwindow.cxx.orig 2018-01-15 23:08:38 UTC
	5	+++ fltk/pinwindow.cxx
	6	@@ -46,7 +46,7 @@ const char *PinWindow::PROMPT = "Passph
	7
	8	static const char *timeout_format = "%s(%d)";
	9
	10	-static Fl_Pixmap encrypt(encrypt_xpm);
	11	+static Fl_Pixmap encrypt_pixmap(encrypt_xpm);
	12	static Fl_Pixmap icon(icon_xpm);
	13
	14	PinWindow::PinWindow() : window_(NULL)
	15	@@ -147,7 +147,7 @@ int PinWindow::init(const int cx, const
	16	window_->icon(&app);
	17
	18	icon_ = new Fl_Box(10, 10, 64, 64);
	19	- icon_->image(encrypt);
	20	+ icon_->image(encrypt_pixmap);
	21
	22	message_ = new Fl_Box(79, 5, cx-99, 44, PROMPT);
	23	message_->align(Fl_Align(FL_ALIGN_LEFT_TOP \| FL_ALIGN_WRAP \| FL_ALIGN_INSIDE)); // left