Hello community,
here is the log from the commit of package lighttpd for openSUSE:12.1:Update:Test checked in at 2012-02-13 14:24:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/lighttpd (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.lighttpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lighttpd", Maintainer is "MRueckert@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/lighttpd/lighttpd.changes 2012-02-13 14:24:16.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.lighttpd.new/lighttpd.changes 2012-02-13 14:25:03.000000000 +0100
@@ -1,0 +2,51 @@
+Fri Jan 27 11:35:01 UTC 2012 - mrueckert@suse.de
+
+- added lighttpd-1.4.30_head_fixes.patch:
+ cherry picked 4 fixes from HEAD:
+ - [ssl] include more headers explicitly
+ - list all network handlers in lighttpd -V (fixes lighttpd#2376)
+ - Move fdevent subsystem includes to implementation files to reduce
+ conflicts (fixes lighttpd#2373)
+ - [ssl] fix segfault in counting renegotiations for openssl
+ versions without TLSEXT/SNI
+
+-------------------------------------------------------------------
+Wed Dec 21 17:56:41 UTC 2011 - mrueckert@suse.de
+
+- added the debian.tar.gz to the file list of the spec file to pass
+ the check in factory
+
+-------------------------------------------------------------------
+Sun Dec 18 16:22:26 UTC 2011 - mrueckert@suse.de
+
+- update to 1.4.30: (bnc#733607)
+ - Always use our ‘own’ md5 implementation, fixes linking issues
+ on MacOS (fixes #2331)
+ - Limit amount of bytes we send in one go; fixes stalling in one
+ connection and timeouts on slow systems.
+ - [ssl] fix build errors when Elliptic-Curve Diffie-Hellman is
+ disabled
+ - Add static-file.disable-pathinfo option to prevent handling of
+ urls like …/secret.php/image.jpg as static file
+ - Don’t overwrite 401 (auth required) with 501 (unknown method)
+ (fixes #2341)
+ - Fix mod_status bug: always showed “0/0” in the “Read” column
+ for uploads (fixes #2351)
+ - [mod_auth] Fix signedness error in http_auth
+ (fixes #2370, CVE-2011-4362)
+ - [ssl] count renegotiations to prevent client renegotiations
+ - [ssl] add option to honor server cipher order
+ (fixes #2364, BEAST attack)
+ - [core] accept dots in ipv6 addresses in host header
+ (fixes #2359)
+ - [ssl] fix ssl connection aborts if files are larger than the
+ MAX_WRITE_LIMIT (256kb)
+ - [libev/cgi] fix waitpid ECHILD errors in cgi with libev
+ (fixes #2324)
+
+-------------------------------------------------------------------
+Fri Dec 2 06:34:25 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
@@ -7 +58 @@
-Mon Jul 11 16:09:22 UTC 2011 - mrueckert@suse.com
+Mon Jul 11 16:09:22 UTC 2011 - mrueckert@suse.de
Old:
----
lighttpd-1.4.29.tar.bz2
lighttpd_1.4.29-1.debian.tar.gz
lighttpd_1.4.29-1.dsc
lighttpd_1.4.29.orig.tar.gz
New:
----
lighttpd-1.4.30_head_fixes.patch
lighttpd_1.4.30-0.1.debian.tar.gz
lighttpd_1.4.30-0.1.dsc
lighttpd_1.4.30.orig.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lighttpd.spec ++++++
--- /var/tmp/diff_new_pack.fehrZk/_old 2012-02-13 14:25:04.000000000 +0100
+++ /var/tmp/diff_new_pack.fehrZk/_new 2012-02-13 14:25:04.000000000 +0100
@@ -19,7 +19,7 @@
Name: lighttpd
-Version: 1.4.29
+Version: 1.4.30
Release: 0
#
%define pkg_name lighttpd
@@ -30,7 +30,7 @@
License: BSD 3-Clause
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: FastCGI-devel e2fsprogs-devel fam-devel gdbm-devel libattr-devel libmemcache-devel libxml2-devel mysql-devel openldap2-devel pcre-devel pkgconfig pwdutils zlib-devel
+BuildRequires: FastCGI-devel e2fsprogs-devel fam-devel gdbm-devel libattr-devel libmemcache-devel libxml2-devel mysql-devel openldap2-devel pcre-devel pkgconfig pwdutils zlib-devel automake
#
%define with_tests 1
%define with_enh_webdav 1
@@ -83,14 +83,17 @@
#
Url: http://www.lighttpd.net/
# Source: http://www.lighttpd.net/download/%{pkg_name}-%{version}.tar.bz2
-Source: lighttpd-1.4.29.tar.bz2
+Source: lighttpd_1.4.30.orig.tar.bz2
Source1: %{pkg_name}.init
Source2: %{pkg_name}.sysconfig
Source4: lightytest.sh
Source5: lighttpd.SuSEfirewall
Source6: lighttpd-ssl.SuSEfirewall
Source7: lighttpd.logrotate
+# this is just dummy to pass the check for factory and still have one package for deb and rpm
+Source99: lighttpd_1.4.30-0.1.debian.tar.gz
Patch: lighttpd-1.4.13_geoip.patch
+Patch1: lighttpd-1.4.30_head_fixes.patch
#
Summary: A Secure, Fast, Compliant, and Very Flexible Web Server
%description
@@ -274,6 +277,7 @@
%if 0%{?with_geoip}
%patch
%endif
+%patch1 -p1
perl -p -i -e 's| tar-ustar||g' configure.ac
%build
++++++ lighttpd-1.4.30_head_fixes.patch ++++++
commit 35875cd515e06b3ab7e8afd1190a2fec83112ae4
Author: Stefan Bühler
Date: Tue Dec 27 13:45:36 2011 +0000
[ssl] include more headers explicitly
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2825 152afb58-edef-0310-8abb-c4023f1b3aa9
diff --git a/src/network.c b/src/network.c
index ba36654..bd30e2d 100644
--- a/src/network.c
+++ b/src/network.c
@@ -25,6 +25,14 @@
# include
# include
# include
+# include
+# include
+
+# if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+# ifndef OPENSSL_NO_ECDH
+# include
+# endif
+# endif
#endif
#ifdef USE_OPENSSL
commit 6f0752da380c8ae7c7dab12a902b4635d3676d0a
Author: Stefan Bühler
Date: Tue Dec 27 12:14:23 2011 +0000
list all network handlers in lighttpd -V (fixes #2376)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2824 152afb58-edef-0310-8abb-c4023f1b3aa9
diff --git a/src/server.c b/src/server.c
index bad6c07..beeb368 100644
--- a/src/server.c
+++ b/src/server.c
@@ -409,19 +409,31 @@ static void show_features (void) {
"\t- libev (generic)\n"
#endif
"\nNetwork handler:\n\n"
-#if defined(USE_LINUX_SENDFILE) || defined(USE_FREEBSD_SENDFILE) || defined(USE_SOLARIS_SENDFILEV) || defined(USE_AIX_SENDFILE)
- "\t+ sendfile\n"
+#if defined USE_LINUX_SENDFILE
+ "\t+ linux-sendfile\n"
#else
- #ifdef USE_WRITEV
+ "\t- linux-sendfile\n"
+#endif
+#if defined USE_FREEBSD_SENDFILE
+ "\t+ freebsd-sendfile\n"
+#else
+ "\t- freebsd-sendfile\n"
+#endif
+#if defined USE_SOLARIS_SENDFILEV
+ "\t+ solaris-sendfilev\n"
+#else
+ "\t- solaris-sendfilev\n"
+#endif
+#if defined USE_WRITEV
"\t+ writev\n"
- #else
+#else
+ "\t- writev\n"
+#endif
"\t+ write\n"
- #endif
- #ifdef USE_MMAP
+#ifdef USE_MMAP
"\t+ mmap support\n"
- #else
+#else
"\t- mmap support\n"
- #endif
#endif
"\nFeatures:\n\n"
#ifdef HAVE_IPV6
commit 79bcfab083d8437aff5d03df10fd1e1d5b79ffc7
Author: Stefan Bühler
Date: Sun Dec 25 15:35:01 2011 +0000
Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2823 152afb58-edef-0310-8abb-c4023f1b3aa9
diff --git a/src/fdevent.h b/src/fdevent.h
index bdc82b5..9dd9a6c 100644
--- a/src/fdevent.h
+++ b/src/fdevent.h
@@ -20,18 +20,12 @@
#if defined(HAVE_EPOLL_CTL) && defined(HAVE_SYS_EPOLL_H)
# define USE_LINUX_EPOLL
-# include
#endif
/* MacOS 10.3.x has poll.h under /usr/include/, all other unixes
* under /usr/include/sys/ */
#if defined HAVE_POLL && (defined(HAVE_SYS_POLL_H) || defined(HAVE_POLL_H))
# define USE_POLL
-# ifdef HAVE_POLL_H
-# include
-# else
-# include
-# endif
#endif
#if defined HAVE_SELECT
@@ -46,7 +40,6 @@
#if defined HAVE_SYS_DEVPOLL_H && defined(__sun)
# define USE_SOLARIS_DEVPOLL
-# include
#endif
#if defined HAVE_PORT_H && defined HAVE_PORT_CREATE && defined(__sun)
@@ -56,12 +49,10 @@
#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE
# define USE_FREEBSD_KQUEUE
-# include
#endif
#if defined HAVE_LIBEV
# define USE_LIBEV
-# include
#endif
struct server;
diff --git a/src/fdevent_freebsd_kqueue.c b/src/fdevent_freebsd_kqueue.c
index 0f53a2a..220e265 100644
--- a/src/fdevent_freebsd_kqueue.c
+++ b/src/fdevent_freebsd_kqueue.c
@@ -13,8 +13,8 @@
#include
#ifdef USE_FREEBSD_KQUEUE
-#include
-#include
+# include
+# include
static void fdevent_freebsd_kqueue_free(fdevents *ev) {
close(ev->kq_fd);
diff --git a/src/fdevent_libev.c b/src/fdevent_libev.c
index 543127a..de62676 100644
--- a/src/fdevent_libev.c
+++ b/src/fdevent_libev.c
@@ -5,6 +5,9 @@
#include
#ifdef USE_LIBEV
+
+# include
+
static void io_watcher_cb(struct ev_loop *loop, ev_io *w, int revents) {
fdevents *ev = w->data;
fdnode *fdn = ev->fdarray[w->fd];
diff --git a/src/fdevent_linux_sysepoll.c b/src/fdevent_linux_sysepoll.c
index b311f45..f761ed6 100644
--- a/src/fdevent_linux_sysepoll.c
+++ b/src/fdevent_linux_sysepoll.c
@@ -13,6 +13,9 @@
#include
#ifdef USE_LINUX_EPOLL
+
+# include
+
static void fdevent_linux_sysepoll_free(fdevents *ev) {
close(ev->epoll_fd);
free(ev->epoll_events);
diff --git a/src/fdevent_poll.c b/src/fdevent_poll.c
index 6d102e6..e8dc385 100644
--- a/src/fdevent_poll.c
+++ b/src/fdevent_poll.c
@@ -13,6 +13,13 @@
#include
#ifdef USE_POLL
+
+# ifdef HAVE_POLL_H
+# include
+# else
+# include
+# endif
+
static void fdevent_poll_free(fdevents *ev) {
free(ev->pollfds);
if (ev->unused.ptr) free(ev->unused.ptr);
diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c
index cfbc510..dd273e6 100644
--- a/src/fdevent_solaris_devpoll.c
+++ b/src/fdevent_solaris_devpoll.c
@@ -14,6 +14,8 @@
#ifdef USE_SOLARIS_DEVPOLL
+# include
+
static void fdevent_solaris_devpoll_free(fdevents *ev) {
free(ev->devpollfds);
close(ev->devpoll_fd);
commit d194c09da94e310a3ca6659367ffe468303135d5
Author: Stefan Bühler
Date: Fri Dec 23 10:31:57 2011 +0000
[ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2822 152afb58-edef-0310-8abb-c4023f1b3aa9
diff --git a/src/connections.c b/src/connections.c
index cde78e1..faec09f 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -1360,9 +1360,7 @@ connection *connection_accept(server *srv, server_socket *srv_socket) {
}
con->renegotiations = 0;
-#ifndef OPENSSL_NO_TLSEXT
SSL_set_app_data(con->ssl, con);
-#endif
SSL_set_accept_state(con->ssl);
con->conf.is_ssl=1;
++++++ lighttpd_1.4.29-1.debian.tar.gz -> lighttpd_1.4.30-0.1.debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/changelog new/debian/changelog
--- old/debian/changelog 2011-07-11 17:27:12.000000000 +0200
+++ new/debian/changelog 2011-12-18 16:54:12.000000000 +0100
@@ -1,3 +1,10 @@
+lighttpd (1.4.30-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+
+ -- Stefan Bühler