summaryrefslogtreecommitdiff
path: root/gnu/packages/web.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-05-16 10:55:46 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-05-16 11:14:42 +0300
commite5e0e283ffd92f153303401c39dfcc1d8dde4f96 (patch)
tree82c7f8498081c1f807a0e4a25d0fd75c0e493043 /gnu/packages/web.scm
parent7c204281ff0b57de59261cd7b68fab3df1c0f49c (diff)
parent40a729a0e6f1d660b942241416c1e2c567616d4d (diff)
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r--gnu/packages/web.scm96
1 files changed, 52 insertions, 44 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5eaebd2ced..3c7909653e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -15,8 +15,8 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016–2022 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2020, 2021, 2022 Marius Bakke <marius@gnu.org>
@@ -827,7 +827,7 @@ stream. Remote control of the module is possible over HTTP.")
(define-public lighttpd
(package
(name "lighttpd")
- (version "1.4.59")
+ (version "1.4.64")
(source (origin
(method url-fetch)
(uri (string-append "https://download.lighttpd.net/lighttpd/"
@@ -835,43 +835,51 @@ stream. Remote control of the module is possible over HTTP.")
"lighttpd-" version ".tar.xz"))
(sha256
(base32
- "1mc421yrbnq3k6yrc708svp0fgcamrn5a0p2nvnhivysffr3v5gv"))))
+ "09hf3cp4ivy9a9z9drgi4f6d60137dcqncqw0wpbyvs9lygrsj71"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list "--with-krb5"
- "--with-ldap"
- "--with-libev"
- "--with-libunwind"
- "--with-openssl"
- "--with-pam"
- "--with-sasl")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'embed-/bin/sh-reference
- (lambda _
- (substitute* "src/mod_ssi.c"
- (("/bin/sh") (which "sh")))
- #t))
- (add-after 'unpack 'fix-tests
- (lambda _
- (setenv "SHELL" (which "sh"))
- ;; gethostbyaddr fails
- (substitute* "tests/LightyTest.pm"
- (("\\{HOSTNAME\\} = \\$name;")
- "{HOSTNAME} = \"127.0.0.1\";"))
- #t)))))
+ (list #:configure-flags
+ #~(list "--with-krb5"
+ "--with-ldap"
+ "--with-libev"
+ "--with-libunwind"
+ "--with-openssl"
+ "--with-pam"
+ "--with-sasl")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'embed-/bin/sh-reference
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/mod_ssi.c"
+ (("/bin/sh") (search-input-file inputs "/bin/sh")))))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (setenv "SHELL" (which "sh"))
+ ;; gethostbyaddr fails
+ (substitute* "tests/LightyTest.pm"
+ (("\\{HOSTNAME\\} = \\$name;")
+ "{HOSTNAME} = \"127.0.0.1\";"))))
+ (add-after 'unpack 'skip-failing-tests
+ ;; XXX It would be wonderful if you, reader, felt suddenly and
+ ;; irresistibly compelled to investigate & fix these failures.
+ (lambda _
+ ;; Throws a bunch of ‘connect failed: Connection refused’.
+ (delete-file "tests/mod-scgi.t")
+
+ ;; test_mod_ssi_read_fd: Assertion `cq->first' failed.
+ (substitute* "src/t/test_mod.c"
+ ((".*\\btest_mod_ssi\\b.*") "")))))))
(inputs
- `(("cyrus-sasl" ,cyrus-sasl)
- ("libev" ,libev)
- ("libunwind" ,libunwind)
- ("linux-pam" ,linux-pam)
- ("mit-krb5" ,mit-krb5)
- ("openldap" ,openldap)
- ("openssl" ,openssl)
- ("pcre" ,pcre)
- ("pcre:bin" ,pcre "bin")
- ("zlib" ,zlib)))
+ (list bash-minimal
+ cyrus-sasl
+ libev
+ libunwind
+ linux-pam
+ mit-krb5
+ openldap
+ openssl
+ pcre2
+ zlib))
(native-inputs
(list perl ; for tests
pkg-config which))
@@ -8191,13 +8199,13 @@ Unicode.")
"1znvnr30xi5vgd6n3wvgv9pwj992zpzzjk0fmq28ydf1l6kqvkm7"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)))) ; no configure script
+ (list #:tests? #f ; no tests
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)))) ; no configure script
(home-page "https://tools.suckless.org/quark/")
(synopsis "Small and simple HTTP GET/HEAD-only web server for static
content")