Bug 616998 – mail-filter/opendkim-2.10.3-r3 fails on gnutls.patch

• Product: Gentoo Linux
• Status: RESOLVED INVALID

[Description Arnim Eijkhoudt 2017-04-29 12:50:16 UTC]

Created attachment 471280 [details]
emerge --info output

mail-filter/opendkim-2.10.3-r3 fails during patching phase on the gnutls.patch:

 * Package:    mail-filter/opendkim-2.10.3-r3
 * Repository: gentoo
 * Maintainer: [e-mail]
 * USE:        abi_x86_64 amd64 berkdb elibc_glibc gnutls kernel_linux ldap lmdb lua opendbx sasl ssl userland_GNU
 * FEATURES:   preserve-libs sandbox userpriv usersandbox
>>> Unpacking source...
>>> Unpacking opendkim-2.10.3.tar.gz to /var/tmp/portage/mail-filter/opendkim-2.10.3-r3/work
>>> Source unpacked in /var/tmp/portage/mail-filter/opendkim-2.10.3-r3/work
>>> Preparing source in /var/tmp/portage/mail-filter/opendkim-2.10.3-r3/work/opendkim-2.10.3 ...
 * Applying opendkim-2.10.3-gnutls-3.4.patch ...                                                                                                              [ ok ]
 * Applying patches from /etc/portage/patches/mail-filter/opendkim ...
 *   gnutls.patch ...
2 out of 3 hunks FAILED -- saving rejects to file libopendkim/dkim.c.rej                                                                                      [ !! ]

Contents of dkim.c.rej are:

--- libopendkim/dkim.c  2016-07-07 14:20:38.038000000 -0400
+++ libopendkim/dkim.c  2016-07-07 15:02:10.513000000 -0400
@@ -5301,6 +5301,7 @@ 
        size_t diglen = 0;
 #ifdef USE_GNUTLS
        gnutls_datum_t key;
+       gnutls_sign_algorithm_t sign_algo;
 #else /* USE_GNUTLS */
        BIO *key;
 #endif /* USE_GNUTLS */
@@ -5444,7 +5447,8 @@ 
                        return DKIM_STAT_OK;
                }
 
-               rsastat = gnutls_pubkey_verify_hash(rsa->rsa_pubkey, 0,
+               rsastat = gnutls_pubkey_verify_hash2(rsa->rsa_pubkey,
+                                                   sign_algo, 0,
                                                    &rsa->rsa_digest,
                                                    &rsa->rsa_sig);
                if (rsastat < 0)

[Comment 1 Arnim Eijkhoudt 2017-05-13 12:31:31 UTC]

Bump...

Am I missing something simple here? Can this be assigned to the net-mail bug wrangling maintainer/team for this package?

[Comment 2 Arnim Eijkhoudt 2017-06-07 12:13:03 UTC]

This is still blocking my emerge of opendkim... Any progress/information/tips on  how I can resolve this?

[Comment 3 Ralph Seichter 2019-04-01 15:15:01 UTC]

Arnim: Newer ebuild versions are available. If -r8 or later work for you (they do for me), I would like to close this bug.

[Comment 4 Michael Orlitzky 2019-04-01 15:26:03 UTC]

Upon closer examination, this isn't one of our patches that failed; it's a custom user patch:

 * Applying patches from /etc/portage/patches/mail-filter/opendkim ...
 *   gnutls.patch ...
   2 out of 3 hunks FAILED

There's nothing we do about that. Maybe the reporter had an old gnutls patch in that directory, from back before the ebuild had its own patch?

In any case, this is going to be a CANTFIX, but it'd be nice to have confirmation that deleting /etc/portage/patches/mail-filter/opendkim fixes everything.

[Comment 5 Michał Górny 2019-04-01 15:28:10 UTC]

RESO/INVA actually but yes, that sounds like PEBKAC.

[Comment 6 Arnim Eijkhoudt 2019-04-01 21:47:46 UTC]

Yes, actually this is now fixed and 'user error' :-)

The patch was needed to the version before -r3 to compile properly, but with -r3 this failed. I thought I had reported that already here, apologies!