Received: by mail.netbsd.org (Postfix, from userid 605) id AAC4F84D64; Mon, 16 Dec 2019 18:01:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2F2BA84D62 for ; Mon, 16 Dec 2019 18:01:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VW-JwLkZxB7x for ; Mon, 16 Dec 2019 18:01:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 88E5384C8B for ; Mon, 16 Dec 2019 18:01:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 80719FA97; Mon, 16 Dec 2019 18:01:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1576519270270100" MIME-Version: 1.0 Date: Mon, 16 Dec 2019 18:01:10 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/www/netsurf To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20191216180110.80719FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1576519270270100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Mon Dec 16 18:01:10 UTC 2019 Modified Files: pkgsrc/www/netsurf: distinfo pkgsrc/www/netsurf/patches: patch-netsurf_utils_config.h Log Message: Update patch to more portable a patch caused crashes, use suggestions by upstream that makes it more portable To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/netsurf/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1576519270270100 Content-Disposition: inline Content-Length: 3145 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/netsurf/distinfo diff -u pkgsrc/www/netsurf/distinfo:1.17 pkgsrc/www/netsurf/distinfo:1.18 --- pkgsrc/www/netsurf/distinfo:1.17 Mon Nov 11 12:58:53 2019 +++ pkgsrc/www/netsurf/distinfo Mon Dec 16 18:01:10 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2019/11/11 12:58:53 nros Exp $ +$NetBSD: distinfo,v 1.18 2019/12/16 18:01:10 nros Exp $ SHA1 (netsurf-all-3.9.tar.gz) = 392aa7cf94b303228a00e6887c74e5763a81f3a4 RMD160 (netsurf-all-3.9.tar.gz) = 3f7aff04cfd253f2b18590830b0aa2fca0123b3c @@ -6,5 +6,5 @@ SHA512 (netsurf-all-3.9.tar.gz) = 3223b0 Size (netsurf-all-3.9.tar.gz) = 8416458 bytes SHA1 (patch-netsurf_content_handlers_html_html__interaction.c) = 5dbfbaf26ba8ee32077af5aae0db2ee54cf59eb8 SHA1 (patch-netsurf_frontends_gtk_download.c) = 8a449c0b46859be104f2eb87860960f84ebd38ad -SHA1 (patch-netsurf_utils_config.h) = 761700b4fd92ea68d8644e3ec2ac270e0e0dd3fc +SHA1 (patch-netsurf_utils_config.h) = 0617eb62219eb9d9a570a9857e910c584b68a18b SHA1 (patch-nsgenbind_src_Makefile) = 9024fe193c532fefec83b86a8cf85f1bcffb614e Index: pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h diff -u pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.3 pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.4 --- pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.3 Mon Nov 11 12:31:16 2019 +++ pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h Mon Dec 16 18:01:10 2019 @@ -1,22 +1,26 @@ -$NetBSD: patch-netsurf_utils_config.h,v 1.3 2019/11/11 12:31:16 nros Exp $ +$NetBSD: patch-netsurf_utils_config.h,v 1.4 2019/12/16 18:01:10 nros Exp $ NetBSD has strcasestr(3) NetBSD 8 and later has strchrnul(3). +Fixed upstream: https://bugs.netsurf-browser.org/mantis/view.php?id=2718 --- netsurf/utils/config.h.orig 2019-07-17 15:37:00.000000000 +0000 +++ netsurf/utils/config.h -@@ -21,6 +21,10 @@ +@@ -21,6 +21,13 @@ #include +#if defined(__NetBSD__) +#include ++#if (defined(__NetBSD_Version__) && __NetBSD_Prereq__(8,0,0)) ++#define NetBSD_v8 ++#endif +#endif + /* Try to detect which features the target OS supports */ #if (defined(_GNU_SOURCE) && !defined(__APPLE__) || defined(__amigaos4__) || defined(__HAIKU__) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L)) && !defined(__riscos__)) -@@ -30,7 +34,7 @@ +@@ -30,7 +37,7 @@ char *strndup(const char *s, size_t n); #endif @@ -25,12 +29,12 @@ NetBSD 8 and later has strchrnul(3). #define HAVE_STRCASESTR #else #undef HAVE_STRCASESTR -@@ -51,7 +55,7 @@ char *strcasestr(const char *haystack, c +@@ -51,7 +58,7 @@ char *strcasestr(const char *haystack, c /* For some reason, UnixLib defines this unconditionally. Assume we're using * UnixLib if building for RISC OS. */ -#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__)) -+#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__) || (defined(__NetBSD_Version__) && __NetBSD_Prereq__(8,0,0))) ++#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__) || defined(NetBSD_v8)) #define HAVE_STRCHRNUL #else #undef HAVE_STRCHRNUL --_----------=_1576519270270100--