From owner-svn-ports-all@freebsd.org Thu Nov 3 15:11:29 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78A1FC2D12D; Thu, 3 Nov 2016 15:11:29 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 334071D94; Thu, 3 Nov 2016 15:11:28 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from [127.0.0.1] (ip72-204-34-204.fv.ks.cox.net [72.204.34.204]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id 5A65A43CA2; Thu, 3 Nov 2016 10:10:49 -0500 (CDT) Subject: Re: svn commit: r425228 - in head/www/lighttpd: . files To: Guido Falsi , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201611031502.uA3F2ZSl020659@repo.freebsd.org> Reply-To: marino@freebsd.org From: John Marino Message-ID: <8a635b45-0617-fa6a-047d-06cdf375b6fe@marino.st> Date: Thu, 3 Nov 2016 10:11:24 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <201611031502.uA3F2ZSl020659@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 161102-1, 11/02/2016), Outbound message X-Antivirus-Status: Clean X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 15:11:29 -0000 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 > Patch by: Piotr Kubaj (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 > + #include > + > +-#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) ? Regards, John --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus