aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/lighttpd/Makefile7
-rw-r--r--www/lighttpd/distinfo6
-rw-r--r--www/lighttpd/files/lighttpd.conf.sample128
-rw-r--r--www/lighttpd/files/patch-src::Makefile.in8
-rw-r--r--www/lighttpd/pkg-plist4
5 files changed, 81 insertions, 72 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index dcdad33d9677..e406ea61fdbd 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -6,15 +6,10 @@
#
PORTNAME= lighttpd
-PORTVERSION= 1.2.7
-PORTREVISION= 1
+PORTVERSION= 1.3.5
CATEGORIES= www
MASTER_SITES= http://jan.kneschke.de/projects/lighttpd/download/
-PATCH_SITES= http://jan.kneschke.de/projects/lighttpd/download/
-PATCHFILES= lighttpd-1.2.7-cond.patch
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= k@123.org
COMMENT= A secure, fast, compliant, and very flexible Web Server
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 5faa03b16ccd..024b38a36a5b 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,4 +1,2 @@
-MD5 (lighttpd-1.2.7.tar.gz) = 0139b1ec4514089e9ca11dc3072529ab
-SIZE (lighttpd-1.2.7.tar.gz) = 607311
-MD5 (lighttpd-1.2.7-cond.patch) = 79a9106136b2bc7c20a09d6fed135625
-SIZE (lighttpd-1.2.7-cond.patch) = 1212
+MD5 (lighttpd-1.3.5.tar.gz) = 15afeba95fa157e3bdedd9a1a22358a0
+SIZE (lighttpd-1.3.5.tar.gz) = 628719
diff --git a/www/lighttpd/files/lighttpd.conf.sample b/www/lighttpd/files/lighttpd.conf.sample
index e821f9278618..dcc473acb2f3 100644
--- a/www/lighttpd/files/lighttpd.conf.sample
+++ b/www/lighttpd/files/lighttpd.conf.sample
@@ -2,7 +2,7 @@
#
# use a it as base for lighttpd 1.0.0 and above
#
-# $Id: lighttpd.conf,v 1.5 2004/08/01 07:01:29 weigon Exp $
+# $Id: lighttpd.conf,v 1.6 2004/08/29 09:44:53 weigon Exp $
############ Options you really have to take care of ####################
@@ -24,6 +24,7 @@ server.modules = (
# "mod_compress",
# "mod_ssi",
# "mod_usertrack",
+# "mod_rrdtool",
"mod_accesslog" )
## a static document-root, for virtual-hosting take look at the
@@ -38,50 +39,58 @@ server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )
# mimetype mapping
-mimetype.assign = ( ".png" => "image/png",
- ".jpg" => "image/jpeg",
- ".jpeg" => "image/jpeg",
- ".gif" => "image/gif",
- ".html" => "text/html",
- ".htm" => "text/html",
- ".pdf" => "application/pdf",
- ".swf" => "application/x-shockwave-flash",
- ".spl" => "application/futuresplash",
- ".txt" => "text/plain",
- ".tar.gz" => "application/x-tgz",
- ".tgz" => "application/x-tgz",
- ".gz" => "application/x-gzip",
- ".c" => "text/plain",
- ".conf" => "text/plain",
- ".css" => "text/css",
- ".js" => "text/javascript",
- ".asc" => "text/plain",
- ".dvi" => "application/x-dvi" ,
- ".ps" => "application/postscript" ,
- ".gif" => "image/gif" ,
- ".mpeg" => "video/mpeg" ,
- ".mpg" => "video/mpeg" ,
- ".avi" => "video/x-msvideo" ,
- ".mov" => "video/quicktime" ,
- ".qt" => "video/quicktime" ,
- ".mp3" => "audio/mpeg" ,
- ".ogg" => "audio/x-wav" ,
- ".wav" => "audio/x-wav" ,
- ".pac" => "application/x-ns-proxy-autoconfig" ,
- ".sig" => "application/pgp-signature" ,
- ".torrent" => "application/x-bittorrent" ,
- ".class" => "application/octet-stream" ,
- ".tar" => "application/x-tar" ,
- ".zip" => "application/zip" ,
- ".dtd" => "text/xml" ,
- ".xml" => "text/xml" ,
- ".xbm" => "image/x-xbitmap" ,
- ".xpm" => "image/x-xpixmap" ,
- ".xwd" => "image/x-xwindowdump" ,
- ".text" => "text/plain" ,
- ".m3u" => "audio/x-mpegurl"
+mimetype.assign = (
+ ".pdf" => "application/pdf",
+ ".sig" => "application/pgp-signature",
+ ".spl" => "application/futuresplash",
+ ".class" => "application/octet-stream",
+ ".ps" => "application/postscript",
+ ".torrent" => "application/x-bittorrent",
+ ".dvi" => "application/x-dvi",
+ ".gz" => "application/x-gzip",
+ ".pac" => "application/x-ns-proxy-autoconfig",
+ ".swf" => "application/x-shockwave-flash",
+ ".tar.gz" => "application/x-tgz",
+ ".tgz" => "application/x-tgz",
+ ".tar" => "application/x-tar",
+ ".zip" => "application/zip",
+ ".mp3" => "audio/mpeg",
+ ".m3u" => "audio/x-mpegurl",
+ ".wma" => "audio/x-ms-wma",
+ ".wax" => "audio/x-ms-wax",
+ ".ogg" => "audio/x-wav",
+ ".wav" => "audio/x-wav",
+ ".gif" => "image/gif",
+ ".jpg" => "image/jpeg",
+ ".jpeg" => "image/jpeg",
+ ".png" => "image/png",
+ ".xbm" => "image/x-xbitmap",
+ ".xpm" => "image/x-xpixmap",
+ ".xwd" => "image/x-xwindowdump",
+ ".css" => "text/css",
+ ".html" => "text/html",
+ ".htm" => "text/html",
+ ".js" => "text/javascript",
+ ".asc" => "text/plain",
+ ".c" => "text/plain",
+ ".conf" => "text/plain",
+ ".text" => "text/plain",
+ ".txt" => "text/plain",
+ ".dtd" => "text/xml",
+ ".xml" => "text/xml",
+ ".mpeg" => "video/mpeg",
+ ".mpg" => "video/mpeg",
+ ".mov" => "video/quicktime",
+ ".qt" => "video/quicktime",
+ ".avi" => "video/x-msvideo",
+ ".asf" => "video/x-ms-asf",
+ ".asx" => "video/x-ms-asf",
+ ".wmv" => "video/x-ms-wmv"
)
+# Use the "Content-Type" extended attribute to obtain mime type if possible
+# mimetypes.use-xattr = "enable"
+
#### accesslog module
accesslog.filename = "/var/log/lighttpd.access.log"
@@ -102,6 +111,10 @@ url.access-deny = ( "~", ".inc" )
## bind to localhost (default: all interfaces)
#server.bind = "grisu.home.kneschke.de"
+## error-handler for status 404
+#server.error-handler-404 = "/error-handler.html"
+#server.error-handler-404 = "/error-handler.php"
+
###### virtual hosts
##
@@ -139,7 +152,6 @@ server.username = "www"
## change uid to <uid> (default: don't care)
server.groupname = "www"
-server.pid-file = "/var/run/lighttpd.pid"
#### compress module
#compress.cache-dir = "/tmp/lighttpd/cache/compress/"
#compress.filetype = ("text/plain", "text/html")
@@ -165,20 +177,20 @@ server.pid-file = "/var/run/lighttpd.pid"
#ssl.pemfile = "server.pem"
#### status module
-#status.rrd-reports = "enable"
-#status.rrd-dir = "/home/weigon/wwwroot/logs/"
+# status.status-url = "/server-status"
+# status.config-url = "/server-config"
#### auth module
## read authentification.txt for more info
-#auth.backend = "plain"
-#auth.backend.plain.userfile = "lighttpd.user"
-#auth.backend.plain.groupfile = "lighttpd.group"
+# auth.backend = "plain"
+# auth.backend.plain.userfile = "lighttpd.user"
+# auth.backend.plain.groupfile = "lighttpd.group"
-#auth.backend.ldap.hostname = "localhost"
-#auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
-#auth.backend.ldap.filter = "(uid=$)"
+# auth.backend.ldap.hostname = "localhost"
+# auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
+# auth.backend.ldap.filter = "(uid=$)"
-#auth.require = ( "/server-status" =>
+# auth.require = ( "/server-status" =>
# (
# "method" => "digest",
# "realm" => "download archiv",
@@ -193,8 +205,8 @@ server.pid-file = "/var/run/lighttpd.pid"
# )
#### url handling modules (rewrite, redirect, access)
-#url.rewrite = ( "^/$" => "/server-status" )
-#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
+# url.rewrite = ( "^/$" => "/server-status" )
+# url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
#
# define a pattern for the host url finding
@@ -208,7 +220,11 @@ server.pid-file = "/var/run/lighttpd.pid"
# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
#### expire module
-#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
+# expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
#### ssi
# ssi.extension = ( ".shtml" )
+
+#### rrdtool
+# rrdtool.binary = "/usr/bin/rrdtool"
+# rrdtool.db-name = "/var/www/lighttpd.rrd"
diff --git a/www/lighttpd/files/patch-src::Makefile.in b/www/lighttpd/files/patch-src::Makefile.in
index 9d7610fdda9c..d8eb0bb9939a 100644
--- a/www/lighttpd/files/patch-src::Makefile.in
+++ b/www/lighttpd/files/patch-src::Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig Tue Mar 23 18:30:12 2004
-+++ src/Makefile.in Wed Mar 24 05:25:13 2004
-@@ -57,7 +57,7 @@
+--- src/Makefile.in.orig Fri Oct 1 03:47:40 2004
++++ src/Makefile.in Fri Oct 1 17:05:04 2004
+@@ -65,7 +65,7 @@
#hdr += chat.h chat_misc.h chat_endec.h chat_user.h \
# chat_channel.h
@@ -9,7 +9,7 @@
DEPDIR = @DEPDIR@
DL_LIB = @DL_LIB@
ECHO = @ECHO@
-@@ -373,12 +373,12 @@
+@@ -599,12 +599,12 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist
index cb448598d378..240379fec0a9 100644
--- a/www/lighttpd/pkg-plist
+++ b/www/lighttpd/pkg-plist
@@ -2,14 +2,13 @@ etc/lighttpd.conf.sample
etc/rc.d/lighttpd.sh
lib/lighttpd/mod_access.so
lib/lighttpd/mod_accesslog.so
+lib/lighttpd/mod_alias.so
lib/lighttpd/mod_auth.so
lib/lighttpd/mod_cgi.so
lib/lighttpd/mod_compress.so
lib/lighttpd/mod_evhost.so
lib/lighttpd/mod_expire.so
lib/lighttpd/mod_fastcgi.so
-lib/lighttpd/mod_httptls.so
-lib/lighttpd/mod_maps.so
lib/lighttpd/mod_proxy.so
lib/lighttpd/mod_redirect.so
lib/lighttpd/mod_rewrite.so
@@ -18,6 +17,7 @@ lib/lighttpd/mod_secdownload.so
lib/lighttpd/mod_simple_vhost.so
lib/lighttpd/mod_ssi.so
lib/lighttpd/mod_status.so
+lib/lighttpd/mod_userdir.so
lib/lighttpd/mod_usertrack.so
sbin/lighttpd
@dirrm lib/lighttpd