Date: Sun, 21 Jan 2018 02:22:42 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459567 - in head/security/veracrypt: . files Message-ID: <201801210222.w0L2MgkV050297@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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<wchar_t>') to 'wchar_t *' is not allowed const_cast <wchar_t *> (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<wchar_t>') to 'wchar_t *' is not allowed + const_cast <wchar_t *> (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 <wchar_t *> (passwordStr.wc_str())[i] = L'X'; ++ passwordStr[i] = L'X'; + } + + if (verify && verPhase)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801210222.w0L2MgkV050297>