svn commit: r458010 - in branches/2018Q1/lang/spidermonkey170: . files

[Jan Beich]

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 <mh+mozilla at glandium.org>
+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;
+     }