From 9ef958d8a2437f529a36375504eb4e34c9dceebe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:12:58 +0200 Subject: gnu: stunnel: Update to 5.60. * gnu/packages/web.scm (stunnel): Update to 5.60. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/web.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d7bbd7489b..eae03932eb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5948,14 +5948,14 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.59") + (version "5.60") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "17yf2n47j5hw2y9527mrkx3j7q9jk5vvg46m3hgp1wg8dggpcxqk")))) + (base32 "0zbqiydyz9dvfg3axh18a42v6j3xvnwjbd03kgm1z1i12mdpcpf4")))) (build-system gnu-build-system) (native-inputs ;; For tests. @@ -5975,16 +5975,14 @@ tools like SSH (Secure Shell) to reach the outside world.") "doc/Makefile.in" "tools/Makefile.in") (("/doc/stunnel") - (string-append "/doc/" ,name "-" ,version))) - #t)) + (string-append "/doc/" ,name "-" ,version))))) (add-before 'check 'patch-tests (lambda _ (substitute* "tests/make_test" (("/bin/sh ") (string-append (which "sh") " "))) - ;; test requires networking - (delete-file "tests/recipes/055_socket_closed") - #t))))) + ;; This test requires networking. + (delete-file "tests/recipes/055_socket_closed")))))) (home-page "https://www.stunnel.org") (synopsis "TLS proxy for clients or servers") (description "Stunnel is a proxy designed to add TLS encryption -- cgit v1.2.3 From 70c186147f41db28c0308ea008cc11a873645517 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:27:03 +0200 Subject: gnu: stunnel: Don't install installation instructions. * gnu/packages/web.scm (stunnel)[arguments]: Add a 'prune-documentation phase. --- gnu/packages/web.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eae03932eb..4e51f4ff35 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5982,7 +5982,12 @@ tools like SSH (Secure Shell) to reach the outside world.") (("/bin/sh ") (string-append (which "sh") " "))) ;; This test requires networking. - (delete-file "tests/recipes/055_socket_closed")))))) + (delete-file "tests/recipes/055_socket_closed"))) + (add-after 'install 'prune-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (for-each delete-file (find-files doc "^INSTALL")))))))) (home-page "https://www.stunnel.org") (synopsis "TLS proxy for clients or servers") (description "Stunnel is a proxy designed to add TLS encryption -- cgit v1.2.3 From d6d7e2ec507f750392423dd8da6644deef8d2b42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:55:22 +0200 Subject: gnu: httpd: Update to 2.4.49. * gnu/packages/web.scm (httpd): Update to 2.4.49. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4e51f4ff35..e6f7452885 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -252,14 +252,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.48") + (version "2.4.49") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v")))) + "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 6e53b3a8cdd2b07ef18ebba3bafed0cb708e1a7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:56:27 +0200 Subject: gnu: nginx: Update to 1.21.3. * gnu/packages/web.scm (nginx): Update to 1.21.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e6f7452885..5f69152935 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -372,14 +372,14 @@ the same, being completely separated from the Internet.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Please update the nginx-documentation package together with this one! - (version "1.21.2") + (version "1.21.3") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "11ail85iw6mg8fxd2qnxhcghi0frjk5r70cfar83dms61rb1qxri")))) + "0nhps7igdqcpcy1r8677ar807rfclpylmz3y858a678m1np4lxql")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) ("libxslt" ,libxslt) -- cgit v1.2.3 From f97582dd8a666d4cbfc3064a3509cac8bc5c3ed5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:58:34 +0200 Subject: gnu: nginx-documentation: Update to 1.21.3-2769-16f6fa718be2. * gnu/packages/web.scm (nginx-documentation): Update to 1.21.3-2769-16f6fa718be2. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f69152935..1afe4145fc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -474,9 +474,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.21.2") - (revision 2764) - (changeset "bc9c5d11b67c")) + (let ((version "1.21.3") + (revision 2769) + (changeset "16f6fa718be2")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -488,7 +488,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "05n72q9vqxx37dyw3yl7jssmpqkw3rwxa2y3m6s0c0ih0z2bx58n")))) + "1rjq5xqzx843yk9nblz8lq14r4kmlrahap7m0lkvx5mky80vqp79")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From a7028d4323744152aaccf66af25ad2c9445bc01e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 5 Oct 2021 12:34:03 +0200 Subject: gnu: hitch: Provide the 'ps' command for tests. ...otherwise, failing tests would show up as successful. This is a follow-up to commit 273380fda2889e5ba4e7fba28b5b104306872c69. * gnu/packages/web.scm (hitch)[native-inputs]: Add PROCPS. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1afe4145fc..0ea362c452 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5895,6 +5895,7 @@ on the fly.") ("curl" ,curl) ("egrep" ,grep) ("lsof" ,lsof) + ("procps" ,procps) ("python" ,python))) (inputs `(("libev" ,libev) -- cgit v1.2.3 From f868ed2a75b55400107b80fcc1e41dcfb6b3c28c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 5 Oct 2021 20:50:19 -0400 Subject: gnu: Apache httpd: Update to 2.4.50 [Fixes CVE-2021-{41524,41773}]. This update includes an important fix for an actively exploited path traversal vulnerability (CVE-2021-41773), which allows attackers to access files outside the "document root": https://httpd.apache.org/security/vulnerabilities_24.html * gnu/packages/web.scm (httpd): Update to 2.4.50. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0ea362c452..5819973c66 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -252,14 +252,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.49") + (version "2.4.50") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5")))) + "03w9nc7v0rqljxazikbrlgbw7lq72i8n7n9ynlp6h1n6f301fa3a")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 2a273e9e2268c24b67620574fe34cc20bce7e5c8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 8 Oct 2021 19:08:42 -0400 Subject: gnu: Apache HTTPD: Update to 2.4.51 [fixes CVE-2021-42013]. This fixes CVE-2021-42013, which refers to the incomplete fix of CVE-2021-41773 in httpd 2.4.50: https://httpd.apache.org/security/vulnerabilities_24.html * gnu/packages/web.scm (httpd): Update to 2.4.51. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5819973c66..b2197eceb2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -252,14 +252,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.50") + (version "2.4.51") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "03w9nc7v0rqljxazikbrlgbw7lq72i8n7n9ynlp6h1n6f301fa3a")))) + "1x1qp10pfh33x1b56liwsjl0jamjm5lkk7j3lj87c1ygzs0ivq10")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3