diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 00:02:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-21 00:02:49 +0000 |
commit | 613d60266a74ea96bddceed8edd396199107ab6b (patch) | |
tree | a220a0b1f6bef23989f10141ec7f7465fbdfa41d /pkgs/servers/http | |
parent | 02a21c89b8fcee7f83d40ba03983d2971960fd90 (diff) | |
parent | fb3e2499b78f73e27cc256bc3516abeb822654bd (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 15 | ||||
-rw-r--r-- | pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch | 35 |
3 files changed, 4 insertions, 50 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 98a00afc519d4..c6e7ad1f56616 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.57"; + version = "2.4.58"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-28y4Su6V4JXt+7geXrkmzNJOatpV3Ng8rssmLlz5TSo="; + sha256 = "sha256-+hbXKgeCEKVMR91b7y+Lm4oB2UkJpRRTlWs+xkQupMU="; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index b0bb720c21cdd..0c83c2e750a03 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,26 +15,15 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.71"; + version = "1.4.72"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-uLaRXaIDlv3DVN8zJNXkQBabLl6nhZ46d1IThBMlr6w="; + sha256 = "sha256-98reTWm3VKB0jAFGPDPNi0VsqcwDuwnoWnG8vNVOVew="; }; - patches = [ - # disable tests for des/md5, which we don't support any more - ./disable-legacy-crypt-tests.patch - ]; - postPatch = '' patchShebangs tests - # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests - sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm - # it's difficult to prevent this test from trying to use /var/tmp (which - # the sandbox doesn't have) so until libredirect has support for mkstemp - # calls it's easiest to disable it - sed -i '/test_mod_ssi/d' src/t/test_mod.c ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch deleted file mode 100644 index 4a411c0b98aed..0000000000000 --- a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uNr lighttpd-1.4.71.orig/tests/mod-fastcgi.t lighttpd-1.4.71.new/tests/mod-fastcgi.t ---- lighttpd-1.4.71.orig/tests/mod-fastcgi.t 2023-05-27 21:56:16.000000000 +0200 -+++ lighttpd-1.4.71.new/tests/mod-fastcgi.t 2023-06-01 07:01:59.789873512 +0200 -@@ -79,7 +79,7 @@ - ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - - $t->{REQUEST} = ( <<EOF - GET /get-server-env.php?env=REMOTE_USER HTTP/1.0 -diff -uNr lighttpd-1.4.71.orig/tests/request.t lighttpd-1.4.71.new/tests/request.t ---- lighttpd-1.4.71.orig/tests/request.t 2023-05-27 21:56:16.000000000 +0200 -+++ lighttpd-1.4.71.new/tests/request.t 2023-06-01 07:02:39.855940048 +0200 -@@ -1106,7 +1106,7 @@ - ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - $t->{REQUEST} = ( <<EOF - GET /server-config HTTP/1.0 - Host: auth-htpasswd.example.org -@@ -1163,9 +1163,7 @@ - ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); - - SKIP: { -- skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; -- skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; -- skip "no crypt-md5 under openbsd",1 if $^O eq 'openbsd'; -+ skip "no crypt-md5", 1; - $t->{REQUEST} = ( <<EOF - GET /server-config HTTP/1.0 - Host: auth-htpasswd.example.org |