GnuTLS: Upgrade to 3.3.1 (fails)

[Nikita Karetnikov]

‘gnutls-remove-gnutls_secure_malloc.patch’ fixes the following issue:

make[4]: Entering directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/guile/src'
  CC       guile_gnutls_v_2_la-core.lo
core.c: In function 'scm_init_gnutls':
core.c:3369:3: error: 'gnutls_secure_malloc' undeclared (first use in this 
function)
   gnutls_secure_malloc = scm_malloc;
   ^
core.c:3369:3: note: each undeclared identifier is reported only once for each 
function it appears in
Makefile:1448: recipe for target 'guile_gnutls_v_2_la-core.lo' failed
make[4]: *** [guile_gnutls_v_2_la-core.lo] Error 1
make[4]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/guile/src'
Makefile:1340: recipe for target 'all' failed
make[3]: *** [all] Error 2
make[3]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/guile/src'
Makefile:1301: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/guile'
Makefile:1373: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1'
Makefile:1300: recipe for target 'all' failed
make: *** [all] Error 2
phase `build' failed after 1003 seconds
builder for `/gnu/store/5v3nssmzk94bbibmrymphssvssfgq4ir-gnutls-3.3.1.drv' 
failed with exit code 1
@ build-failed /gnu/store/5v3nssmzk94bbibmrymphssvssfgq4ir-gnutls-3.3.1.drv - 1 
builder for `/gnu/store/5v3nssmzk94bbibmrymphssvssfgq4ir-gnutls-3.3.1.drv' 
failed with exit code 1
cannot build derivation 
`/gnu/store/cm8r2pssz9djvnhnj01cn4d9jpkflm4y-profile.drv': 1 dependencies 
couldn't be built
guix package: error: build failed: build of 
`/gnu/store/cm8r2pssz9djvnhnj01cn4d9jpkflm4y-profile.drv' failed

But the program still fails to build:

make[4]: Entering directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
PASS: pathlen
PASS: aki
FAIL: pem-decoding
SKIP: template-test
make[5]: Entering directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
make[5]: Nothing to be done for 'all'.
make[5]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
============================================================================
Testsuite summary for GnuTLS 3.3.1
============================================================================
# TOTAL: 4
# PASS:  2
# SKIP:  1
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0
============================================================================
See tests/cert-tests/test-suite.log
Please report to address@hidden
============================================================================
Makefile:1478: recipe for target 'test-suite.log' failed
make[4]: *** [test-suite.log] Error 1
make[4]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
Makefile:1584: recipe for target 'check-TESTS' failed
make[3]: *** [check-TESTS] Error 2
make[3]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
Makefile:1685: recipe for target 'check-am' failed
make[2]: *** [check-am] Error 2
make[2]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests/cert-tests'
Makefile:2657: recipe for target 'check-recursive' failed
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory 
'/tmp/nix-build-gnutls-3.3.1.drv-0/gnutls-3.3.1/tests'
Makefile:1373: recipe for target 'check-recursive' failed
make: *** [check-recursive] Error 1
phase `check' failed after 902 seconds
builder for `/gnu/store/4wsibp5apk03zp91nih72n6njg3445xd-gnutls-3.3.1.drv' 
failed with exit code 1
@ build-failed /gnu/store/4wsibp5apk03zp91nih72n6njg3445xd-gnutls-3.3.1.drv - 1 
builder for `/gnu/store/4wsibp5apk03zp91nih72n6njg3445xd-gnutls-3.3.1.drv' 
failed with exit code 1
cannot build derivation 
`/gnu/store/x5jfbi9nwzan0h7pc0i6i933fsizmwaq-profile.drv': 1 dependencies 
couldn't be built
guix package: error: build failed: build of 
`/gnu/store/x5jfbi9nwzan0h7pc0i6i933fsizmwaq-profile.drv' failed

gnutls.diff
Description: Text Data

pgpRc9Xjfw866.pgp
Description: PGP signature