diff options
Diffstat (limited to 'gnu/packages/web.scm')
| -rw-r--r-- | gnu/packages/web.scm | 63 |
1 files changed, 59 insertions, 4 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b5bb887352..dab30df13d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -130,14 +130,14 @@ and its related documentation.") (define-public nginx (package (name "nginx") - (version "1.11.9") + (version "1.11.10") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0j2pcara9ir2xj3m2mjzf7wz46mdy51c0kal61cp0ldm2qgvf8nw")))) + "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp")))) (build-system gnu-build-system) (inputs `(("pcre" ,pcre) ("openssl" ,openssl) @@ -4365,7 +4365,7 @@ used to start services with both privileged and non-privileged port numbers.") (define-public tidy-html (package (name "tidy-html") - (version "5.2.0") + (version "5.4.0") (source (origin (method url-fetch) @@ -4374,7 +4374,7 @@ used to start services with both privileged and non-privileged port numbers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0")))) + "0yhbgbjl45b4sjxwc394cjra6iy02q1pi66p28zy70lr6jvm9mx2")))) (build-system cmake-build-system) (outputs '("out" "static")) ; 1.0MiB of .a files @@ -4410,6 +4410,61 @@ 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))) + (define-public qutebrowser (package (name "qutebrowser") |