diff options
author | joerg <joerg> | 2008-03-15 10:53:50 +0000 |
---|---|---|
committer | joerg <joerg> | 2008-03-15 10:53:50 +0000 |
commit | 800c2ece947f9ee99dcbb9b2d06b622b0122141f (patch) | |
tree | 6229cf4fcdcad314fe13c93e8d7205d681a064f3 | |
parent | 46487c68fd66f235b266cc32ac7b3c868afaf50a (diff) | |
download | pkgsrc-800c2ece947f9ee99dcbb9b2d06b622b0122141f.tar.gz |
lighttpd-1.4.19:
Fix a DOS under high load and some information leaks.
-rw-r--r-- | www/lighttpd/Makefile | 5 | ||||
-rw-r--r-- | www/lighttpd/distinfo | 12 | ||||
-rw-r--r-- | www/lighttpd/patches/patch-aa | 15 | ||||
-rw-r--r-- | www/lighttpd/patches/patch-ac | 21 | ||||
-rw-r--r-- | www/lighttpd/patches/patch-ad | 12 | ||||
-rw-r--r-- | www/lighttpd/patches/patch-ae | 13 |
6 files changed, 6 insertions, 72 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index f52130d3a8f..d03454b28f7 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2008/03/04 11:17:57 kefren Exp $ +# $NetBSD: Makefile,v 1.20 2008/03/15 10:53:50 joerg Exp $ -DISTNAME= lighttpd-1.4.18 -PKGREVISION= 2 +DISTNAME= lighttpd-1.4.19 CATEGORIES= www MASTER_SITES= http://www.lighttpd.net/download/ diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index e082ba2cbc0..75fdcc9cb17 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.12 2008/03/04 11:17:57 kefren Exp $ +$NetBSD: distinfo,v 1.13 2008/03/15 10:53:50 joerg Exp $ -SHA1 (lighttpd-1.4.18.tar.gz) = 30eb24cdfcfeadf10fa16f187330bdc5deb25ed2 -RMD160 (lighttpd-1.4.18.tar.gz) = dfca15e4b02a405cc89dcdfb9a0f8137971cfb24 -Size (lighttpd-1.4.18.tar.gz) = 803361 bytes -SHA1 (patch-aa) = d48beb6e526f31f9ea19657e6010c5165026b475 +SHA1 (lighttpd-1.4.19.tar.gz) = 79e2d61dd9017c3c50c0fe98b2289cae5c1255ee +RMD160 (lighttpd-1.4.19.tar.gz) = 7dbe2a22051e18f4037b48ee4811e2c9738d20cf +Size (lighttpd-1.4.19.tar.gz) = 815568 bytes SHA1 (patch-ab) = b02003db1b2ac978846eb0f7be178b91f59fc176 -SHA1 (patch-ac) = b2bc7bcbd151bf64ce085dad359077c5ffa2da1f -SHA1 (patch-ad) = b862738a23fcc02a67bcef7339acd622f5c3a3e3 -SHA1 (patch-ae) = 95705fd9148d2538083442d1ec190299fddc6971 diff --git a/www/lighttpd/patches/patch-aa b/www/lighttpd/patches/patch-aa deleted file mode 100644 index d65abea1613..00000000000 --- a/www/lighttpd/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2007/09/10 13:59:50 jlam Exp $ - ---- configure.orig Sun Sep 9 19:55:31 2007 -+++ configure -@@ -28161,10 +28161,6 @@ fi - - - --if test "${GCC}" = "yes"; then -- CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu99" --fi -- - LIGHTTPD_VERSION_ID=`echo $PACKAGE_VERSION | $AWK -F '.' '{print "(" $1 " << 16 | " $2 " << 8 | " $3 ")"}'` - - cat >>confdefs.h <<_ACEOF diff --git a/www/lighttpd/patches/patch-ac b/www/lighttpd/patches/patch-ac deleted file mode 100644 index 61154bd437b..00000000000 --- a/www/lighttpd/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/09/10 13:59:51 jlam Exp $ - ---- src/etag.c.orig Mon Aug 27 21:54:45 2007 -+++ src/etag.c -@@ -1,5 +1,15 @@ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <string.h> --#include <stdint.h> -+ -+#ifdef HAVE_STDINT_H -+# include <stdint.h> -+#endif -+#ifdef HAVE_INTTYPES_H -+# include <inttypes.h> -+#endif - - #include "buffer.h" - #include "etag.h" diff --git a/www/lighttpd/patches/patch-ad b/www/lighttpd/patches/patch-ad deleted file mode 100644 index 18201a381f0..00000000000 --- a/www/lighttpd/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2008/03/04 11:17:57 kefren Exp $ ---- src/fdevent_solaris_devpoll.c.orig 2008-03-04 13:12:51.000000000 +0200 -+++ src/fdevent_solaris_devpoll.c 2008-03-04 13:13:02.000000000 +0200 -@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll( - int ret; - - dopoll.dp_timeout = timeout_ms; -- dopoll.dp_nfds = ev->maxfds; -+ dopoll.dp_nfds = ev->maxfds - 1; - dopoll.dp_fds = ev->devpollfds; - - ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); diff --git a/www/lighttpd/patches/patch-ae b/www/lighttpd/patches/patch-ae deleted file mode 100644 index 77f429e8c4f..00000000000 --- a/www/lighttpd/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2008/03/04 11:17:57 kefren Exp $ ---- src/server.c.orig 2008-03-04 13:13:12.000000000 +0200 -+++ src/server.c 2008-03-04 13:13:56.000000000 +0200 -@@ -697,9 +697,6 @@ int main (int argc, char **argv) { - } - } - -- /* #372: solaris need some fds extra for devpoll */ -- if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10; -- - if (srv->event_handler == FDEVENT_HANDLER_SELECT) { - srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200; - } else { |