Thu Jan 23 13:20:12 2014 UTC ()
Changes 1.4.34:
* [mod_auth] explicitly link ssl for SHA1 (fixes 2517)
* [mod_extforward] fix compilation without IPv6, (not) using undefined var (fixes 2515, thx mm)
* [ssl] fix SNI handling; only use key+cert from SNI specific config (fixes 2525, CVE-2013-4508)
* [doc] update ssl.cipher-list recommendation
* [stat-cache] FAM: fix use after free (CVE-2013-4560)
* [stat-cache] fix FAM cleanup/fdevent handling
* [core] check success of setuid,setgid,setgroups (CVE-2013-4559)
* [ssl] fix regression from CVE-2013-4508 (client-cert sessions were broken)
* maintain physical.basedir (the "acting" doc-root as prefix of physical.path) in more places
* [core] decode URL before rewrite, enabling it to work in $HTTP["url"] conditionals (fixes 2526)
* [auto* build] remove -no-undefined from linker flags, as we actually link modules with undefined symbols (fixes 2533)
* [mod_mysql_vhost] fix memory leak on config init (2530)
* [mod_webdav] fix fd leak found with parfait (fixes 2530, thx kukackajiri)


(adam)
diff -r1.42 -r1.43 pkgsrc/www/lighttpd/Makefile
diff -r1.25 -r1.26 pkgsrc/www/lighttpd/distinfo
diff -r1.1 -r1.2 pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf
diff -r0 -r1.1 pkgsrc/www/lighttpd/patches/patch-src_fdevent_poll.c
cvs diff -r1.42 -r1.43 pkgsrc/www/lighttpd/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/Makefile 2013/10/29 19:54:11 1.42
+++ pkgsrc/www/lighttpd/Makefile 2014/01/23 13:20:12 1.43
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.42 2013/10/29 19:54:11 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2014/01/23 13:20:12 adam Exp $
2 2
3DISTNAME= lighttpd-1.4.33 3DISTNAME= lighttpd-1.4.34
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ 5MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://www.lighttpd.net/ 9HOMEPAGE= http://www.lighttpd.net/
10COMMENT= Fast, light-footprint HTTP server 10COMMENT= Fast, light-footprint HTTP server
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14SHLIBTOOL_OVERRIDE= # empty 14SHLIBTOOL_OVERRIDE= # empty
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16GNU_CONFIGURE_LIBSUBDIR=${PKGBASE} 16GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
cvs diff -r1.25 -r1.26 pkgsrc/www/lighttpd/distinfo (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/distinfo 2013/10/29 19:54:11 1.25
+++ pkgsrc/www/lighttpd/distinfo 2014/01/23 13:20:12 1.26
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.25 2013/10/29 19:54:11 adam Exp $ 1$NetBSD: distinfo,v 1.26 2014/01/23 13:20:12 adam Exp $
2 2
3SHA1 (lighttpd-1.4.33.tar.xz) = f309708105aadffba229a944d4c32423132119a5 3SHA1 (lighttpd-1.4.34.tar.xz) = c1edd4ddbd24156c374594e27d63058ffe5dc726
4RMD160 (lighttpd-1.4.33.tar.xz) = 4b892ac678c9153e8200318f2bd71445190c1806 4RMD160 (lighttpd-1.4.34.tar.xz) = 1454388519622068e9ca7579a09602c94b851eae
5Size (lighttpd-1.4.33.tar.xz) = 555248 bytes 5Size (lighttpd-1.4.34.tar.xz) = 556080 bytes
6SHA1 (patch-doc_config_lighttpd.conf) = 1f5d884ec3cc9ee1ec18b51f0d25ca2a7aae0b8c 6SHA1 (patch-doc_config_lighttpd.conf) = e8ae799f0915b83fda5ce8893fdbcab2eee9a512
 7SHA1 (patch-src_fdevent_poll.c) = f5fe62f0b227d64dc717661a256567b4bd97f075
7SHA1 (patch-src_plugin.c) = 27b7a193c1f5867b5a1d2e2c5b289a0bf6368b39 8SHA1 (patch-src_plugin.c) = 27b7a193c1f5867b5a1d2e2c5b289a0bf6368b39
cvs diff -r1.1 -r1.2 pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf (expand / switch to unified diff)

--- pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf 2012/08/01 11:25:22 1.1
+++ pkgsrc/www/lighttpd/patches/patch-doc_config_lighttpd.conf 2014/01/23 13:20:12 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-doc_config_lighttpd.conf,v 1.1 2012/08/01 11:25:22 fhajny Exp $ 1$NetBSD: patch-doc_config_lighttpd.conf,v 1.2 2014/01/23 13:20:12 adam Exp $
2 2
3Sane defaults. 3Sane defaults.
 4
4--- doc/config/lighttpd.conf.orig 2010-07-11 17:01:32.000000000 +0000 5--- doc/config/lighttpd.conf.orig 2010-07-11 17:01:32.000000000 +0000
5+++ doc/config/lighttpd.conf 6+++ doc/config/lighttpd.conf
6@@ -13,11 +13,11 @@ 7@@ -13,11 +13,11 @@
7 ## if you add a variable here. Add the corresponding variable in the 8 ## if you add a variable here. Add the corresponding variable in the
8 ## chroot example aswell. 9 ## chroot example aswell.
9 ## 10 ##
10-var.log_root = "/var/log/lighttpd" 11-var.log_root = "/var/log/lighttpd"
11+var.log_root = "@LIGHTTPD_LOGDIR@" 12+var.log_root = "@LIGHTTPD_LOGDIR@"
12 var.server_root = "/srv/www" 13 var.server_root = "/srv/www"
13-var.state_dir = "/var/run" 14-var.state_dir = "/var/run"
14+var.state_dir = "@LIGHTTPD_STATEDIR@" 15+var.state_dir = "@LIGHTTPD_STATEDIR@"
15 var.home_dir = "/var/lib/lighttpd" 16 var.home_dir = "/var/lib/lighttpd"
16-var.conf_dir = "/etc/lighttpd" 17-var.conf_dir = "/etc/lighttpd"
File Added: pkgsrc/www/lighttpd/patches/Attic/patch-src_fdevent_poll.c
$NetBSD: patch-src_fdevent_poll.c,v 1.1 2014/01/23 13:20:12 adam Exp $

Error fix.

--- src/fdevent_poll.c.orig	2014-01-23 11:58:57.000000000 +0000
+++ src/fdevent_poll.c
@@ -193,7 +193,7 @@ int fdevent_poll_init(fdevents *ev) {
 int fdevent_poll_init(fdevents *ev) {
 	UNUSED(ev);
 
-	log_error_write(srv, __FILE__, __LINE__,
+	log_error_write(ev->srv, __FILE__, __LINE__,
 		"s", "poll is not supported, try to set server.event-handler = \"select\"");
 
 	return -1;