Attachment 28992 Details for Bug 48548 – file.diff

[patch] file.diff

file.diff (text/plain), 2.26 KB, created by Michael Nottebrock on 2003-02-21 21:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Nottebrock

Created: 2003-02-21 21:00:29 UTC

Size: 2.26 KB

patch

obsolete

>diff -urN pinentry.orig/Makefile pinentry/Makefile
>--- pinentry.orig/Makefile	Fri Feb 21 14:26:53 2003
>+++ pinentry/Makefile	Fri Feb 21 21:49:06 2003
>@@ -2,11 +2,12 @@
> # Date created:		29 Jan 2003
> # Whom:			michaelnottebrock@gmx.net
> #
>-# $FreeBSD: ports/security/pinentry/Makefile,v 1.5 2003/02/21 13:26:53 knu Exp $
>+# $FreeBSD: ports/security/pinentry/Makefile,v 1.3 2003/02/08 05:50:58 nork Exp $
> #
> 
> PORTNAME=	pinentry
> PORTVERSION=	0.6.8
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_GNUPG} \
> 		http://tigress.com/lofi/:lofi
>@@ -37,15 +38,24 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if exists(${X11BASE}/bin/moc)
>+WITH_QT=	yes
>+.endif
>+
> .if defined(WITH_QT)
>-#USE_QT_VER=	3
>-BROKEN=	The QT pinentry-helper is currently non-functional
>+USE_QT_VER=	3
>+PLIST_SUB+=	WITH_QT=""
> .else
> CONFIGURE_ARGS+=--disable-pinentry-qt
>+PLIST_SUB+=	WITH_QT="@comment "
> .endif
> 
> .if defined(HAVE_GTK)
> USE_GTK=	yes
>+PLIST_SUB+=	WITH_GTK=""
>+.else
>+CONFIGURE_ARGS+=--disable-pinentry-gtk
>+PLIST_SUB+=	WITH_GTK="@comment "
> .endif
> 
> post-extract:
>diff -urN pinentry.orig/files/patch-qt::pinentrycontroller.cpp pinentry/files/patch-qt::pinentrycontroller.cpp
>--- pinentry.orig/files/patch-qt::pinentrycontroller.cpp	Thu Jan  1 01:00:00 1970
>+++ pinentry/files/patch-qt::pinentrycontroller.cpp	Thu Feb 13 00:23:59 2003
>@@ -0,0 +1,13 @@
>+--- qt/pinentrycontroller.cpp.orig	Thu Feb 13 00:20:44 2003
>++++ qt/pinentrycontroller.cpp	Thu Feb 13 00:21:32 2003
>+@@ -256,9 +256,8 @@
>+   connect( _pinentry, SIGNAL( rejected() ),
>+ 	   this, SLOT( slotRejected() ) );
>+   bool ret = _pinentry->exec();  
>+-  FILE* fp = assuan_get_data_fp( _ctx );
>+   if( ret ) {
>+-    fputs( static_cast<const char*>(_pinentry->text().utf8()), fp );
>++    assuan_send_data ( _ctx, static_cast<const void*>(_pinentry->text().utf8()), _pinentry->text().utf8().length() );
>+     return 0;
>+   } else {
>+     assuan_set_error( _ctx, ASSUAN_Canceled, "Dialog cancelled by user" );
>diff -urN pinentry.orig/pkg-plist pinentry/pkg-plist
>--- pinentry.orig/pkg-plist	Thu Jan 30 23:37:06 2003
>+++ pinentry/pkg-plist	Fri Feb 21 21:49:39 2003
>@@ -1,5 +1,5 @@
> bin/pinentry-curses
>-bin/pinentry-gtk
>+%%WITH_GTK%%bin/pinentry-gtk
> %%WITH_QT%%bin/pinentry-qt
> @unexec install-info --delete %D/info/pinentry.info %D/info/dir
> info/pinentry.info

Actions: View | Diff

Attachments on bug 48548: 28992