From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 30 Sep 2013 06:22:46 +0000 (+0300)
Subject: up to 1.4.33
X-Git-Tag: auto/th/lighttpd-1.4.33-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Flighttpd.git;a=commitdiff_plain;h=4f7c40eb1b27541d7fa93fce786885ca440718e5

up to 1.4.33
---

diff --git a/lighttpd-crypt.patch b/lighttpd-crypt.patch
deleted file mode 100644
index 8a66b73..0000000
--- a/lighttpd-crypt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-; http://redmine.lighttpd.net/issues/2486
-diff -urN lighttpd-1.4.32.org/src/http_auth.c lighttpd-1.4.32/src/http_auth.c
---- lighttpd-1.4.32.org/src/http_auth.c	2012-05-17 11:29:24.000000000 +0200
-+++ lighttpd-1.4.32/src/http_auth.c	2013-06-05 19:58:07.828450230 +0200
-@@ -688,6 +688,8 @@
- 		salt[salt_len] = '\0';
- 
- 		crypted = crypt(pw, salt);
-+		if (NULL == crypted)
-+			return -1;
- 
- 		if (0 == strcmp(password->ptr, crypted)) {
- 			return 0;
diff --git a/lighttpd-mod_userdir.conf b/lighttpd-mod_userdir.conf
index 89ac3e7..73e911c 100644
--- a/lighttpd-mod_userdir.conf
+++ b/lighttpd-mod_userdir.conf
@@ -13,3 +13,6 @@ userdir.path         = "public_html"
 
 ## The users whose home directories should not be accessible
 userdir.exclude-user = ( "root", "postmaster" )
+
+## enable userdir module
+userdir.active = "enable"
diff --git a/lighttpd.spec b/lighttpd.spec
index f31ecf8..81ba799 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -28,12 +28,12 @@
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
-Version:	1.4.32
-Release:	2
+Version:	1.4.33
+Release:	1
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5:	8e2d4ae8e918d4de1aeb9842584d170b
+# Source0-md5:	e66b8164e5fc5a6beec0823b697fbe1d
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.user
@@ -100,7 +100,6 @@ Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
 Patch5:		%{name}-mod_deflate.patch
 Patch6:		test-port-setup.patch
-Patch7:		%{name}-crypt.patch
 #Patch:		%{name}-modinit-before-fork.patch
 #Patch:		%{name}-errorlog-before-fork.patch
 URL:		http://www.lighttpd.net/
@@ -837,7 +836,6 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
 %patch6 -p1
-%patch7 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead