Patch for broken Hiawatha

Patch for broken Hiawatha

[Kei Kebreau]

[-- Attachment #1.1: Type: text/plain, Size: 453 bytes --]

Hello all,

It seems that commit 22261238e7591c21d8362147992fbb12e67fda88, which
updates mbed TLS, has broken the hiawatha build [0]. It turns out that
the new release of mbed TLS contained a very minor typo that caused this
failure [1]. I've attached a patch that is ready to be merged as soon as
someone else can verify that it works.

Thank you!

[0]: https://hydra.gnu.org/eval/109917#tabs-now-fail
[1]: https://github.com/ARMmbed/mbedtls/pull/1362

[-- Attachment #1.2: 0001-gnu-mbedtls-apache-Fix-upstream-typo.patch --]
[-- Type: text/plain, Size: 1452 bytes --]

From 8e23721f42e05482b925c6cfc244b9c19a11c0a5 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Mon, 26 Feb 2018 14:47:15 -0500
Subject: [PATCH] gnu: mbedtls-apache: Fix upstream typo.

A typo was introduced in version 2.7.0 that caused the hiawatha package to
fail to build. See https://github.com/ARMmbed/mbedtls/pull/1362.

* gnu/packages/tls.scm (mbedtls-apache)[source]: Add snippet to fix typo.
---
 gnu/packages/tls.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 9e06e675f..2233b5974 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -797,7 +797,15 @@ then ported to the GNU / Linux environment.")
                            version "-apache.tgz"))
        (sha256
         (base32
-         "1vsmgxnw7dpvma51896n63yaf9sncmf885ax2jfcg89ssin6vdmf"))))
+         "1vsmgxnw7dpvma51896n63yaf9sncmf885ax2jfcg89ssin6vdmf"))
+       ;; An RFC 5114 constant was accidentally renamed in version 2.7.0.
+       ;; See https://github.com/ARMmbed/mbedtls/pull/1362.
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "include/mbedtls/dhm.h"
+             (("#define MBEDTLS_DHM_RFC5114_MODP_P")
+              "#define MBEDTLS_DHM_RFC5114_MODP_2048_P"))))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.16.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Patch for broken Hiawatha

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

On Mon, Feb 26, 2018 at 03:07:51PM -0500, Kei Kebreau wrote:
> Hello all,
> 
> It seems that commit 22261238e7591c21d8362147992fbb12e67fda88, which
> updates mbed TLS, has broken the hiawatha build [0]. It turns out that
> the new release of mbed TLS contained a very minor typo that caused this
> failure [1]. I've attached a patch that is ready to be merged as soon as
> someone else can verify that it works.
> 
> Thank you!
> 
> [0]: https://hydra.gnu.org/eval/109917#tabs-now-fail
> [1]: https://github.com/ARMmbed/mbedtls/pull/1362

> From 8e23721f42e05482b925c6cfc244b9c19a11c0a5 Mon Sep 17 00:00:00 2001
> From: Kei Kebreau <kkebreau@posteo.net>
> Date: Mon, 26 Feb 2018 14:47:15 -0500
> Subject: [PATCH] gnu: mbedtls-apache: Fix upstream typo.
> 
> A typo was introduced in version 2.7.0 that caused the hiawatha package to
> fail to build. See https://github.com/ARMmbed/mbedtls/pull/1362.
> 
> * gnu/packages/tls.scm (mbedtls-apache)[source]: Add snippet to fix typo.

Thanks, LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Patch for broken Hiawatha

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Feb 26, 2018 at 03:07:51PM -0500, Kei Kebreau wrote:
>> Hello all,
>> 
>> It seems that commit 22261238e7591c21d8362147992fbb12e67fda88, which
>> updates mbed TLS, has broken the hiawatha build [0]. It turns out that
>> the new release of mbed TLS contained a very minor typo that caused this
>> failure [1]. I've attached a patch that is ready to be merged as soon as
>> someone else can verify that it works.
>> 
>> Thank you!
>> 
>> [0]: https://hydra.gnu.org/eval/109917#tabs-now-fail
>> [1]: https://github.com/ARMmbed/mbedtls/pull/1362
>
>> From 8e23721f42e05482b925c6cfc244b9c19a11c0a5 Mon Sep 17 00:00:00 2001
>> From: Kei Kebreau <kkebreau@posteo.net>
>> Date: Mon, 26 Feb 2018 14:47:15 -0500
>> Subject: [PATCH] gnu: mbedtls-apache: Fix upstream typo.
>> 
>> A typo was introduced in version 2.7.0 that caused the hiawatha package to
>> fail to build. See https://github.com/ARMmbed/mbedtls/pull/1362.
>> 
>> * gnu/packages/tls.scm (mbedtls-apache)[source]: Add snippet to fix typo.
>
> Thanks, LGTM!

Pushed! Thanks for the review and the mbedtls security update!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]