CVS commit: [pkgsrc-2016Q4] pkgsrc/www/lighttpd

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Feb 25 09:18:10 UTC 2017

Modified Files:
        pkgsrc/www/lighttpd [pkgsrc-2016Q4]: Makefile distinfo
Added Files:
        pkgsrc/www/lighttpd/patches [pkgsrc-2016Q4]:
            patch-src_fdevent__freebsd__kqueue.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.2.1 pkgsrc/www/lighttpd/Makefile
cvs rdiff -u -r1.35 -r1.35.2.1 pkgsrc/www/lighttpd/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lighttpd/Makefile
diff -u pkgsrc/www/lighttpd/Makefile:1.57 pkgsrc/www/lighttpd/Makefile:1.57.2.1
--- pkgsrc/www/lighttpd/Makefile:1.57   Mon Oct 17 22:00:22 2016
+++ pkgsrc/www/lighttpd/Makefile        Sat Feb 25 09:18:10 2017
@@ -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@localhost
 HOMEPAGE=      http://www.lighttpd.net/

Index: pkgsrc/www/lighttpd/distinfo
diff -u pkgsrc/www/lighttpd/distinfo:1.35 pkgsrc/www/lighttpd/distinfo:1.35.2.1
--- pkgsrc/www/lighttpd/distinfo:1.35   Mon Oct 17 22:00:22 2016
+++ pkgsrc/www/lighttpd/distinfo        Sat Feb 25 09:18:10 2017
@@ -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) = eb43a5
 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

Added files:

Index: pkgsrc/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c
diff -u /dev/null pkgsrc/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c:1.1.2.2
--- /dev/null   Sat Feb 25 09:18:10 2017
+++ pkgsrc/www/lighttpd/patches/patch-src_fdevent__freebsd__kqueue.c    Sat Feb 25 09:18:10 2017
@@ -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);