From 14fdabbb7bf9fb2a666eb6832f4449e58a83e079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 31 May 2023 22:24:36 +0200
Subject: [PATCH] lighttpd: 1.4.69 -> 1.4.71

Changelogs:
https://www.lighttpd.net/2023/5/27/1.4.71/
https://www.lighttpd.net/2023/5/10/1.4.70/

Update the patch that disables legacy crypt tests, because it doesn't
apply anymore.
---
 pkgs/servers/http/lighttpd/default.nix        |  4 ++--
 .../lighttpd/disable-legacy-crypt-tests.patch | 24 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index b942589b791c..b0bb720c21cd 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lighttpd";
-  version = "1.4.69";
+  version = "1.4.71";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ=";
+    sha256 = "sha256-uLaRXaIDlv3DVN8zJNXkQBabLl6nhZ46d1IThBMlr6w=";
   };
 
   patches = [
diff --git a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch
index 3bf50551652e..4a411c0b98ae 100644
--- a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch
+++ b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch
@@ -1,30 +1,28 @@
-diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t
-index 25016e60..e0427046 100755
---- a/tests/mod-fastcgi.t
-+++ b/tests/mod-fastcgi.t
-@@ -79,7 +79,7 @@ EOF
+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", 2 if $^O eq 'openbsd';
+-	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 --git a/tests/request.t b/tests/request.t
-index f56a4300..36e67b88 100755
---- a/tests/request.t
-+++ b/tests/request.t
-@@ -1105,7 +1105,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+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", 2 if $^O eq 'openbsd';
+-	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
-@@ -1162,9 +1162,7 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ];
+@@ -1163,9 +1163,7 @@
  ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)');
  
  SKIP: {