Attachment #28992 for bug #48548

View | Details | Raw Unified | Return to bug 48548
Collapse All | Expand All




# Date created:		29 Jan 2003
# Whom:			michaelnottebrock@gmx.net
#
# $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


.include <bsd.port.pre.mk>

.if exists(${X11BASE}/bin/moc)
WITH_QT=	yes
.endif

.if defined(WITH_QT)
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:




--- 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" );

Lines 1-5 Link Here

(-)pinentry/pkg-plist (-1 / +1 lines)
1	bin/pinentry-curses	1	bin/pinentry-curses
2	bin/pinentry-gtk	2	%%WITH_GTK%%bin/pinentry-gtk
3	%%WITH_QT%%bin/pinentry-qt	3	%%WITH_QT%%bin/pinentry-qt
4	@unexec install-info --delete %D/info/pinentry.info %D/info/dir	4	@unexec install-info --delete %D/info/pinentry.info %D/info/dir
5	info/pinentry.info	5	info/pinentry.info

Return to bug 48548

Lines 2-12 Link Here

(-)pinentry/Makefile (-3 / +13 lines)
2	# Date created: 29 Jan 2003	2	# Date created: 29 Jan 2003
3	# Whom: michaelnottebrock@gmx.net	3	# Whom: michaelnottebrock@gmx.net
4	#	4	#
5	# $FreeBSD: ports/security/pinentry/Makefile,v 1.5 2003/02/21 13:26:53 knu Exp $	5	# $FreeBSD: ports/security/pinentry/Makefile,v 1.3 2003/02/08 05:50:58 nork Exp $
6	#	6	#
7		7
8	PORTNAME= pinentry	8	PORTNAME= pinentry
9	PORTVERSION= 0.6.8	9	PORTVERSION= 0.6.8
		10	PORTREVISION= 1
10	CATEGORIES= security	11	CATEGORIES= security
11	MASTER_SITES= ${MASTER_SITE_GNUPG} \	12	MASTER_SITES= ${MASTER_SITE_GNUPG} \
12	http://tigress.com/lofi/:lofi	13	http://tigress.com/lofi/:lofi
Lines 37-51 Link Here
37		38
38	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
39		40
		41	.if exists(${X11BASE}/bin/moc)
		42	WITH_QT= yes
		43	.endif
		44
40	.if defined(WITH_QT)	45	.if defined(WITH_QT)
41	#USE_QT_VER= 3	46	USE_QT_VER= 3
42	BROKEN= The QT pinentry-helper is currently non-functional	47	PLIST_SUB+= WITH_QT=""
43	.else	48	.else
44	CONFIGURE_ARGS+=--disable-pinentry-qt	49	CONFIGURE_ARGS+=--disable-pinentry-qt
		50	PLIST_SUB+= WITH_QT="@comment "
45	.endif	51	.endif
46		52
47	.if defined(HAVE_GTK)	53	.if defined(HAVE_GTK)
48	USE_GTK= yes	54	USE_GTK= yes
		55	PLIST_SUB+= WITH_GTK=""
		56	.else
		57	CONFIGURE_ARGS+=--disable-pinentry-gtk
		58	PLIST_SUB+= WITH_GTK="@comment "
49	.endif	59	.endif
50		60
51	post-extract:	61	post-extract:

Line 0 Link Here

(-)pinentry/files/patch-qt::pinentrycontroller.cpp (+13 lines)
	1	--- qt/pinentrycontroller.cpp.orig Thu Feb 13 00:20:44 2003
	2	+++ qt/pinentrycontroller.cpp Thu Feb 13 00:21:32 2003
	3	@@ -256,9 +256,8 @@
	4	connect( _pinentry, SIGNAL( rejected() ),
	5	this, SLOT( slotRejected() ) );
	6	bool ret = _pinentry->exec();
	7	- FILE* fp = assuan_get_data_fp( _ctx );
	8	if( ret ) {
	9	- fputs( static_cast<const char*>(_pinentry->text().utf8()), fp );
	10	+ assuan_send_data ( _ctx, static_cast<const void*>(_pinentry->text().utf8()), _pinentry->text().utf8().length() );
	11	return 0;
	12	} else {
	13	assuan_set_error( _ctx, ASSUAN_Canceled, "Dialog cancelled by user" );