[Help-gnutls] Re: gnutls_openpgp_privkey_import() behavior seems inconsistent depending on choice of "format" variable

[Daniel Kahn Gillmor]

Thanks for the response, Ludovic--

On Thu 2008-04-03 11:44:36 -0400, Ludovic Courtès wrote:

>>>   http://permalink.gmane.org/gmane.network.gnutls.general/657
>
> You mean, it's still present after applying the referred patch?

Ah, i hadn't tried to apply the patch in the referenced message -- i
misunderstood and thought it was already applied.  I haven't applied
it myself.

When i try to apply it to the master branch in git, none of the hunks
are accepted:

[0 dkg at squeak git-gnutls]$ wget -q -O- 'http://cache.gmane.org/gmane/network/gnutls/general/657-001.bin' | patch -p1 --dry-run -f
patching file lib/gnutls_cert.c
Hunk #1 FAILED at 718.
1 out of 1 hunk FAILED -- saving rejects to file lib/gnutls_cert.c.rej
can't find file to patch at input line 18
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|
|--- orig/lib/gnutls_extra_hooks.h
|+++ mod/lib/gnutls_extra_hooks.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 32
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|
|--- orig/libextra/gnutls_openpgp.c
|+++ mod/libextra/gnutls_openpgp.c
--------------------------
No file to patch.  Skipping patch.
6 out of 6 hunks ignored
can't find file to patch at input line 103
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|
|--- orig/libextra/openpgp/gnutls_openpgp.h
|+++ mod/libextra/openpgp/gnutls_openpgp.h
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 117
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|
|--- orig/libextra/openpgp/privkey.c
|+++ mod/libextra/openpgp/privkey.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
[1 dkg at squeak git-gnutls]$ 

Does it apply for you?  Am i doing something wrong?  Is this because
of the OpenPGP overhaul?

   --dkg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 826 bytes
Desc: not available
URL: </pipermail/attachments/20080403/9c8f4cf1/attachment.pgp>