On 2022/11/24 01:31, Yifei Zhan wrote: > vnconfig used to accept a -c option for configuring virtual disk node, but > this > option is not required as configuring virtual disk node is always the default > operation. Since OpenBSD 5.6, this option is no longer accepted and will > result > in an error, preventing veracrypt from mounting any volume. > > This change removes the -c option when invoking vnconfig. I've taken this > patch > upstream[1], before that got merged, we can have it in-tree. > > also cc' maintainer > > [1]: https://github.com/veracrypt/VeraCrypt/pull/1002
I'd mention the PR in the patch file, e.g. The -c option is no more. https://github.com/veracrypt/VeraCrypt/pull/1002 (no need to send a new diff, whoever commits can adjust it) If there are no objections from the maintainer soon I think we should go ahead and commit. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/security/veracrypt/Makefile,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 Makefile > --- Makefile 14 Mar 2022 11:07:46 -0000 1.3 > +++ Makefile 23 Nov 2022 00:00:52 -0000 > @@ -5,6 +5,7 @@ DISTNAME= VeraCrypt_${V}_Source > PKGNAME= veracrypt-${V} > CATEGORIES= security > HOMEPAGE= https://www.veracrypt.fr/ > +REVISION= 0 > > MAINTAINER= Tietoturvamies <m...@tietoturvamies.fi> > > Index: patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp > =================================================================== > RCS file: patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp > diff -N patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp 23 Nov 2022 00:00:52 > -0000 > @@ -0,0 +1,14 @@ > +The -c option is no more > + > +Index: Core/Unix/OpenBSD/CoreOpenBSD.cpp > +--- Core/Unix/OpenBSD/CoreOpenBSD.cpp.orig > ++++ Core/Unix/OpenBSD/CoreOpenBSD.cpp > +@@ -69,8 +69,6 @@ namespace VeraCrypt > + if (freeVnd == -1) > + throw "couldn't find free vnd"; > + > +- args.push_back ("-c"); > +- > + stringstream freePath; > + freePath << "vnd" << freeVnd; > + args.push_back (freePath.str()); >
