From owner-svn-ports-all@FreeBSD.ORG Fri Jul 5 13:21:08 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4562BA73; Fri, 5 Jul 2013 13:21:08 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37B3C1D2F; Fri, 5 Jul 2013 13:21:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65DL7At038129; Fri, 5 Jul 2013 13:21:07 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65DL76Z038127; Fri, 5 Jul 2013 13:21:07 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201307051321.r65DL76Z038127@svn.freebsd.org> From: Alex Dupre Date: Fri, 5 Jul 2013 13:21:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322323 - in head/security/openct: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jul 2013 13:21:08 -0000 Author: ale Date: Fri Jul 5 13:21:07 2013 New Revision: 322323 URL: http://svnweb.freebsd.org/changeset/ports/322323 Log: Don't crash when backend cannot be signalled. Update master sites. PR: ports/180291 Submitted by: Marcin Cieslak Added: head/security/openct/files/patch-ctapi.c (contents, props changed) Modified: head/security/openct/Makefile Modified: head/security/openct/Makefile ============================================================================== --- head/security/openct/Makefile Fri Jul 5 13:16:57 2013 (r322322) +++ head/security/openct/Makefile Fri Jul 5 13:21:07 2013 (r322323) @@ -3,9 +3,10 @@ PORTNAME= openct PORTVERSION= 0.6.20 +PORTREVISION= 1 CATEGORIES= security -MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \ - http://www.opensc-project.org/files/${PORTNAME}/testing/ +MASTER_SITES= SF +MASTER_SITE_SUBDIR= opensc/${PORTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= Middleware framework for smart card terminals Added: head/security/openct/files/patch-ctapi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openct/files/patch-ctapi.c Fri Jul 5 13:21:07 2013 (r322323) @@ -0,0 +1,15 @@ +--- src/ctapi/ctapi.c 2006-04-25 23:58:06.000000000 +0200 ++++ src/ctapi/ctapi.c 2013-07-05 10:08:41.000000000 +0200 +@@ -562,7 +562,11 @@ + ct->next = cardTerminals; + cardTerminals = ct; + ct->cwd = &ct->mf; +- ct_reader_info(pn, &info); ++ if (ct_reader_info(pn, &info) < 0) { ++ free(ct); ++ ct_error("ct_reader_info failed\n"); ++ return ERR_INVALID; ++ } + ct->mf.id = 0x3f00; + ct->mf.gen = dir; + ct->mf.dir[0] = &ct->mf;