svn commit: r425228 - in head/www/lighttpd: . files

[Guido Falsi]

On 11/03/16 16:11, John Marino wrote:
> On 11/3/2016 10:02, Guido Falsi wrote:
>> Author: madpilot
>> Date: Thu Nov  3 15:02:35 2016
>> New Revision: 425228
>> URL: https://svnweb.freebsd.org/changeset/ports/425228
>>
>> Log:
>>   Fix again usage of pipe2(2) in 9.3
>>
>>   PR:        213848
>>   Submitted by:    cedric <cedric at precidata.com>
>>   Patch by:    Piotr Kubaj <pkubaj at anongoth.pl> (maintainer)
>>
>> Added:
>>   head/www/lighttpd/files/patch-src_mod__cgi.c   (contents, props
>> changed)
>> Modified:
>>   head/www/lighttpd/Makefile
>>
>> Modified: head/www/lighttpd/Makefile
>> ==============================================================================
>>
>> --- head/www/lighttpd/Makefile    Thu Nov  3 15:02:29 2016    (r425227)
>> +++ head/www/lighttpd/Makefile    Thu Nov  3 15:02:35 2016    (r425228)
>> @@ -3,6 +3,7 @@
>>
>>  PORTNAME?=    lighttpd
>>  PORTVERSION=    1.4.43
>> +PORTREVISION=    1
>>  CATEGORIES?=    www
>>  MASTER_SITES?=    http://download.lighttpd.net/lighttpd/releases-1.4.x/
>>
>>
>> Added: head/www/lighttpd/files/patch-src_mod__cgi.c
>> ==============================================================================
>>
>> --- /dev/null    00:00:00 1970    (empty, because file is newly added)
>> +++ head/www/lighttpd/files/patch-src_mod__cgi.c    Thu Nov  3
>> 15:02:35 2016    (r425228)
>> @@ -0,0 +1,11 @@
>> +--- src/mod_cgi.c.orig 2016-11-02 13:53:21 UTC
>> ++++ src/mod_cgi.c
>> +@@ -36,7 +36,7 @@
>> + #include <stdio.h>
>> + #include <fcntl.h>
>> +
>> +-#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) ||
>> defined(F_DUPFD_CLOEXEC))
>> ++#if defined(O_CLOEXEC) && __FreeBSD_version >= 1000032
>> + #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC)
>> + #elif defined FD_CLOEXEC
>> + #define pipe_cloexec(pipefd) \
>>
> 
> Guido,
> Will this new patch break the build on DragonFly since __FreeBSD_version
> isn't defined there?  Plus DF would lose the pipe2 functionality?
> 
> maybe it would be better as:
> +#if defined(O_CLOEXEC) && (!defined(__FreeBSD__) || __FreeBSD_version
>>= 1000032)
> 
> ?

I must admit I did not think about this. I'm going to commit this change
in a short while.

-- 
Guido Falsi <madpilot at FreeBSD.org>