From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 20 21:30:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36EAC16A41F for ; Fri, 20 Jan 2006 21:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9955D43D6D for ; Fri, 20 Jan 2006 21:30:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0KLU5Ka037657 for ; Fri, 20 Jan 2006 21:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0KLU5Mi037655; Fri, 20 Jan 2006 21:30:05 GMT (envelope-from gnats) Resent-Date: Fri, 20 Jan 2006 21:30:05 GMT Resent-Message-Id: <200601202130.k0KLU5Mi037655@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rui Lopes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DF6D16A420 for ; Fri, 20 Jan 2006 21:25:19 +0000 (GMT) (envelope-from rgl@firebird.clustercube.com) Received: from firebird.clustercube.com (firebird.clustercube.com [72.21.32.50]) by mx1.FreeBSD.org (Postfix) with SMTP id 9725C43D46 for ; Fri, 20 Jan 2006 21:25:18 +0000 (GMT) (envelope-from rgl@firebird.clustercube.com) Received: (qmail 76220 invoked by uid 1010); 20 Jan 2006 21:25:18 -0000 Message-Id: <20060120212518.76219.qmail@firebird.clustercube.com> Date: 20 Jan 2006 21:25:18 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: hendrik@scholz.net Subject: ports/92078: Update port: www/lighttpd from 1.4.8 to 1.4.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rui Lopes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2006 21:30:07 -0000 >Number: 92078 >Category: ports >Synopsis: Update port: www/lighttpd from 1.4.8 to 1.4.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 20 21:30:04 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: >Description: Update lighttpd. >How-To-Repeat: >Fix: --- update_lighttpd_from_1.4.8_to_1.4.9.patch begins here --- diff -ruN lighttpd.orig/Makefile lighttpd/Makefile --- lighttpd.orig/Makefile Fri Jan 20 16:52:37 2006 +++ lighttpd/Makefile Fri Jan 20 16:54:25 2006 @@ -6,12 +6,9 @@ # PORTNAME= lighttpd -PORTVERSION= 1.4.8 -PORTREVISION= 1 +PORTVERSION= 1.4.9 CATEGORIES= www -MASTER_SITES= http://www.lighttpd.net/download/ \ - http://dl.fkb.wormulon.net/lighttpd/ \ - http://dl.kel.wormulon.net/lighttpd/ +MASTER_SITES= http://www.lighttpd.net/download/ MAINTAINER= hendrik@scholz.net COMMENT= A secure, fast, compliant, and very flexible Web Server diff -ruN lighttpd.orig/distinfo lighttpd/distinfo --- lighttpd.orig/distinfo Fri Jan 20 16:52:37 2006 +++ lighttpd/distinfo Fri Jan 20 16:54:51 2006 @@ -1,3 +1,3 @@ -MD5 (lighttpd-1.4.8.tar.gz) = 7d7790ef95ff5755f73bfcda4f13696d -SHA256 (lighttpd-1.4.8.tar.gz) = f3115cb4b9f9805c9a9e7d6cdc97512adaaebde01a84122fcbd1c0ca16bc2d69 -SIZE (lighttpd-1.4.8.tar.gz) = 769111 +MD5 (lighttpd-1.4.9.tar.gz) = 20a171774a0615069de3704db52483aa +SHA256 (lighttpd-1.4.9.tar.gz) = 7603b5eb204a84f654c66e5582197e4810df71175a3be11ecfc8675307d043a9 +SIZE (lighttpd-1.4.9.tar.gz) = 775524 diff -ruN lighttpd.orig/files/lighttpd.conf.sample lighttpd/files/lighttpd.conf.sample --- lighttpd.orig/files/lighttpd.conf.sample Fri Jan 20 16:52:37 2006 +++ lighttpd/files/lighttpd.conf.sample Fri Jan 20 17:00:57 2006 @@ -1,6 +1,6 @@ # lighttpd configuration file # -# use a it as base for lighttpd 1.0.0 and above +# use it as a base for lighttpd 1.0.0 and above # # $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $ @@ -16,6 +16,8 @@ # "mod_redirect", # "mod_alias", "mod_access", +# "mod_cml", +# "mod_trigger_b4_dl", # "mod_auth", # "mod_status", # "mod_setenv", @@ -41,13 +43,12 @@ server.errorlog = "/var/log/lighttpd.error.log" # files to check for if .../ is requested -server.indexfiles = ( "index.php", "index.html", +index-file.names = ( "index.php", "index.html", "index.htm", "default.htm" ) -# set the event-handler (read the performance section in the manual) +## set the event-handler (read the performance section in the manual) server.event-handler = "freebsd-kqueue" # needed on OS X - # mimetype mapping mimetype.assign = ( ".pdf" => "application/pdf", @@ -68,7 +69,7 @@ ".m3u" => "audio/x-mpegurl", ".wma" => "audio/x-ms-wma", ".wax" => "audio/x-ms-wax", - ".ogg" => "audio/x-wav", + ".ogg" => "application/ogg", ".wav" => "audio/x-wav", ".gif" => "image/gif", ".jpg" => "image/jpeg", @@ -83,6 +84,8 @@ ".js" => "text/javascript", ".asc" => "text/plain", ".c" => "text/plain", + ".cpp" => "text/plain", + ".log" => "text/plain", ".conf" => "text/plain", ".text" => "text/plain", ".txt" => "text/plain", @@ -102,12 +105,12 @@ ) # Use the "Content-Type" extended attribute to obtain mime type if possible -#mimetypes.use-xattr = "enable" +#mimetype.use-xattr = "enable" ## send a different Server: header ## be nice and keep it at lighttpd -#server.tag = "lighttpd" +# server.tag = "lighttpd" #### accesslog module accesslog.filename = "/var/log/lighttpd.access.log" @@ -119,7 +122,15 @@ # of the document-root url.access-deny = ( "~", ".inc" ) +$HTTP["url"] =~ "\.pdf$" { + server.range-requests = "disable" +} +## +# which extensions should not be handle via static-file transfer +# +# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi +static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) ######### Options that are good to be but not neccesary to be changed ####### @@ -158,7 +169,7 @@ #server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-" ## virtual directory listings -#server.dir-listing = "enable" +#dir-listing.activate = "enable" ## enable debugging #debug.log-request-header = "enable" @@ -217,7 +228,7 @@ #status.config-url = "/server-config" #### auth module -## read authentification.txt for more info +## read authentication.txt for more info #auth.backend = "plain" #auth.backend.plain.userfile = "lighttpd.user" #auth.backend.plain.groupfile = "lighttpd.group" @@ -230,19 +241,23 @@ # ( # "method" => "digest", # "realm" => "download archiv", -# "require" => "group=www|user=jan|host=192.168.2.10" +# "require" => "user=jan" # ), -# "/server-info" => +# "/server-config" => # ( # "method" => "digest", # "realm" => "download archiv", -# "require" => "group=www|user=jan|host=192.168.2.10" +# "require" => "valid-user" # ) # ) #### url handling modules (rewrite, redirect, access) #url.rewrite = ( "^/$" => "/server-status" ) #url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" ) +#### both rewrite/redirect support back reference to regex conditional using %n +#$HTTP["host"] =~ "^www\.(.*)" { +# url.redirect = ( "^/(.*)" => "http://%1/$1" ) +#} # # define a pattern for the host url finding @@ -268,3 +283,39 @@ #### setenv #setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) #setenv.add-response-header = ( "X-Secret-Message" => "42" ) + +## for mod_trigger_b4_dl +# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" +# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) +# trigger-before-download.trigger-url = "^/trigger/" +# trigger-before-download.download-url = "^/download/" +# trigger-before-download.deny-url = "http://127.0.0.1/index.html" +# trigger-before-download.trigger-timeout = 10 + +## for mod_cml +## don't forget to add index.cml to server.indexfiles +# cml.extension = ".cml" +# cml.memcache-hosts = ( "127.0.0.1:11211" ) + +#### variable usage: +## variable name without "." is auto prefixed by "var." and becomes "var.bar" +#bar = 1 +#var.mystring = "foo" + +## integer add +#bar += 1 +## string concat, with integer cast as string, result: "www.foo1.com" +#server.name = "www." + mystring + var.bar + ".com" +## array merge +#index-file.names = (foo + ".php") + index-file.names +#index-file.names += (foo + ".php") + +#### include +#include /etc/lighttpd/lighttpd-inc.conf +## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf" +#include "lighttpd-inc.conf" + +#### include_shell +#include_shell "echo var.a=1" +## the above is same as: +#var.a=1 diff -ruN lighttpd.orig/pkg-plist lighttpd/pkg-plist --- lighttpd.orig/pkg-plist Fri Jan 20 16:52:37 2006 +++ lighttpd/pkg-plist Fri Jan 20 17:13:49 2006 @@ -11,6 +11,7 @@ lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so lib/lighttpd/mod_dirlisting.so +lib/lighttpd/mod_evasive.so lib/lighttpd/mod_evhost.so lib/lighttpd/mod_expire.so lib/lighttpd/mod_fastcgi.so --- update_lighttpd_from_1.4.8_to_1.4.9.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: