Browse Source

lighttpd: Updated (1.4.26 -> 1.4.28)

stable/0.2
Christian Wiese 14 years ago
parent
commit
e42676b3b5
  1. 4
      network/lighttpd/lighttpd.conf
  2. 6
      network/lighttpd/lighttpd.desc
  3. 32
      network/lighttpd/ssl-retval-fix.patch

4
network/lighttpd/lighttpd.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lighttpd/lighttpd.conf
# Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2006 - 2011 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -63,7 +63,7 @@ lighttpd_dotconf() {
sed -e "s,^server.document-root .*,server.document-root = \"/var/empty\"," \
-e "s,^server.errorlog .*,server.errorlog = \"$localstatedir/log/error.log\"," \
-e "s,^accesslog.filename .*,accesslog.filename = \"$localstatedir/log/access.log\"," \
doc/lighttpd.conf > $root$sysconfdir/lighttpd.conf-dist
doc/config/lighttpd.conf > $root$sysconfdir/lighttpd.conf-dist
}
hook_add postmake 5 "lighttpd_dotconf"

6
network/lighttpd/lighttpd.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../lighttpd/lighttpd.desc
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -32,8 +32,8 @@
[L] OpenSource
[S] Stable
[V] 1.4.26
[V] 1.4.28
[P] X -?---5---9 150.000
[D] 2525722022 lighttpd-1.4.26.tar.bz2 http://download.lighttpd.net/lighttpd/releases-1.4.x/
[D] 604775406 lighttpd-1.4.28.tar.bz2 http://download.lighttpd.net/lighttpd/releases-1.4.x/

32
network/lighttpd/ssl-retval-fix.patch

@ -1,32 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lighttpd/ssl-retval-fix.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Fix handling return value of SSL_CTX_set_options
http://redmine.lighttpd.net/issues/2157
diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c
--- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500
+++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500
@@ -525,7 +525,7 @@ int network_init(server *srv) {
if (!s->ssl_use_sslv2) {
/* disable SSLv2 */
- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
+ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
ERR_error_string(ERR_get_error(), NULL));
return -1;
Loading…
Cancel
Save