summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2017-02-25 09:18:10 +0000
committerbsiegert <bsiegert@pkgsrc.org>2017-02-25 09:18:10 +0000
commit80a65a323c1f5a0be2d5136e233fc5af896e0a5d (patch)
tree0dc6ea1c57e79901096eb57256d269d05ddc57fc
parent483bc3fa9e2ef9caba47943fcccf6492c5ab63e2 (diff)
downloadpkgsrc-80a65a323c1f5a0be2d5136e233fc5af896e0a5d.tar.gz
Pullup ticket #5213 - requested by he
www/lighttpd: bugfix Revisions pulled up: - www/lighttpd/Makefile 1.60 - www/lighttpd/distinfo 1.38 - www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c 1.1 --- Module Name: pkgsrc Committed By: he Date: Sat Feb 11 21:13:08 UTC 2017 Modified Files: pkgsrc/www/lighttpd: Makefile distinfo Added Files: pkgsrc/www/lighttpd/patches: patch-src_fdevent__freebsd__kqueue.c Log Message: Apply fix from https://redmine.lighttpd.net/issues/2788, per message to pkgsrc-users@ from Glenn Strauss. Bump PKGREVISION.
-rw-r--r--www/lighttpd/Makefile3
-rw-r--r--www/lighttpd/distinfo3
-rw-r--r--www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c24
3 files changed, 28 insertions, 2 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 415431a6540..197d730b8da 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.57 2016/10/17 22:00:22 nros Exp $
+# $NetBSD: Makefile,v 1.57.2.1 2017/02/25 09:18:10 bsiegert Exp $
DISTNAME= lighttpd-1.4.42
CATEGORIES= www
MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
+PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.lighttpd.net/
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 48fbca68215..d295f9df8cc 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2016/10/17 22:00:22 nros Exp $
+$NetBSD: distinfo,v 1.35.2.1 2017/02/25 09:18:10 bsiegert Exp $
SHA1 (lighttpd-1.4.42.tar.xz) = a434a92d5a2d6cb11922484cba59e684b2c94167
RMD160 (lighttpd-1.4.42.tar.xz) = 6d8a21f6936c856a1217c7594426a31b77d0eb15
@@ -6,3 +6,4 @@ SHA512 (lighttpd-1.4.42.tar.xz) = eb43a53f1fe7a115d0cf60ed8b79a22472a4fef9399374
Size (lighttpd-1.4.42.tar.xz) = 652140 bytes
SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70
SHA1 (patch-src_connections.c) = 5f108e714903b68f11fff19a59ca4cf523a406de
+SHA1 (patch-src_fdevent__freebsd__kqueue.c) = d244910413125ff0e697538b9d1b3c21a19f4cd2
diff --git a/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c b/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c
new file mode 100644
index 00000000000..b1fb9cb3020
--- /dev/null
+++ b/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_fdevent__freebsd__kqueue.c,v 1.1.2.2 2017/02/25 09:18:10 bsiegert Exp $
+
+Apply fix from https://redmine.lighttpd.net/issues/2788,
+ref. request from Glenn Strauss.
+
+--- src/fdevent_freebsd_kqueue.c.orig 2017-01-14 05:05:17.000000000 +0000
++++ src/fdevent_freebsd_kqueue.c
+@@ -75,14 +75,14 @@ static int fdevent_freebsd_kqueue_event_
+ if (events == oevents) return fd;
+
+ if (addevents & FDEVENT_IN) {
+- EV_SET(&kev[n], fd, EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, NULL);
++ EV_SET(&kev[n], fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
+ n++;
+ } else if (delevents & FDEVENT_IN) {
+ EV_SET(&kev[n], fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
+ n++;
+ }
+ if (addevents & FDEVENT_OUT) {
+- EV_SET(&kev[n], fd, EVFILT_WRITE, EV_ADD|EV_CLEAR, 0, 0, NULL);
++ EV_SET(&kev[n], fd, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+ n++;
+ } else if (delevents & FDEVENT_OUT) {
+ EV_SET(&kev[n], fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);