GNU bug report logs - #25730
mbedtls and hiawatha

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25730 in the body.
You can then email your comments to 25730 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: ng0 <contact.ng0 <at> cryptolab.net>
To: guix-patches <at> gnu.org
Subject: mbedtls and hiawatha
Date: Tue, 14 Feb 2017 19:06:37 +0000

The following two patches add mbedTLS and Hiawatha.

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

Message #8 received at 25730 <at> debbugs.gnu.org (full text, mbox):

From: contact.ng0 <at> cryptolab.net
To: 25730 <at> debbugs.gnu.org
Cc: ng0 <ng0 <at> libertad.pw>
Subject: [PATCH 1/2] gnu: Add mbedtls-apache.
Date: Tue, 14 Feb 2017 19:09:34 +0000

From: ng0 <ng0 <at> libertad.pw>

* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
 gnu/packages/tls.scm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index b28eb164b..83ce99e2e 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2016 ng0 <ng0 <at> we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0 <at> cryptolab.net>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -33,6 +33,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages)
   #:use-module (gnu packages guile)
@@ -794,3 +795,31 @@ then ported to the GNU / Linux environment.")
     ;; acme-client is distributed under the ISC license, but the files 'jsmn.h'
     ;; and 'jsmn.c' are distributed under the Expat license.
     (license (list license:isc license:expat))))
+
+;; The "-apache" variant is the upstreamed prefered variant. A "-gpl"
+;; variant exists in addition to the "-apache" one.
+(define-public mbedtls-apache
+  (package
+    (name "mbedtls-apache")
+    (version "2.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       ;; XXX: The download links on the website are script redirection links
+       ;; which effectively lead to the format listed in the uri here.
+       (uri (string-append "https://tls.mbed.org/download/mbedtls-"
+                           version "-apache.tgz"))
+       (sha256
+        (base32
+         "03bzbfidigljva6xj49k38q3kwlbj75lrky4a0ainylzsfg5bhy1"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("perl" ,perl)))
+    (synopsis "Small TLS library")
+    (description
+     "@code{mbed TLS}, formerly known as PolarSSL, makes it trivially easy
+for developers to include cryptographic and SSL/TLS capabilities in their
+(embedded) products, facilitating this functionality with a minimal
+coding footprint.")
+    (home-page "https://tls.mbed.org")
+    (license license:asl2.0)))
-- 
2.11.1

Message #11 received at 25730 <at> debbugs.gnu.org (full text, mbox):

From: contact.ng0 <at> cryptolab.net
To: 25730 <at> debbugs.gnu.org
Cc: ng0 <ng0 <at> libertad.pw>
Subject: [PATCH 2/2] gnu: Add hiawatha.
Date: Tue, 14 Feb 2017 19:09:35 +0000

From: ng0 <ng0 <at> libertad.pw>

* gnu/packages/web.scm (hiawatha): New variable.
---
 gnu/packages/web.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e50a3701f..d3f942be2 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4408,3 +4408,58 @@ Tidy also provides @code{libtidy}, a C static and dynamic library that
 developers can integrate into their applications to make use of the
 functions of Tidy.")
     (license l:bsd-3)))
+
+(define-public hiawatha
+  (package
+    (name "hiawatha")
+    (version "10.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.hiawatha-webserver.org/files/"
+                           "hiawatha-" version ".tar.gz"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; We use our packaged mbedtls, so delete the included copy.
+        '(delete-file-recursively "mbedtls"))
+       (sha256
+        (base32
+         "0m2llzm72s29c32abnj03532m85fawvi8ybjpx6s3mgvx2yvq3p4"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; No tests included
+       #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on")
+                               (string-append "-DENABLE_TOMAHAWK=on")
+                               (string-append "-DWEBROOT_DIR="
+                                              (assoc-ref %outputs "out")
+                                              "/share/hiawatha/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'remove-empty-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out")))
+               ;; The directories in "var" are empty, remove them.
+               (delete-file-recursively (string-append out "/var"))
+               #t)))
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; Make sure 'hiawatha' finds 'mbedtls'.
+             (let* ((out (assoc-ref outputs "out"))
+                    (sbin (string-append out "/sbin"))
+                    (mbed (assoc-ref inputs "mbedtls-apache")))
+               (wrap-program (string-append sbin "/hiawatha")
+                 `("PATH" ":" prefix (,mbed)))))))))
+    (inputs
+     ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha".
+     `(("mbedtls-apache" ,mbedtls-apache) ;Hiawatha includes this version.
+       ("zlib" ,zlib)
+       ("libxslt" ,libxslt)
+       ("libxml2" ,libxml2)))
+    (home-page "https://www.hiawatha-webserver.org")
+    (synopsis "Webserver with focus on security")
+    (description
+     "Hiawatha has been written with security in mind.  This resulted in a
+highly secure webserver in both code and features.  Hiawatha can stop SQL
+injections, XSS and CSRF attacks and exploit attempts.  Via a specially
+crafted monitoring tool, you can keep track of all your webservers.")
+    (license l:gpl2)))
-- 
2.11.1

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Subject: Re: bug#25730: mbedtls and hiawatha
Date: Sat, 04 Mar 2017 14:20:06 -0500

[Message part 1 (text/plain, inline)]

ng0 <contact.ng0 <at> cryptolab.net> writes:

> The following two patches add mbedTLS and Hiawatha.

LGTM. Pushed as 885227386855e446e653d958c38b6bbcfc2a24ca and
3190c307f95fc5f289c1aa8a3955a58e1a5ca4b2, respectively.

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 25730-done <at> debbugs.gnu.org (full text, mbox):

From: Catonano <catonano <at> gmail.com>
To: 25730-done <at> debbugs.gnu.org
Subject: Re: bug#25730: mbedtls and hiawatha
Date: Sat, 4 Mar 2017 21:48:05 +0100

[Message part 1 (text/plain, inline)]

2017-03-04 21:46 GMT+01:00 Catonano <catonano <at> gmail.com>:

> 2017-03-04 20:20 GMT+01:00 Kei Kebreau <kei <at> openmailbox.org>:
>
>> ng0 <contact.ng0 <at> cryptolab.net> writes:
>>
>> > The following two patches add mbedTLS and Hiawatha.
>>
>> LGTM. Pushed as 885227386855e446e653d958c38b6bbcfc2a24ca and
>> 3190c307f95fc5f289c1aa8a3955a58e1a5ca4b2, respectively.
>>
>
>

I would say that this can be closed, right ?

[Message part 2 (text/html, inline)]

Message #22 received at 25730-done <at> debbugs.gnu.org (full text, mbox):

From: ng0 <contact.ng0 <at> cryptolab.net>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 25730-done <at> debbugs.gnu.org
Subject: Re: bug#25730: mbedtls and hiawatha
Date: Sat, 4 Mar 2017 22:07:32 +0000

On 17-03-04 14:20:06, Kei Kebreau wrote:
> ng0 <contact.ng0 <at> cryptolab.net> writes:
> 
> > The following two patches add mbedTLS and Hiawatha.
> 
> LGTM. Pushed as 885227386855e446e653d958c38b6bbcfc2a24ca and
> 3190c307f95fc5f289c1aa8a3955a58e1a5ca4b2, respectively.

Thanks! closed.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.