Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Feb 2003 22:38:28 +0100 (CET)
From:      Michael Nottebrock <lofi@lofi.dyndns.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/48068: maintainer-update: security/pinentry
Message-ID:  <200302072138.h17LcSBl064783@lofi.dyndns.org>

next in thread | raw e-mail | index | archive | help

>Number:         48068
>Category:       ports
>Synopsis:       maintainer-update: security/pinentry
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 07 13:40:05 PST 2003
>Closed-Date:
>Last-Modified:
>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:
		- Update to 0.6.8
		- Remove two patches
		- Disable pinentry-qt for real (submitted by: Will Andrews <will@csociety.org>)
>How-To-Repeat:
	
>Fix:
diff -urN pinentry.orig/Makefile pinentry/Makefile
--- pinentry.orig/Makefile	Thu Jan 30 23:44:55 2003
+++ pinentry/Makefile	Fri Feb  7 22:36:30 2003
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pinentry
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.8
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/pinentry/ \
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/aegypten/ \
 		http://tigress.com/lofi/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		common.tar.gz \
@@ -38,6 +38,8 @@
 .if defined(WITH_QT)
 #USE_QT_VER=	3
 BROKEN=	The QT pinentry-helper is currently non-functional
+.else
+CONFIGURE_ARGS+=--disable-pinentry-qt
 .endif
 
 .if defined(HAVE_GTK)
diff -urN pinentry.orig/distinfo pinentry/distinfo
--- pinentry.orig/distinfo	Thu Jan 30 23:37:06 2003
+++ pinentry/distinfo	Fri Feb  7 22:14:36 2003
@@ -1,3 +1,3 @@
-MD5 (pinentry-0.6.7.tar.gz) = d1fd852644571ab7edf6c01f51078210
+MD5 (pinentry-0.6.8.tar.gz) = be8460bc1ecc2596fabea931a48c5080
 MD5 (common.tar.gz) = 4f5171946f83dfe64761344d7e86af05
 MD5 (jnlib.tar.gz) = 9e8d48da4e6f8db94da64d444f4b3687
diff -urN pinentry.orig/files/patch-qt::main.cpp pinentry/files/patch-qt::main.cpp
--- pinentry.orig/files/patch-qt::main.cpp	Thu Jan 30 23:37:07 2003
+++ pinentry/files/patch-qt::main.cpp	Thu Jan  1 01:00:00 1970
@@ -1,15 +0,0 @@
---- qt/main.cpp.orig	Thu Jan 30 09:25:31 2003
-+++ qt/main.cpp	Thu Jan 30 09:26:10 2003
-@@ -157,6 +157,12 @@
- #ifdef FALLBACK_CURSES
-   if( pinentry_have_display (argc, argv) ) {
- #endif
-+	// Work around non-standard handling of DISPLAY
-+	for( int i = 1; i < argc; ++i ) {
-+    	if( !strcmp( "--display", argv[i] ) ) {
-+        	argv[i] = "-display";
-+    	}
-+  	}
-     return qt_main( argc, argv );
- #ifdef FALLBACK_CURSES
-   } else {
diff -urN pinentry.orig/files/patch-qt::pinentrycontroller.cpp pinentry/files/patch-qt::pinentrycontroller.cpp
--- pinentry.orig/files/patch-qt::pinentrycontroller.cpp	Thu Jan 30 23:37:07 2003
+++ pinentry/files/patch-qt::pinentrycontroller.cpp	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- qt/pinentrycontroller.cpp.orig	Thu Jan 30 09:25:51 2003
-+++ qt/pinentrycontroller.cpp	Thu Jan 30 09:26:15 2003
-@@ -56,6 +56,8 @@
-   
-   assuan_set_malloc_hooks( secmem_malloc, secmem_realloc, secmem_free );
-   int rc = assuan_init_pipe_server( &_ctx, fds );
-+  assuan_set_log_stream (_ctx, stderr);
-+
-   if( rc ) {
-     qDebug(assuan_strerror( static_cast<AssuanError>(rc) ));
-     exit(-1);

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302072138.h17LcSBl064783>