summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/lighttpd/Makefile5
-rw-r--r--www/lighttpd/PLIST4
-rw-r--r--www/lighttpd/distinfo16
-rw-r--r--www/lighttpd/patches/patch-ab6
-rw-r--r--www/lighttpd/patches/patch-ac13
-rw-r--r--www/lighttpd/patches/patch-ad13
-rw-r--r--www/lighttpd/patches/patch-ae13
-rw-r--r--www/lighttpd/patches/patch-af14
-rw-r--r--www/lighttpd/patches/patch-ag12
-rw-r--r--www/lighttpd/patches/patch-ah43
10 files changed, 127 insertions, 12 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 330155e5110..f81e41c1054 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/12/22 21:07:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/19 21:31:30 joerg Exp $
-DISTNAME= lighttpd-1.4.11
-PKGREVISION= 1
+DISTNAME= lighttpd-1.4.13
CATEGORIES= www
MASTER_SITES= http://www.lighttpd.net/download/
diff --git a/www/lighttpd/PLIST b/www/lighttpd/PLIST
index e3908d30192..3761e7590ac 100644
--- a/www/lighttpd/PLIST
+++ b/www/lighttpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/10 12:07:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/19 21:31:33 joerg Exp $
bin/spawn-fcgi
lib/lighttpd/mod_access.la
lib/lighttpd/mod_accesslog.la
@@ -14,6 +14,7 @@ lib/lighttpd/mod_expire.la
lib/lighttpd/mod_fastcgi.la
lib/lighttpd/mod_flv_streaming.la
lib/lighttpd/mod_indexfile.la
+lib/lighttpd/mod_magnet.la
lib/lighttpd/mod_mysql_vhost.la
lib/lighttpd/mod_proxy.la
lib/lighttpd/mod_redirect.la
@@ -53,6 +54,7 @@ share/doc/lighttpd/fastcgi-state.dot
share/doc/lighttpd/fastcgi-state.txt
share/doc/lighttpd/fastcgi.txt
share/doc/lighttpd/features.txt
+share/doc/lighttpd/magnet.txt
share/doc/lighttpd/mysqlvhost.txt
share/doc/lighttpd/newstyle.css
share/doc/lighttpd/oldstyle.css
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 4f26706a4ce..a5f65cd1711 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.7 2006/12/22 21:07:11 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/02/19 21:31:33 joerg Exp $
-SHA1 (lighttpd-1.4.11.tar.gz) = ca904d3d4d9dde76f85156f2c709a394f30e28c8
-RMD160 (lighttpd-1.4.11.tar.gz) = 0434e6c09383f1ad443d985fd168a29f6f132d1f
-Size (lighttpd-1.4.11.tar.gz) = 781656 bytes
+SHA1 (lighttpd-1.4.13.tar.gz) = b17553e66609f85baec50263712a4a5aeca50ca5
+RMD160 (lighttpd-1.4.13.tar.gz) = 4e67e42dc3692d50c044561cc903de7b906f260c
+Size (lighttpd-1.4.13.tar.gz) = 797813 bytes
SHA1 (patch-aa) = f1e8cad740e6ede7fdc38367f75a7ef9d5605a71
-SHA1 (patch-ab) = c76c85d631c6cc76e8d72076308259c3e4c8426b
+SHA1 (patch-ab) = 1a8e05b1f347adc9314d9b543d6f3b0e5e3bcfbd
+SHA1 (patch-ac) = 5b29d06bb002eac055b024784d11296d8df28d16
+SHA1 (patch-ad) = 56d94ebf9a5f9809dff67e6be6031a37dd07eda1
+SHA1 (patch-ae) = 33cc3cac3746b1c53e386776deeca3aef0863541
+SHA1 (patch-af) = 8e3de40f9230e672a4d09ab688c7b864c661390d
+SHA1 (patch-ag) = ae22b00ec1d7af2cb2ba67deb22a705ba2677711
+SHA1 (patch-ah) = edd5bd1662f2ff11b1e2fc2a84f939c6b2e584d0
diff --git a/www/lighttpd/patches/patch-ab b/www/lighttpd/patches/patch-ab
index 839582d9492..9aff8da4634 100644
--- a/www/lighttpd/patches/patch-ab
+++ b/www/lighttpd/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2006/12/22 21:07:11 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/02/19 21:31:34 joerg Exp $
---- src/network_freebsd_sendfile.c.orig 2006-12-22 20:54:33.000000000 +0000
+--- src/network_freebsd_sendfile.c.orig 2006-10-04 13:29:17.000000000 +0000
+++ src/network_freebsd_sendfile.c
@@ -25,7 +25,7 @@
@@ -8,6 +8,6 @@ $NetBSD: patch-ab,v 1.1 2006/12/22 21:07:11 joerg Exp $
#ifndef UIO_MAXIOV
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__DragonFly__)
- /* FreeBSD 4.7, 4.9 defined it in sys/uio.h only if _KERNEL is specified */
+ /* FreeBSD 4.7, 4.9 defined it in sys/uio.h only if _KERNEL is specified */
# define UIO_MAXIOV 1024
# endif
diff --git a/www/lighttpd/patches/patch-ac b/www/lighttpd/patches/patch-ac
new file mode 100644
index 00000000000..6bf78a93752
--- /dev/null
+++ b/www/lighttpd/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/02/19 21:31:34 joerg Exp $
+
+--- src/network_writev.c.orig 2006-10-07 17:25:51.000000000 +0000
++++ src/network_writev.c
+@@ -55,7 +55,7 @@ int network_write_chunkqueue_writev(serv
+ const size_t max_chunks = MAX_IOVEC;
+ #elif defined(UIO_MAXIOV) /* Linux x86 (glibc-2.2.5-233) */
+ const size_t max_chunks = UIO_MAXIOV;
+-#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) /* FreeBSD 4.x */
++#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__DragonFly__) /* FreeBSD 4.x */
+ const size_t max_chunks = 1024; /* UIO_MAXIOV value from sys/uio.h */
+ #else
+ #error "sysconf() doesnt return _SC_IOV_MAX ..., check the output of 'man writev' for the EINVAL error and send the output to jan@kneschke.de"
diff --git a/www/lighttpd/patches/patch-ad b/www/lighttpd/patches/patch-ad
new file mode 100644
index 00000000000..e96325867d5
--- /dev/null
+++ b/www/lighttpd/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/02/19 21:31:36 joerg Exp $
+
+--- configure.in.orig 2007-02-19 21:15:12.000000000 +0000
++++ configure.in
+@@ -398,7 +398,7 @@ AC_ARG_WITH(lua, AC_HELP_STRING([--with-
+
+ AC_MSG_RESULT($WITH_LUA)
+ if test "$WITH_LUA" != "no"; then
+- if test "$WITH_LUA" == "yes"; then
++ if test "$WITH_LUA" = "yes"; then
+ WITH_LUA=lua
+ fi
+ PKG_CHECK_MODULES(LUA, $WITH_LUA >= 5.1, [
diff --git a/www/lighttpd/patches/patch-ae b/www/lighttpd/patches/patch-ae
new file mode 100644
index 00000000000..7d36b806d0a
--- /dev/null
+++ b/www/lighttpd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/02/19 21:31:37 joerg Exp $
+
+--- configure.orig 2007-02-19 21:14:50.000000000 +0000
++++ configure
+@@ -26988,7 +26988,7 @@ fi;
+ echo "$as_me:$LINENO: result: $WITH_LUA" >&5
+ echo "${ECHO_T}$WITH_LUA" >&6
+ if test "$WITH_LUA" != "no"; then
+- if test "$WITH_LUA" == "yes"; then
++ if test "$WITH_LUA" = "yes"; then
+ WITH_LUA=lua
+ fi
+
diff --git a/www/lighttpd/patches/patch-af b/www/lighttpd/patches/patch-af
new file mode 100644
index 00000000000..1c9ca9beaf3
--- /dev/null
+++ b/www/lighttpd/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2007/02/19 21:31:37 joerg Exp $
+
+--- src/http_auth.c.orig 2006-10-04 13:29:17.000000000 +0000
++++ src/http_auth.c
+@@ -733,7 +733,8 @@ static int http_auth_basic_password_comp
+ }
+ }
+
+-
++ if (p->conf.auth_ldap_allow_empty_pw != 1 && pw[0] == '\0')
++ return -1;
+
+ /* build filter */
+ buffer_copy_string_buffer(p->ldap_filter, p->conf.ldap_filter_pre);
diff --git a/www/lighttpd/patches/patch-ag b/www/lighttpd/patches/patch-ag
new file mode 100644
index 00000000000..b4fc2a14d53
--- /dev/null
+++ b/www/lighttpd/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2007/02/19 21:31:37 joerg Exp $
+
+--- src/http_auth.h.orig 2006-10-04 13:29:17.000000000 +0000
++++ src/http_auth.h
+@@ -36,6 +36,7 @@ typedef struct {
+ buffer *auth_ldap_filter;
+ buffer *auth_ldap_cafile;
+ unsigned short auth_ldap_starttls;
++ unsigned short auth_ldap_allow_empty_pw;
+
+ unsigned short auth_debug;
+
diff --git a/www/lighttpd/patches/patch-ah b/www/lighttpd/patches/patch-ah
new file mode 100644
index 00000000000..8ce01831085
--- /dev/null
+++ b/www/lighttpd/patches/patch-ah
@@ -0,0 +1,43 @@
+$NetBSD: patch-ah,v 1.1 2007/02/19 21:31:37 joerg Exp $
+
+--- src/mod_auth.c.orig 2006-10-04 13:29:17.000000000 +0000
++++ src/mod_auth.c
+@@ -113,6 +113,7 @@ static int mod_auth_patch_connection(ser
+ PATCH(auth_ldap_filter);
+ PATCH(auth_ldap_cafile);
+ PATCH(auth_ldap_starttls);
++ PATCH(auth_ldap_allow_empty_pw);
+ #ifdef USE_LDAP
+ PATCH(ldap);
+ PATCH(ldap_filter_pre);
+@@ -160,6 +161,8 @@ static int mod_auth_patch_connection(ser
+ PATCH(auth_ldap_cafile);
+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
+ PATCH(auth_ldap_starttls);
++ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
++ PATCH(auth_ldap_allow_empty_pw);
+ }
+ }
+ }
+@@ -312,6 +315,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults)
+ { "auth.backend.ldap.starttls", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
+ { "auth.backend.ldap.bind-dn", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+ { "auth.backend.ldap.bind-pw", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
++ { "auth.backend.ldap.allow-empty-pw", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
+ { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+ { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
+ { "auth.debug", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 13 */
+@@ -361,9 +365,10 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults)
+ cv[8].destination = &(s->auth_ldap_starttls);
+ cv[9].destination = s->auth_ldap_binddn;
+ cv[10].destination = s->auth_ldap_bindpw;
+- cv[11].destination = s->auth_htdigest_userfile;
+- cv[12].destination = s->auth_htpasswd_userfile;
+- cv[13].destination = &(s->auth_debug);
++ cv[11].destination = &(s->auth_ldap_allow_empty_pw);
++ cv[12].destination = s->auth_htdigest_userfile;
++ cv[13].destination = s->auth_htpasswd_userfile;
++ cv[14].destination = &(s->auth_debug);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;