From faf715b1dcf9a7d984846f43c2110de2d4b896ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:10 +0200 Subject: gnu: lighttpd: Fix bash reference. * gnu/packages/web.scm (lighttpd)[arguments]: Substitute SEARCH-INPUT-FILE for WHICH. [inputs]: Add bash-minimal. f fix lighttpd xcc --- gnu/packages/web.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bc913664e3..fabe488c2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2020, 2021, 2022 Marius Bakke @@ -849,9 +849,9 @@ stream. Remote control of the module is possible over HTTP.") #:phases (modify-phases %standard-phases (add-after 'unpack 'embed-/bin/sh-reference - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/mod_ssi.c" - (("/bin/sh") (which "sh"))) + (("/bin/sh") (search-input-file inputs "/bin/sh"))) #t)) (add-after 'unpack 'fix-tests (lambda _ @@ -862,7 +862,8 @@ stream. Remote control of the module is possible over HTTP.") "{HOSTNAME} = \"127.0.0.1\";")) #t))))) (inputs - `(("cyrus-sasl" ,cyrus-sasl) + `(("bash-minimal" ,bash-minimal) + ("cyrus-sasl" ,cyrus-sasl) ("libev" ,libev) ("libunwind" ,libunwind) ("linux-pam" ,linux-pam) -- cgit 1.4.1 From fd7130e4b514feeb72b7e386df4959023a38b55c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:02 +0200 Subject: gnu: lighttpd: Update to 1.4.64. * gnu/packages/web.scm (lighttpd): Update to 1.4.64. [arguments]: Add a new 'skip-failing-tests phase. [inputs]: Substitute pcre2 for pcre & pcre:bin. --- gnu/packages/web.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fabe488c2a..37ae528f08 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -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,7 +835,7 @@ 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 @@ -860,7 +860,17 @@ stream. Remote control of the module is possible over HTTP.") (substitute* "tests/LightyTest.pm" (("\\{HOSTNAME\\} = \\$name;") "{HOSTNAME} = \"127.0.0.1\";")) - #t))))) + #t)) + (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 `(("bash-minimal" ,bash-minimal) ("cyrus-sasl" ,cyrus-sasl) @@ -870,8 +880,7 @@ stream. Remote control of the module is possible over HTTP.") ("mit-krb5" ,mit-krb5) ("openldap" ,openldap) ("openssl" ,openssl) - ("pcre" ,pcre) - ("pcre:bin" ,pcre "bin") + ("pcre2" ,pcre2) ("zlib" ,zlib))) (native-inputs (list perl ; for tests -- cgit 1.4.1 From cd00881d72830ef9293c2693a9eb24d5692b2ab8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:01 +0200 Subject: gnu: lighttpd: Update style. * gnu/packages/web.scm (lighttpd)[arguments]: Rewrite as G-expressions. Don't explicitly return #t from phases. [inputs]: Remove input labels. --- gnu/packages/web.scm | 82 +++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 37ae528f08..5e200d13cc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -838,50 +838,48 @@ stream. Remote control of the module is possible over HTTP.") "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* (#:key inputs #:allow-other-keys) - (substitute* "src/mod_ssi.c" - (("/bin/sh") (search-input-file inputs "/bin/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)) - (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") + (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.*") ""))))))) + ;; test_mod_ssi_read_fd: Assertion `cq->first' failed. + (substitute* "src/t/test_mod.c" + ((".*\\btest_mod_ssi\\b.*") ""))))))) (inputs - `(("bash-minimal" ,bash-minimal) - ("cyrus-sasl" ,cyrus-sasl) - ("libev" ,libev) - ("libunwind" ,libunwind) - ("linux-pam" ,linux-pam) - ("mit-krb5" ,mit-krb5) - ("openldap" ,openldap) - ("openssl" ,openssl) - ("pcre2" ,pcre2) - ("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)) -- cgit 1.4.1 From 8980f6c5322a8d24b6c7b52f9aaff5eef7e22a5e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 12 May 2022 13:29:57 +0530 Subject: gnu: quark: Use G-expressions. * gnu/packages/web.scm (quark)[arguments]: Rewrite using G-expressions. --- gnu/packages/web.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5e200d13cc..c56ec186f8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac +;;; Copyright © 2016–2022 Arun Isaac ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -8199,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") -- cgit 1.4.1