Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=d94abb89979b63ca4930bb61227564708bda5c3a
commit d94abb89979b63ca4930bb61227564708bda5c3a
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sat Mar 8 17:18:24 2008 +0100
lighttpd-1.4.18-2sayshell1-i686
- added Fix-372-and-1562.patch
- closes #2804
diff --git a/source/network-extra/lighttpd/Fix-372-and-1562.patch
b/source/network-extra/lighttpd/Fix-372-and-1562.patch
new file mode 100644
index 0000000..0571046
--- /dev/null
+++ b/source/network-extra/lighttpd/Fix-372-and-1562.patch
@@ -0,0 +1,40 @@
+From 6b77fd21b58b6bfc10bd01fd0ce4e5f4ced0d5d9 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Stefan=20B=C3=BChler?= <[EMAIL PROTECTED]>
+Date: Wed, 13 Feb 2008 00:07:22 +0100
+Subject: [PATCH] Fix #372 + #1562
+
+---
+ src/fdevent_solaris_devpoll.c | 2 +-
+ src/server.c | 3 ---
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c
+index f77daef..76414a4 100644
+--- a/src/fdevent_solaris_devpoll.c
++++ b/src/fdevent_solaris_devpoll.c
+@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, int
timeout_ms) {
+ 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/src/server.c b/src/server.c
+index 052130a..585a973 100644
+--- a/src/server.c
++++ b/src/server.c
+@@ -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 {
+--
+1.5.3.8
+
diff --git a/source/network-extra/lighttpd/FrugalBuild
b/source/network-extra/lighttpd/FrugalBuild
index 89f4352..af827d8 100644
--- a/source/network-extra/lighttpd/FrugalBuild
+++ b/source/network-extra/lighttpd/FrugalBuild
@@ -4,14 +4,15 @@
pkgname=lighttpd
pkgver=1.4.18
-pkgrel=1
+pkgrel=2sayshell1
pkgdesc="A webserver designed and optimized for high performance environments."
url="http://www.lighttpd.net/";
license="BSD"
up2date="lynx -dump http://www.lighttpd.net/download|grep -om1
'lighttpd-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
source=($url/download/$pkgname-$pkgver.tar.bz2 \
$pkgname.conf rc.$pkgname index.html \
- http://frugalware.org/images/frugalware.png)
+ http://frugalware.org/images/frugalware.png \
+ Fix-372-and-1562.patch)
groups=('network-extra')
archs=('i686' 'x86_64')
depends=('libmysqlclient' 'bzip2' 'lua' 'pcre' 'xfsprogs-attr' 'libldap'
'openssl')
@@ -21,7 +22,8 @@ sha1sums=('a53a8f8ae8d42d036f0b5129764b822e943cc778' \
'1a1d742bba61f24b42a4aea99623ceabbd345d3e' \
'f30cb68ad73467a43317afabe0f4a90472df222e' \
'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \
- '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e')
+ '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \
+ 'd93a7f8e53c4f47308bd5938ec391a7992bdc42d')
build()
{
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
