dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lighttpd: 1.4.71 -> 1.4.72

Browse Source 
The patch to disable legacy crypt tests (which were broken for us) isn't
needed anymore, so remove it.
This commit is contained in:
Bjørn Forsman 2023-10-18 13:49:04 +02:00
parent 8b9569a1fd
commit c531697bc3
2 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/http/lighttpd/default.nix
View File

@ -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

35
pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch
View File

@ -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