From lofi@lofi.dyndns.org  Fri Feb 21 12:59:55 2003
Return-Path: <lofi@lofi.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D5A637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 12:59:55 -0800 (PST)
Received: from meitner.wh.uni-dortmund.de (meitner.wh.Uni-Dortmund.DE [129.217.129.133])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7D29343FE1
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 12:59:51 -0800 (PST)
	(envelope-from lofi@lofi.dyndns.org)
Received: from lofi.dyndns.org ([10.3.12.105])
	by meitner.wh.uni-dortmund.de (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id h1LKxoc02799
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 21:59:50 +0100
Received: from lofi.dyndns.org (lofi@localhost [127.0.0.1])
	by lofi.dyndns.org (8.12.6/8.12.6) with ESMTP id h1LKxcWN022834
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Feb 2003 21:59:39 +0100 (CET)
	(envelope-from lofi@lofi.dyndns.org)
Received: (from lofi@localhost)
	by lofi.dyndns.org (8.12.6/8.12.6/Submit) id h1LKxcpJ022833;
	Fri, 21 Feb 2003 21:59:38 +0100 (CET)
	(envelope-from lofi)
Message-Id: <200302212059.h1LKxcpJ022833@lofi.dyndns.org>
Date: Fri, 21 Feb 2003 21:59:38 +0100 (CET)
From: Michael Nottebrock <lofi@lofi.dyndns.org>
Reply-To: Michael Nottebrock <michaelnottebrock@gmx.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update: security/pinentry (supersedes ports/48532)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48548
>Category:       ports
>Synopsis:       Maintainer update: security/pinentry (supersedes ports/48532)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 21 13:00:29 PST 2003
>Closed-Date:    Sat Feb 22 09:12:37 PST 2003
>Last-Modified:  Sat Feb 22 09:12:37 PST 2003
>Originator:     Michael Nottebrock
>Release:        FreeBSD 5.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD lofi.dyndns.org 5.0-RELEASE-p1 FreeBSD 5.0-RELEASE-p1 #0: Thu Feb 6 06:12:21 CET 2003 lofi@lofi.dyndns.org:/usr/obj/usr/src/sys/LOFI i386


	
>Description:
	Changes:
                - add fix for pinentry-qt and enable its build.
                - fix up Makefile and pkg-plist (and thus, hopefully, the build on bento).
                - bump PORTREVISION.
	Changes from previous PR:
		- Do not back out interim commits to the port. Note to committers: Notifying
		  port-maintainers of changes you make can help avoid gratuitous PRs. :)
>How-To-Repeat:
	
>Fix:
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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Sat Feb 22 09:11:32 PST 2003 
State-Changed-Why:  
Committed, thanks. 
Additional I converted the port to use bsd.gnomeng.mk. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48548 
>Unformatted:
