Attachment 189762 Details for Bug 225190 – pinentry-1.1.0.patch

[patch] pinentry-1.1.0.patch

pinentry-1.1.0.patch (text/plain), 5.48 KB, created by Dmitri Goutnik on 2018-01-15 20:16:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-01-15 20:16:14 UTC

Size: 5.48 KB

patch

obsolete

>Index: security/pinentry/Makefile
>===================================================================
>--- security/pinentry/Makefile	(revision 459101)
>+++ security/pinentry/Makefile	(working copy)
>@@ -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 @@
> PLIST_FILES=	bin/pinentry
> 
> OPTIONS_SINGLE=	FRONTEND
>-OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4 QT5 GNOME3
>+OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4 QT5 GNOME3 FLTK
> OPTIONS_DEFAULT=	TTY
> 
> FRONTEND_DESC=	Default frontend
>@@ -51,6 +51,10 @@
> PINENTRY_GNOME3=	pinentry-gnome3
> GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:security/pinentry-gnome3
> 
>+FLTK_DESC=	FLTK frontend
>+PINENTRY_FLTK=	pinentry-fltk
>+FLTK_RUN_DEPENDS=	${PINENTRY_FLTK}:security/pinentry-fltk
>+
> .include <bsd.port.options.mk>
> 
> .for gui in ${OPTIONS_SINGLE_FRONTEND}
>@@ -112,6 +116,14 @@
> 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"
> PLIST_FILES=	bin/pinentry-curses
> .else
>Index: security/pinentry/distinfo
>===================================================================
>--- security/pinentry/distinfo	(revision 459101)
>+++ security/pinentry/distinfo	(working copy)
>@@ -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
>Index: security/pinentry/files/patch-configure
>===================================================================
>--- security/pinentry/files/patch-configure	(revision 459101)
>+++ security/pinentry/files/patch-configure	(nonexistent)
>@@ -1,29 +0,0 @@
>---- 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";
>
>Property changes on: security/pinentry/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/pinentry/files/patch-fltk_pinwindow.cxx
>===================================================================
>--- security/pinentry/files/patch-fltk_pinwindow.cxx	(nonexistent)
>+++ security/pinentry/files/patch-fltk_pinwindow.cxx	(working copy)
>@@ -0,0 +1,22 @@
>+--- fltk/pinwindow.cxx.orig	2018-01-15 19:47:12 UTC
>++++ fltk/pinwindow.cxx
>+@@ -46,9 +46,6 @@ const char *PinWindow::PROMPT		= "Passph
>+ 
>+ static const char *timeout_format = "%s(%d)";
>+ 
>+-static Fl_Pixmap encrypt(encrypt_xpm);
>+-static Fl_Pixmap icon(icon_xpm);
>+-
>+ PinWindow::PinWindow() : window_(NULL)
>+ 				,message_(NULL) ,input_(NULL) ,ok_(NULL) ,cancel_(NULL)
>+ 				,cancel_name_(BUTTON_CANCEL)
>+@@ -140,6 +137,9 @@ void PinWindow::showModal(const int argc
>+ 
>+ int PinWindow::init(const int cx, const int cy)
>+ {
>++	static Fl_Pixmap encrypt(encrypt_xpm);
>++	static Fl_Pixmap icon(icon_xpm);
>++
>+ 	assert(NULL == window_);
>+ 	window_ = new Fl_Window(cx, cy, TITLE);
>+ 
>
>Property changes on: security/pinentry/files/patch-fltk_pinwindow.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/pinentry/files/patch-secmem_secmem.c
>===================================================================
>--- security/pinentry/files/patch-secmem_secmem.c	(revision 459101)
>+++ security/pinentry/files/patch-secmem_secmem.c	(working copy)
>@@ -1,4 +1,4 @@
>---- secmem/secmem.c.orig	2016-04-14 14:39:51 UTC
>+--- secmem/secmem.c.orig	2017-12-03 16:13:05 UTC
> +++ secmem/secmem.c
> @@ -88,7 +88,7 @@ log_fatal(char *template, ...)
>  #  define MAP_ANONYMOUS MAP_ANON

Actions: View | Diff

Attachments on bug 225190: 189762 | 189772