Received: by mail.netbsd.org (Postfix, from userid 605) id 90DED84E60; Sun, 10 Oct 2021 21:09:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C05CC84CFD for ; Sun, 10 Oct 2021 21:09:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id OBJ39hbVhCHu for ; Sun, 10 Oct 2021 21:09:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 268A084CED for ; Sun, 10 Oct 2021 21:09:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2025AFA97; Sun, 10 Oct 2021 21:09:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163390019658850" MIME-Version: 1.0 Date: Sun, 10 Oct 2021 21:09:56 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/www/lighttpd To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20211010210956.2025AFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163390019658850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Oct 10 21:09:56 UTC 2021 Modified Files: pkgsrc/www/lighttpd: distinfo Added Files: pkgsrc/www/lighttpd/patches: patch-src_ck.h patch-src_first.h Log Message: Fix macOS build ("error: unknown type name 'errno_t'") with upstream patch 2a3cca7. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 pkgsrc/www/lighttpd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/www/lighttpd/patches/patch-src_ck.h \ pkgsrc/www/lighttpd/patches/patch-src_first.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163390019658850 Content-Disposition: inline Content-Length: 2566 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/lighttpd/distinfo diff -u pkgsrc/www/lighttpd/distinfo:1.63 pkgsrc/www/lighttpd/distinfo:1.64 --- pkgsrc/www/lighttpd/distinfo:1.63 Thu Oct 7 15:07:20 2021 +++ pkgsrc/www/lighttpd/distinfo Sun Oct 10 21:09:55 2021 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.63 2021/10/07 15:07:20 nia Exp $ +$NetBSD: distinfo,v 1.64 2021/10/10 21:09:55 schmonz Exp $ RMD160 (lighttpd-1.4.60.tar.xz) = 1b5135a576342fae8ba1fe9e95e539beebd41249 SHA512 (lighttpd-1.4.60.tar.xz) = e3a4b0f142f2a02212a8ede07e2f683605f8009d933281caee89b8b82482bdc473956bd9d9ff0392ea6cecf3fe3b05e6e4cee7052a875a1b00dfab7667402cd8 Size (lighttpd-1.4.60.tar.xz) = 1008548 bytes SHA1 (patch-doc_config_lighttpd.conf) = 32a4b6bd32f88d05dd75f65de6ec57b203c37d8b SHA1 (patch-doc_lighttpd.8) = e08ac362784aebaca566d0f65380b70a829d6b4e +SHA1 (patch-src_ck.h) = 45cdc4501f7adf9fcc86c887bdd34acc0d29d674 +SHA1 (patch-src_first.h) = 14ba794d6e2174f3e78b45afce92b4de3c1710f3 Added files: Index: pkgsrc/www/lighttpd/patches/patch-src_ck.h diff -u /dev/null pkgsrc/www/lighttpd/patches/patch-src_ck.h:1.1 --- /dev/null Sun Oct 10 21:09:56 2021 +++ pkgsrc/www/lighttpd/patches/patch-src_ck.h Sun Oct 10 21:09:55 2021 @@ -0,0 +1,19 @@ +$NetBSD: patch-src_ck.h,v 1.1 2021/10/10 21:09:55 schmonz Exp $ + +Fix macOS build ("error: unknown type name 'errno_t'") with upstream +patch 2a3cca7. + +--- src/ck.h.orig 2021-10-04 01:38:52.000000000 +0000 ++++ src/ck.h +@@ -12,6 +12,11 @@ + #ifndef __STDC_WANT_LIB_EXT1__ /*(enable C11 Annex K ext1 *_s functions)*/ + #define __STDC_WANT_LIB_EXT1__ 1 + #endif ++#if defined(__APPLE__) && defined(__MACH__) ++#ifndef _DARWIN_C_SOURCE ++#define _DARWIN_C_SOURCE ++#endif ++#endif + #include "first.h" + #ifdef __FreeBSD__ + #ifndef _RSIZE_T_DEFINED /* expecting __EXT1_VISIBLE 1 and _RSIZE_T_DEFINED */ Index: pkgsrc/www/lighttpd/patches/patch-src_first.h diff -u /dev/null pkgsrc/www/lighttpd/patches/patch-src_first.h:1.1 --- /dev/null Sun Oct 10 21:09:56 2021 +++ pkgsrc/www/lighttpd/patches/patch-src_first.h Sun Oct 10 21:09:55 2021 @@ -0,0 +1,20 @@ +$NetBSD: patch-src_first.h,v 1.1 2021/10/10 21:09:55 schmonz Exp $ + +Fix macOS build ("error: unknown type name 'errno_t'") with upstream +patch 2a3cca7. + +--- src/first.h.orig 2021-10-04 01:38:52.000000000 +0000 ++++ src/first.h +@@ -13,6 +13,12 @@ + #define _DEFAULT_SOURCE + #endif + ++#if defined(__APPLE__) && defined(__MACH__) ++#ifndef _DARWIN_C_SOURCE ++#define _DARWIN_C_SOURCE ++#endif ++#endif ++ + #ifndef __STDC_WANT_LIB_EXT1__ + #define __STDC_WANT_LIB_EXT1__ 1 + #endif --_----------=_163390019658850--