- up to 1.4.32; fixes CVE-2012-5533 (affects only 1.4.31)

diff --git a/lighttpd-automake_1.12.patch b/lighttpd-automake_1.12.patch
deleted file mode 100644 (file)
index 666defb..0000000
--- a/lighttpd-automake_1.12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -dur lighttpd-1.4.31.orig/configure.ac lighttpd-1.4.31/configure.ac
---- lighttpd-1.4.31.orig/configure.ac  2012-05-31 16:49:18.000000000 +0200
-+++ lighttpd-1.4.31/configure.ac       2012-06-08 09:54:13.000000000 +0200
-@@ -23,6 +23,7 @@
- dnl AC_PROG_CXX
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AM_PROG_AR
- 
- dnl check environment
- AC_AIX
-@@ -38,9 +38,6 @@
- 
- AC_EXEEXT
- 
--dnl more automake stuff
--AM_C_PROTOTYPES
--
- dnl libtool
- AC_DISABLE_STATIC
- AC_ENABLE_SHARED

diff --git a/lighttpd.spec b/lighttpd.spec
index 2763446d0403e82932fd05d08a4bbd38b22019b8..ef290e60dac137eb8f66670cff0d8b5db58ef7fa 100644 (file)
--- 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.31
-Release:       5
+Version:       1.4.32
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: c718cc27658240d307b8a1d1c7c4bb54
+# Source0-md5: 8e2d4ae8e918d4de1aeb9842584d170b
 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}-automake_1.12.patch
 #Patch:                %{name}-modinit-before-fork.patch
 #Patch:                %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
@@ -837,9 +836,6 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
 %patch6 -p1
-%if "%{pld_release}" != "ac"
-%patch7 -p1
-%endif
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead