From 25d7bd742a8918f4b4826c9db1eb20984ee12a60 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 2 Feb 2021 18:49:03 +0200
Subject: [PATCH] Up to 1.4.59

HTTP/2 enabled by default, mod_deflate zstd support, mod_ajp13 (new), bugfixes

https://redmine.lighttpd.net/projects/lighttpd/wiki/Release-1_4_59/
---
 lighttpd.spec         |  6 ++----
 test-port-setup.patch | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 test-port-setup.patch

diff --git a/lighttpd.spec b/lighttpd.spec
index 37123da..b7b5954 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -51,12 +51,12 @@
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
-Version:	1.4.58
+Version:	1.4.59
 Release:	1
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
-# Source0-md5:	8d12a31bd3fdd7eab85cf9a6d2cfa92e
+# Source0-md5:	a8838dac90fcddbcc05c0d1877bd8cdf
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.user
@@ -129,7 +129,6 @@ Patch1:		%{name}-mod_evasive-status_code.patch
 Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
 Patch4:		systemd.patch
-Patch5:		test-port-setup.patch
 URL:		https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_xattr:BuildRequires:	attr-devel}
@@ -1024,7 +1023,6 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
diff --git a/test-port-setup.patch b/test-port-setup.patch
deleted file mode 100644
index 3578e17..0000000
--- a/test-port-setup.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-TODO: upstream it:
-https://github.com/lighttpd/lighttpd1.4/pull/69
-
---- lighttpd-1.4.56/tests/LightyTest.pm~	2020-11-30 00:32:01.000000000 +0200
-+++ lighttpd-1.4.56/tests/LightyTest.pm	2020-11-30 08:31:44.175860280 +0200
-@@ -81,7 +81,7 @@
- 	if (exists $ENV{LIGHTTPD_EXE_PATH}) {
- 		$self->{LIGHTTPD_PATH} = $ENV{LIGHTTPD_EXE_PATH};
- 	}
--	$self->{PORT} = 2048;
-+	$self->{PORT} = $ENV{LIGHTTPD_TEST_PORT} ? int($ENV{LIGHTTPD_TEST_PORT}) : 2048;
- 
- 	my ($name, $aliases, $addrtype, $net) = gethostbyaddr(inet_aton("127.0.0.1"), AF_INET);
- 
-- 
2.44.0