diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-10-18 13:49:04 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-10-20 23:45:29 +0200 |
| commit | c531697bc3914765117fbf4df6ba3cdb30afb7c1 (patch) | |
| tree | b300133c601c64a16daecbe8f66c32952e577fd9 /pkgs/servers | |
| parent | 8b9569a1fdd6c78fd86c645182aae73f3641e9fc (diff) | |
lighttpd: 1.4.71 -> 1.4.72
The patch to disable legacy crypt tests (which were broken for us) isn't needed anymore, so remove it.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch | 35 |
2 files changed, 2 insertions, 42 deletions
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index b0bb720c21cdd..dbd1c7c9f5251 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,18 +15,13 @@ 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 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 |