From owner-svn-ports-all@freebsd.org Thu Jan 4 02:22:32 2018 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 ADC0AEBF1FB; Thu, 4 Jan 2018 02:22:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 305A773F63; Thu, 4 Jan 2018 02:22:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w042MVjl004012; Thu, 4 Jan 2018 02:22:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w042MVVP004010; Thu, 4 Jan 2018 02:22:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801040222.w042MVVP004010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 4 Jan 2018 02:22:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458010 - in branches/2018Q1/lang/spidermonkey170: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/lang/spidermonkey170: . files X-SVN-Commit-Revision: 458010 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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, 04 Jan 2018 02:22:32 -0000 Author: jbeich Date: Thu Jan 4 02:22:30 2018 New Revision: 458010 URL: https://svnweb.freebsd.org/changeset/ports/458010 Log: MFH: r458008 lang/spidermonkey170: unbreak build with Clang 6 / GCC 7 js/src/shell/jsoptparse.cpp:246:22: error: comparison between pointer and integer ('char *' and 'int') if (value[0] == '\0') ~~~~~~~~ ^ ~~~~ Reported by: antoine (via bug 224669) Obtained from: upstream (SpiderMonkey 25.0) Approved by: ports-secteam blanket Added: branches/2018Q1/lang/spidermonkey170/files/patch-bug894240 - copied unchanged from r458008, head/lang/spidermonkey170/files/patch-bug894240 Modified: branches/2018Q1/lang/spidermonkey170/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/lang/spidermonkey170/Makefile ============================================================================== --- branches/2018Q1/lang/spidermonkey170/Makefile Thu Jan 4 02:20:59 2018 (r458009) +++ branches/2018Q1/lang/spidermonkey170/Makefile Thu Jan 4 02:22:30 2018 (r458010) @@ -3,7 +3,7 @@ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= mozjs${PORTVERSION} Copied: branches/2018Q1/lang/spidermonkey170/files/patch-bug894240 (from r458008, head/lang/spidermonkey170/files/patch-bug894240) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/lang/spidermonkey170/files/patch-bug894240 Thu Jan 4 02:22:30 2018 (r458010, copy of r458008, head/lang/spidermonkey170/files/patch-bug894240) @@ -0,0 +1,20 @@ +commit 19a4ba5c90a9 +Author: Mike Hommey +Date: Wed Jul 17 16:16:55 2013 +0900 + + Bug 894240 - Fix pointer dereference in js::cli::OptionParser::extractValue. r=Waldo +--- + js/src/shell/jsoptparse.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- shell/jsoptparse.cpp.orig 2013-02-11 22:33:23 UTC ++++ shell/jsoptparse.cpp +@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc, char **argv, s + char *eq = strchr(argv[*i], '='); + if (eq) { + *value = eq + 1; +- if (value[0] == '\0') ++ if (*value[0] == '\0') + return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); + return Okay; + }