From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: GnuTLS: Upgrade to 3.3.1 (fails) Date: Wed, 23 Apr 2014 03:01:29 +0400 Message-ID: <87wqeht1di.fsf@karetnikov.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcjmX-0006cG-6g for guix-devel@gnu.org; Tue, 22 Apr 2014 19:07:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcjmV-0002jI-No for guix-devel@gnu.org; Tue, 22 Apr 2014 19:07:17 -0400 Received: from [2a01:7e00::f03c:91ff:fedf:181] (port=51471 helo=cooksoni.karetnikov.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcjmV-0002iM-Db for guix-devel@gnu.org; Tue, 22 Apr 2014 19:07:15 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E2=80=98gnutls-remove-gnutls_secure_malloc.patch=E2=80=99 fixes the follow= ing 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 =3D scm_malloc; ^ core.c:3369:3: note: each undeclared identifier is reported only once for e= ach 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-profil= e.drv': 1 dependencies couldn't be built guix package: error: build failed: build of `/gnu/store/cm8r2pssz9djvnhnj01= cn4d9jpkflm4y-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' =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D Testsuite summary for GnuTLS 3.3.1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D # TOTAL: 4 # PASS: 2 # SKIP: 1 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D See tests/cert-tests/test-suite.log Please report to bugs@gnutls.org =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D 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-profil= e.drv': 1 dependencies couldn't be built guix package: error: build failed: build of `/gnu/store/x5jfbi9nwzan0h7pc0i= 6i933fsizmwaq-profile.drv' failed --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=gnutls.diff Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 0391f54..0b0df81 100644 =2D-- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -63,7 +63,7 @@ specifications.") (define-public gnutls (package (name "gnutls") =2D (version "3.2.12") + (version "3.3.1") (source (origin (method url-fetch) (uri @@ -75,12 +75,10 @@ specifications.") "/gnutls-" version ".tar.xz")) (sha256 (base32 =2D "0195nliarszq5mginli6d2f5z7ljnd7mwa46iy9z8pkcgy56khbl")))) + "1fyg0bwfc003795hl5vs35m3rg2yqj9m5z76rlhfs0g5xaxrwjwq")) + (patches (list (search-patch + "gnutls-remove-gnutls_secure_malloc.patch")))= )) (build-system gnu-build-system) =2D (arguments =2D ;; Work around build issue reported at =2D ;; . =2D '(#:make-flags '("CPPFLAGS=3D-DENABLE_RSA_EXPORT"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -98,4 +96,4 @@ specifications.") and DTLS protocols. It is provided in the form of a C library to support = the protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other required structures.") =2D (license lgpl2.1+))) + (license lgpl2.1+))) ; see the "LICENSING" section in 'README' diff --git a/gnu/packages/patches/gnutls-remove-gnutls_secure_malloc.patch = b/gnu/packages/patches/gnutls-remove-gnutls_secure_malloc.patch new file mode 100644 index 0000000..1f9555c =2D-- /dev/null +++ b/gnu/packages/patches/gnutls-remove-gnutls_secure_malloc.patch @@ -0,0 +1,15 @@ +Remove 'gnutls_secure_malloc' (see +). + +Patch by Ludovic Court=C3=A8s . + +--- gnutls-3.3.1/guile/src/core.c-orig 2014-04-23 01:24:26.455377062 +0400 ++++ gnutls-3.3.1/guile/src/core.c 2014-04-23 01:25:14.489068473 +0400 +@@ -3366,7 +3366,6 @@ + /* Use Guile's allocation routines, which will run the GC if need be. = */ + gnutls_malloc =3D scm_malloc; + gnutls_realloc =3D scm_realloc; +- gnutls_secure_malloc =3D scm_malloc; + gnutls_free =3D free; +=20 + (void) gnutls_global_init (); --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJTVvTPAAoJEM+IQzI9IQ38QJ4P/1AG9eHJMqHQBHz6uFlWwp5I a3W0aBqcxPRp7heA7jEJsvH22tAv67qJruqecb5NEmU7GxBYm4DOa1M2AwmbY4cI xJNS2qBeF+iyv8nOYjFHD4ZBkqdo7N6G9lh8fOIU7S8355WV3s2UQTY1UEt+/LEK d42uRPgKgvxWzAW5VbzHJADnMRamTYO7AxwknvORrCwFj0NCCepCLSJIdKP3dpRJ 1nVfN+AH4c4enuUQGABk5DhSgXIvDiaNzZsGKZAZ/Edgx1qWK/SjhN+kDAqprEl8 4F7NarxTqV7OYA6SEO+5A/gzqR33tS7ent9O2kMYEKfykfy6+XRJdgUg+98CjEp3 ZrzJ/RVZSnxPm1uV3sGkmdMmE2Hu9fyscdlEEsymnAynBTd1VAl79K19KtT00tP7 XjmX5KTEKxA19Le4/9OQp74VQPgW1/BNbjS4Q3wcVnmj4TI/LZtywhYUcB5DB+sj 2eCS9YyUgnBuCYVx/p1DH6BAOA1Z1P7Xdj3MysZdPlFAGBa9hfsWfHaE2gS9g306 KJZLRwbDUx5dW+sPYN5u6hIKPq8rMnfufgT3fOSE9sy9abbN7xqfUNXBs8Yo3J5b ZmaKuRYq/YYrs2MclsOfYu3C6r983mKNJXmhCNsP23jqGt4cqOxbhzRYRJ/J28E/ dqulQYl3+ZEnv2ZXTrZR =oWuh -----END PGP SIGNATURE----- --==-=-=--