From owner-freebsd-ports-bugs Fri Feb 7 13:40: 9 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA2BD37B401 for ; Fri, 7 Feb 2003 13:40:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA0C743F93 for ; Fri, 7 Feb 2003 13:40:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h17Le5NS031405 for ; Fri, 7 Feb 2003 13:40:05 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h17Le5Rr031404; Fri, 7 Feb 2003 13:40:05 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE8CB37B401 for ; Fri, 7 Feb 2003 13:38:42 -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 7402B43FAF for ; Fri, 7 Feb 2003 13:38:41 -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 h17Lcbc28782 for ; Fri, 7 Feb 2003 22:38:37 +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 h17LcTsG064784 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Fri, 7 Feb 2003 22:38:30 +0100 (CET) (envelope-from lofi@lofi.dyndns.org) Received: (from lofi@localhost) by lofi.dyndns.org (8.12.6/8.12.6/Submit) id h17LcSBl064783; Fri, 7 Feb 2003 22:38:28 +0100 (CET) (envelope-from lofi) Message-Id: <200302072138.h17LcSBl064783@lofi.dyndns.org> Date: Fri, 7 Feb 2003 22:38:28 +0100 (CET) From: Michael Nottebrock Reply-To: Michael Nottebrock To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/48068: maintainer-update: security/pinentry Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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 ) >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(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