Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
Hi, On Mon, Mar 30, 2015 at 10:26 +0300, Samuli Seppänen wrote: > > On Fri, Mar 06, 2015 at 17:29 +0300, Vasily Kulikov wrote: > >> On Fri, Feb 27, 2015 at 20:34 +0100, Gert Doering wrote: > >>> Mmmh. Actually we don't usually do Makefile changes, as this is always > >>> generated by configure for us - so normally, it is good to have it in > >>> .gitignore. Of course your subdirectory has a Makefile in it for > >>> MacOS X only... > >>> > >>> So - git experts to the rescue - how's this normally done? > >>> > >>> (The textual change for doc/management-notes.txt does not warrant an extra > >>> patch, I'll change that on the fly) > >> Is the patch already merged? Or should I make any changes, e.g. remove > >> .gitignore changes? > > Any update? > > > I suggest we figure this out in today's meeting. Arne, AFAIU you are the one to ACK/NACK the v3..v4 diff. Have you looked at the patch after v3? Thank you, -- Vasily Kulikov http://www.openwall.com - bringing security into open computing environments
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 27/02/15 20:34, Gert Doering wrote: > Hi, > > On Fri, Feb 27, 2015 at 10:27:46PM +0300, Vasily Kulikov wrote: [...snip...] >> I've included .gitignore changes as my patch adds Makefile >> changes. It would be rather uncomfortable for openvpn developers >> to see Makefile and be not able to change it. > > Mmmh. Actually we don't usually do Makefile changes, as this is > always generated by configure for us - so normally, it is good to > have it in .gitignore. Of course your subdirectory has a Makefile > in it for MacOS X only... > > So - git experts to the rescue - how's this normally done? I agree with Arne, do 'git add -f contrib/keychain-mcd/Makefile' instead. And git will keep track of this file, regardless of .gitignore. I don't recall now if -f was always required or just recent versions needs it. I've double checked the .gitignore behaviour on git 1.8.3.1, which required the -f argument. And everything works as expected in this version. - -- kind regards, David Sommerseth -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlUZIIEACgkQDC186MBRfrrZOQCgoTh3PmYViPxP4NAl2aqQMDBJ tqoAn3vtnvwhN6qX1/bPhDjxjKTPdbgR =qJIy -END PGP SIGNATURE-
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
> Hi, > > On Fri, Mar 06, 2015 at 17:29 +0300, Vasily Kulikov wrote: >> On Fri, Feb 27, 2015 at 20:34 +0100, Gert Doering wrote: >>> Mmmh. Actually we don't usually do Makefile changes, as this is always >>> generated by configure for us - so normally, it is good to have it in >>> .gitignore. Of course your subdirectory has a Makefile in it for >>> MacOS X only... >>> >>> So - git experts to the rescue - how's this normally done? >>> >>> (The textual change for doc/management-notes.txt does not warrant an extra >>> patch, I'll change that on the fly) >> Is the patch already merged? Or should I make any changes, e.g. remove >> .gitignore changes? > Any update? > I suggest we figure this out in today's meeting. -- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock 0x198D22A3.asc Description: application/pgp-keys signature.asc Description: OpenPGP digital signature
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
Hi, On Fri, Mar 06, 2015 at 17:29 +0300, Vasily Kulikov wrote: > On Fri, Feb 27, 2015 at 20:34 +0100, Gert Doering wrote: > > Mmmh. Actually we don't usually do Makefile changes, as this is always > > generated by configure for us - so normally, it is good to have it in > > .gitignore. Of course your subdirectory has a Makefile in it for > > MacOS X only... > > > > So - git experts to the rescue - how's this normally done? > > > > (The textual change for doc/management-notes.txt does not warrant an extra > > patch, I'll change that on the fly) > > Is the patch already merged? Or should I make any changes, e.g. remove > .gitignore changes? Any update? -- Vasily Kulikov http://www.openwall.com - bringing security into open computing environments
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
>>> (the diff for doc/management-notes.txt is in there twice), and there >>> is a patch for .gitignore in it as well. >> I've included .gitignore changes as my patch adds Makefile changes. It >> would be rather uncomfortable for openvpn developers to see Makefile and >> be not able to change it. > Mmmh. Actually we don't usually do Makefile changes, as this is always > generated by configure for us - so normally, it is good to have it in > .gitignore. Of course your subdirectory has a Makefile in it for > MacOS X only... > > So - git experts to the rescue - how's this normally done? > > just explicity git add the new Makefile under contrib/keychain-mcd. Git will then track the new makefile. (If I am reading the patch right that the mac os x specific keychain-cmd makefile is not generated by configure) Arne signature.asc Description: OpenPGP digital signature
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
Hi, On Fri, Feb 27, 2015 at 10:27:46PM +0300, Vasily Kulikov wrote: > > Sorry to be nagging... something in your patch was garbled, it contained > > stuff like > > > > --- > > only in patch2: > > unchanged: > > --- a/doc/management-notes.txt > > +++ b/doc/management-notes.txt > > @@ -777,6 +777,28 @@ correct signature. > > This capability is intended to allow the use of arbitrary cryptographic > > service providers with OpenVPN via the management interface. > > ... > > --- > > This stuff is missing in the patch itself which is in the email text, > and is contained in the attached interdiff file which contains changes > between patch v3 and v4. AFAICS, the patch doesn't contain any garbage. Looking more closely, I can now see what you did - the patch is in the mail text, and the actual attachment is not the patch but the diff between the patches (thus, doc/management-notes.txt appears twice). Did not expect that, and did not look closely enough. > > (the diff for doc/management-notes.txt is in there twice), and there > > is a patch for .gitignore in it as well. > > I've included .gitignore changes as my patch adds Makefile changes. It > would be rather uncomfortable for openvpn developers to see Makefile and > be not able to change it. Mmmh. Actually we don't usually do Makefile changes, as this is always generated by configure for us - so normally, it is good to have it in .gitignore. Of course your subdirectory has a Makefile in it for MacOS X only... So - git experts to the rescue - how's this normally done? (The textual change for doc/management-notes.txt does not warrant an extra patch, I'll change that on the fly) gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025g...@net.informatik.tu-muenchen.de pgpnrV4fdq4Z2.pgp Description: PGP signature
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
Hi Gert, On Fri, Feb 27, 2015 at 19:28 +0100, Gert Doering wrote: > On Wed, Feb 25, 2015 at 07:07:18PM +0300, Vasily Kulikov wrote: > > The patch is against commit 3341a98c2852d1d0c1eafdc70a3bdb218ec29049. > > > > v4: > > - added '--management-external-cert' argument > > - keychain-mcd now parses NEED-CERTIFICATE argument if 'auto' is passed > >as cmdline's identity template > > - fixed typo in help output option name > > - added '--management-external-cert' info in openvpn(8) manpage > > - added 'certificate' command documentation into doc/management-notes.txt > > Sorry to be nagging... something in your patch was garbled, it contained > stuff like > > --- > only in patch2: > unchanged: > --- a/doc/management-notes.txt > +++ b/doc/management-notes.txt > @@ -777,6 +777,28 @@ correct signature. > This capability is intended to allow the use of arbitrary cryptographic > service providers with OpenVPN via the management interface. > ... > --- This stuff is missing in the patch itself which is in the email text, and is contained in the attached interdiff file which contains changes between patch v3 and v4. AFAICS, the patch doesn't contain any garbage. > (the diff for doc/management-notes.txt is in there twice), and there > is a patch for .gitignore in it as well. I've included .gitignore changes as my patch adds Makefile changes. It would be rather uncomfortable for openvpn developers to see Makefile and be not able to change it. > Please generate the patch with "git format-patch", that should avoid > spurious stuff. > > > Also, in the doc/management-notes.txt, it has > > +COMMAND -- certificate (OpenVPN 2.3 or higher) > > please make that "2.4", as this code change is too large to go into 2.3 > (where we only do bug fixes and long-term stability stuff, but no new > features generally) It makes sense. -- Vasily Kulikov http://www.openwall.com - bringing security into open computing environments
Re: [Openvpn-devel] [PATCH v4] Mac OS X Keychain management client
Hi, On Wed, Feb 25, 2015 at 07:07:18PM +0300, Vasily Kulikov wrote: > The patch is against commit 3341a98c2852d1d0c1eafdc70a3bdb218ec29049. > > v4: > - added '--management-external-cert' argument > - keychain-mcd now parses NEED-CERTIFICATE argument if 'auto' is passed >as cmdline's identity template > - fixed typo in help output option name > - added '--management-external-cert' info in openvpn(8) manpage > - added 'certificate' command documentation into doc/management-notes.txt Sorry to be nagging... something in your patch was garbled, it contained stuff like --- only in patch2: unchanged: --- a/doc/management-notes.txt +++ b/doc/management-notes.txt @@ -777,6 +777,28 @@ correct signature. This capability is intended to allow the use of arbitrary cryptographic service providers with OpenVPN via the management interface. ... --- (the diff for doc/management-notes.txt is in there twice), and there is a patch for .gitignore in it as well. Please generate the patch with "git format-patch", that should avoid spurious stuff. Also, in the doc/management-notes.txt, it has +COMMAND -- certificate (OpenVPN 2.3 or higher) please make that "2.4", as this code change is too large to go into 2.3 (where we only do bug fixes and long-term stability stuff, but no new features generally) gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025g...@net.informatik.tu-muenchen.de pgpSHMug6jjwk.pgp Description: PGP signature
