spidermonkey 60.9.0

system/base/spidermonkey/actions.py

@@ -11,29 +11,55 @@ from pisi.actionsapi import shelltools
 #WorkDir = "mozjs%s/js/src" % get.srcVERSION()
 
 shelltools.export("SHELL","/bin/sh")
+WorkDir = "firefox-%s" %get.srcVERSION()
 
 def setup():
-   shelltools.cd("js/src")
+   #shelltools.cd("js/src")
    #shelltools.system("sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl ")
+   shelltools.system("mkdir -p build-js")
+   shelltools.cd("build-js")
    
-   
+   shelltools.system("../js/src/configure \
-   autotools.configure("--prefix=/usr       \
+	                  --prefix=/usr       \
-                        --enable-readline   \
+					  --libdir=/usr/lib   \
-                        --enable-threadsafe \
+					  --enable-readline   \
-                        --with-system-nspr")
+					  --enable-posix-nspr-emulation \
+					  --with-intl-api \
+					  --disable-debug     \
+                      --disable-debug-symbols \
+                      --disable-jemalloc \
+                      --disable-strip  \
+                      --enable-hardening \
+                      --enable-linker=gold \
+                      --enable-optimize \
+                      --enable-readline \
+                      --enable-release \
+                      --enable-shared-js \
+                      --enable-tests \
+                      --with-intl-api \
+                      --with-system-zlib \
+                      --without-system-icu")
 
 def build():
-    shelltools.cd("js/src")
+    shelltools.cd("build-js")
     autotools.make()
+    
+def check():
+    shelltools.cd("build-js")
+	
+    autotools.make("-C js/src check-jstests check-jit-test")
+	
 
 def install():
-    shelltools.cd("js/src")
+    shelltools.cd("build-js")
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    pisitools.remove("/usr/lib/*.ajs")
    
     #for polkit
     #pisitools.rename("/usr/lib/pkgconfig/mozjs-..pc", "mozjs-17.0.pc")
     #pisitools.remove("usr/lib/libmozjs-..a")
     
+    shelltools.cd("..")
     pisitools.dodoc("README*")
     
     # add link for polkit

system/base/spidermonkey/files/bug1415202.patch

@@ -0,0 +1,127 @@
+# HG changeset patch
+# User André Bargull <andre.bargull@gmail.com>
+# Date 1510140221 28800
+#      Wed Nov 08 03:23:41 2017 -0800
+# Node ID 8bf5e7460a7c5ba3430b501d1659c469a862a929
+# Parent  60fd4a5b01ec70ded9ddfd560fd5be191b1c74b9
+Bug 1415202: Always use the equivalent year to determine the time zone offset and name. r=Waldo
+
+diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
+--- a/js/src/jsdate.cpp
++++ b/js/src/jsdate.cpp
+@@ -2348,22 +2348,26 @@ static PRMJTime ToPRMJTime(double localT
+   prtm.tm_isdst = (DaylightSavingTA(utcTime) != 0);
+ 
+   return prtm;
+ }
+ 
+ static size_t FormatTime(char* buf, int buflen, const char* fmt, double utcTime,
+                          double localTime) {
+   PRMJTime prtm = ToPRMJTime(localTime, utcTime);
+-  int eqivalentYear = IsRepresentableAsTime32(utcTime)
++
++  // If an equivalent year was used to compute the date/time components, use
++  // the same equivalent year to determine the time zone name and offset in
++  // PRMJ_FormatTime(...).
++  int timeZoneYear = IsRepresentableAsTime32(utcTime)
+                           ? prtm.tm_year
+                           : EquivalentYearForDST(prtm.tm_year);
+   int offsetInSeconds = (int)floor((localTime - utcTime) / msPerSecond);
+ 
+-  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear,
++  return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear,
+                          offsetInSeconds);
+ }
+ 
+ enum class FormatSpec { DateTime, Date, Time };
+ 
+ static bool FormatDate(JSContext* cx, double utcTime, FormatSpec format,
+                        MutableHandleValue rval) {
+   JSString* str;
+diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp
+--- a/js/src/vm/Time.cpp
++++ b/js/src/vm/Time.cpp
+@@ -242,17 +242,17 @@ static void PRMJ_InvalidParameterHandler
+                                          const wchar_t* file, unsigned int line,
+                                          uintptr_t pReserved) {
+   /* empty */
+ }
+ #endif
+ 
+ /* Format a time value into a buffer. Same semantics as strftime() */
+ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+-                       const PRMJTime* prtm, int equivalentYear,
++                       const PRMJTime* prtm, int timeZoneYear,
+                        int offsetInSeconds) {
+   size_t result = 0;
+ #if defined(XP_UNIX) || defined(XP_WIN)
+   struct tm a;
+ #ifdef XP_WIN
+   _invalid_parameter_handler oldHandler;
+ #ifndef __MINGW32__
+   int oldReportMode;
+@@ -275,39 +275,33 @@ size_t PRMJ_FormatTime(char* buf, int bu
+    */
+ #if defined(HAVE_LOCALTIME_R) && defined(HAVE_TM_ZONE_TM_GMTOFF)
+   char emptyTimeZoneId[] = "";
+   {
+     /*
+      * Fill out |td| to the time represented by |prtm|, leaving the
+      * timezone fields zeroed out. localtime_r will then fill in the
+      * timezone fields for that local time according to the system's
+-     * timezone parameters.
++     * timezone parameters. Use |timeZoneYear| for the year to ensure the
++     * time zone name matches the time zone offset used by the caller.
+      */
+     struct tm td;
+     memset(&td, 0, sizeof(td));
+     td.tm_sec = prtm->tm_sec;
+     td.tm_min = prtm->tm_min;
+     td.tm_hour = prtm->tm_hour;
+     td.tm_mday = prtm->tm_mday;
+     td.tm_mon = prtm->tm_mon;
+     td.tm_wday = prtm->tm_wday;
+-    td.tm_year = prtm->tm_year - 1900;
++    td.tm_year = timeZoneYear - 1900;
+     td.tm_yday = prtm->tm_yday;
+     td.tm_isdst = prtm->tm_isdst;
+ 
+     time_t t = mktime(&td);
+ 
+-    // If |prtm| cannot be represented in |time_t| the year is probably
+-    // out of range, try again with the DST equivalent year.
+-    if (t == static_cast<time_t>(-1)) {
+-      td.tm_year = equivalentYear - 1900;
+-      t = mktime(&td);
+-    }
+-
+     // If either mktime or localtime_r failed, fill in the fallback time
+     // zone offset |offsetInSeconds| and set the time zone identifier to
+     // the empty string.
+     if (t != static_cast<time_t>(-1) && localtime_r(&t, &td)) {
+       a.tm_gmtoff = td.tm_gmtoff;
+       a.tm_zone = td.tm_zone;
+     } else {
+       a.tm_gmtoff = offsetInSeconds;
+diff --git a/js/src/vm/Time.h b/js/src/vm/Time.h
+--- a/js/src/vm/Time.h
++++ b/js/src/vm/Time.h
+@@ -44,17 +44,17 @@ inline void PRMJ_NowInit() {}
+ #ifdef XP_WIN
+ extern void PRMJ_NowShutdown();
+ #else
+ inline void PRMJ_NowShutdown() {}
+ #endif
+ 
+ /* Format a time value into a buffer. Same semantics as strftime() */
+ extern size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+-                              const PRMJTime* tm, int equivalentYear,
++                              const PRMJTime* tm, int timeZoneYear,
+                               int offsetInSeconds);
+ 
+ /**
+  * Requesting the number of cycles from the CPU.
+  *
+  * `rdtsc`, or Read TimeStamp Cycle, is an instruction provided by
+  * x86-compatible CPUs that lets processes request the number of
+  * cycles spent by the CPU executing instructions since the CPU was

system/base/spidermonkey/files/mozjs60-fix-soname.patch

@@ -0,0 +1,25 @@
+diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
+index ee19104e0ef5..a0f06fd35a18 100644
+--- i/js/src/build/Makefile.in
++++ w/js/src/build/Makefile.in
+@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
++	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
++	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ ifeq ($(OS_ARCH),Darwin)
+ 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ endif
+diff --git i/js/src/build/moz.build w/js/src/build/moz.build
+index a7f5fa4ce8eb..726687c13fb0 100644
+--- i/js/src/build/moz.build
++++ w/js/src/build/moz.build
+@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
+ if CONFIG['JS_SHARED_LIBRARY']:
+     GeckoSharedLibrary('js', linkage=None)
+     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
++    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
+ else:
+     Library('js')
+ 

system/base/spidermonkey/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>Stand-alone JavaScript C Library</Summary>
         <Description>Spidermonkey is Mozilla's C implementation of JavaScript.</Description>
-        <Archive type="targz" sha1sum="1ec6399a90c7060908bfc3b96d1f1068ab2bfc78">http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-52.2.1gnome1.tar.gz</Archive>
+        <Archive type="tarxz" sha1sum="616f8afdee741f0bea607a671b8515ef13c68b4a">https://ftp.mozilla.org/pub/firefox/releases/60.9.0esr/source/firefox-60.9.0esr.source.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <Dependency>nspr-devel</Dependency>
@@ -21,6 +21,8 @@
             <Dependency>autoconf213</Dependency>
         </BuildDependencies>
         <Patches>
+			<Patch level="1">bug1415202.patch</Patch>
+			<Patch level="1">mozjs60-fix-soname.patch</Patch>
         </Patches>
     </Source>
 
@@ -55,6 +57,13 @@
     </Package>
 
     <History>
+		<Update release="7">
+            <Date>2019-10-03</Date>
+            <Version>60.9.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2018-07-23</Date>
             <Version>52.2.1</Version>