From owner-svn-ports-all@freebsd.org Sun Jan 21 02:22:43 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50AD8ED6550; Sun, 21 Jan 2018 02:22:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2BBED764F6; Sun, 21 Jan 2018 02:22:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52CBA2519E; Sun, 21 Jan 2018 02:22:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0L2MgB5050299; Sun, 21 Jan 2018 02:22:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0L2MgkV050297; Sun, 21 Jan 2018 02:22:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801210222.w0L2MgkV050297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 21 Jan 2018 02:22:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459567 - in head/security/veracrypt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/security/veracrypt: . files X-SVN-Commit-Revision: 459567 X-SVN-Commit-Repository: ports 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.25 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: Sun, 21 Jan 2018 02:22:43 -0000 Author: jbeich Date: Sun Jan 21 02:22:41 2018 New Revision: 459567 URL: https://svnweb.freebsd.org/changeset/ports/459567 Log: security/veracrypt: unbreak build with wxWidgets 3.0.3 TextUserInterface.cpp:122:5: error: const_cast from 'const wxScopedWCharBuffer' (aka 'const wxScopedCharTypeBuffer') to 'wchar_t *' is not allowed const_cast (passwordStr.wc_str())[i] = L'X'; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 223758 Submitted by: rozhuk.im@gmail.com Approved by: maintainer timeout (2 months) Added: head/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp (contents, props changed) Modified: head/security/veracrypt/Makefile (contents, props changed) Modified: head/security/veracrypt/Makefile ============================================================================== --- head/security/veracrypt/Makefile Sun Jan 21 02:22:17 2018 (r459566) +++ head/security/veracrypt/Makefile Sun Jan 21 02:22:41 2018 (r459567) @@ -2,6 +2,7 @@ PORTNAME= veracrypt PORTVERSION= 1.21 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/v/V/:S/c/C/}%20${PORTVERSION}/ DISTNAME= ${PORTNAME:S/v/V/:S/c/C/}_${PORTVERSION}_Source Added: head/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/veracrypt/files/patch-src_Main_TextUserInterface.cpp Sun Jan 21 02:22:41 2018 (r459567) @@ -0,0 +1,15 @@ +TextUserInterface.cpp:122:5: error: const_cast from 'const wxScopedWCharBuffer' (aka 'const wxScopedCharTypeBuffer') to 'wchar_t *' is not allowed + const_cast (passwordStr.wc_str())[i] = L'X'; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/Main/TextUserInterface.cpp.orig 2017-07-09 22:31:19 UTC ++++ src/Main/TextUserInterface.cpp +@@ -119,7 +119,7 @@ namespace VeraCrypt + for (size_t i = 0; i < length && i < VolumePassword::MaxSize; ++i) + { + passwordBuf[i] = (wchar_t) passwordStr[i]; +- const_cast (passwordStr.wc_str())[i] = L'X'; ++ passwordStr[i] = L'X'; + } + + if (verify && verPhase)