diff -crB ./src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp ../isis_autotools_mod/src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp
*** ./src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp	2012-06-14 15:31:09.000000000 -0700
--- ../isis_autotools_mod/src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp	2012-06-14 15:54:15.000000000 -0700
***************
*** 29,35 ****
  #include <boost/numeric/ublas/matrix_sparse.hpp>
  #include <boost/numeric/ublas/matrix_proxy.hpp>
  #include <boost/numeric/ublas/io.hpp>
!

  using namespace boost::numeric::ublas;

--- 29,35 ----
  #include <boost/numeric/ublas/matrix_sparse.hpp>
  #include <boost/numeric/ublas/matrix_proxy.hpp>
  #include <boost/numeric/ublas/io.hpp>
! #include <boost/numeric/ublas/matrix.hpp>

  using namespace boost::numeric::ublas;

diff -crB ./src/base/objs/SparseBlockMatrix/SparseBlockMatrix.cpp ../isis/src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp
*** .src/base/objs/SparseBlockMatrix/SparseBlockMatrix.cpp      2012-06-14 15:31:09.000000000 -0700
--- ../isis/src/Core/SparseBlockMatrix/SparseBlockMatrix.cpp    2012-06-14 15:54:15.000000000 -0700
***************
*** 5,5 ****
--- 5,6 ----
  #include <boost/numeric/ublas/io.hpp>
+ #include <boost/numeric/ublas/matrix.hpp>

Update patch to work with Isis version 3.4.6


Allow /sys to be RW for a priveleged container.

In order to make this work properly the systemd's device mechanism
needs to be turned off as if /sys was RO.

---
 src/core/device.c |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

--- a/src/core/device.c
+++ b/src/core/device.c
@@ -768,15 +768,37 @@ static int device_dispatch_io(sd_event_s
         return 0;
 }

+#define CONTAINER_CHECK_PATH "/etc/system-id"
+
 static bool device_supported(void) {
         static int read_only = -1;

         /* If /sys is read-only we don't support device units, and any
          * attempts to start one should fail immediately. */

-        if (read_only < 0)
+        if (read_only < 0) {
                 read_only = path_is_read_only_fs("/sys");

+                /* Secondardy check against container */
+                if (!read_only) {
+                        size_t len = 0;
+                        ssize_t read;
+                        char *buf = NULL;
+                        FILE *F = fopen("/proc/mounts", "r");
+                        if (F) {
+                                while ((read = getline(&buf, &len, F)) != -1) {
+                                        if (strstr(buf,CONTAINER_CHECK_PATH)) {
+                                                read_only = 1;
+                                                break;
+                                        }
+                                }
+                                if (buf)
+                                        free(buf);
+                                fclose(F);
+                        }
+                }
+       }
+
         return read_only <= 0;
 }

Allow /sys to be RW for a priveleged container.

In order to make this work properly the systemd's device mechanism
needs to be turned off as if /sys was RO.

---
 src/core/device.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- a/src/core/device.c
+++ b/src/core/device.c
@@ -774,9 +774,19 @@ static bool device_supported(void) {
         /* If /sys is read-only we don't support device units, and any
          * attempts to start one should fail immediately. */

-        if (read_only < 0)
+        if (read_only < 0) {
                 read_only = path_is_read_only_fs("/sys");

+                /* Secondardy check against container */
+                if (!read_only) {
+                        const char *c;
+
+                        c = getenv("container");
+                        if (!isempty(c))
+                                read_only = 1;
+                }
+       }
+
         return read_only <= 0;
 }

systemd: Use container variable for /sys RW check

The container variable is universal for containers and should be used
instead of checking for a bind mount for the case where /sys should be
allowed to be RW.

Signed-off-by: Jason Wessel <3f19c87103ac4cd0301ffd05a2421b687c7b3c77@windriver.com>
Signed-off-by: Bruce Ashfield <284cc737d174a260eec2a2a6324a304f84b1ae0f@windriver.com>


diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go
index 2a418b2..fa9fe5b 100644
--- a/daemon/apparmor_default.go
+++ b/daemon/apparmor_default.go
@@ -4,6 +4,7 @@ package daemon

 import (
 	"fmt"
+	"os"

 	aaprofile "github.com/docker/docker/profiles/apparmor"
 	"github.com/opencontainers/runc/libcontainer/apparmor"
@@ -22,7 +23,7 @@ func ensureDefaultAppArmorProfile() error {
 		}

 		// Nothing to do.
-		if loaded {
+		if loaded && os.Getenv("DOCKER_FORCE_LOAD_AA_PROFILE") != "1" {
 			return nil
 		}

diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go
index 2a418b2..fa9fe5b 100644
--- a/daemon/apparmor_default.go
+++ b/daemon/apparmor_default.go
@@ -4,6 +4,7 @@ package daemon

 import (
 	"fmt"
+	"os"

 	aaprofile "github.com/docker/docker/profiles/apparmor"
 	"github.com/opencontainers/runc/libcontainer/apparmor"
@@ -22,7 +23,7 @@ func ensureDefaultAppArmorProfile() error {
 		}

 		// Nothing to do.
-		if loaded {
+		if loaded && os.Getenv("DOCKER_FORCE_LOAD_AA_PROFILE") != "" {
 			return nil
 		}

Make any non-empty string works.

Make any non-empty string works.


diff --git a/lib/AST/TypePrinter.cpp b/lib/AST/TypePrinter.cpp
index c28ada7dcb..79e7f4b8ea 100644
--- a/lib/AST/TypePrinter.cpp
+++ b/lib/AST/TypePrinter.cpp
@@ -1661,16 +1661,16 @@ void Qualifiers::print(raw_ostream &OS, const PrintingPolicy& Policy,
         break;
       case LangAS::opencl_constant:
       case LangAS::cuda_constant:
-        OS << "__constant";
+        OS << "__constant__";
         break;
       case LangAS::opencl_generic:
         OS << "__generic";
         break;
       case LangAS::cuda_device:
-        OS << "__device";
+        OS << "__device__";
         break;
       case LangAS::cuda_shared:
-        OS << "__shared";
+        OS << "__shared__";
         break;
       default:
         OS << "__attribute__((address_space(";

diff --git a/lib/AST/TypePrinter.cpp b/lib/AST/TypePrinter.cpp
index c28ada7dcb..bb44c7ca4a 100644
--- a/lib/AST/TypePrinter.cpp
+++ b/lib/AST/TypePrinter.cpp
@@ -1660,17 +1660,19 @@ void Qualifiers::print(raw_ostream &OS, const PrintingPolicy& Policy,
       case LangAS::opencl_private:
         break;
       case LangAS::opencl_constant:
-      case LangAS::cuda_constant:
         OS << "__constant";
         break;
       case LangAS::opencl_generic:
         OS << "__generic";
         break;
       case LangAS::cuda_device:
-        OS << "__device";
+        OS << "__device__";
+        break;
+      case LangAS::cuda_constant:
+        OS << "__constant__";
         break;
       case LangAS::cuda_shared:
-        OS << "__shared";
+        OS << "__shared__";
         break;
       default:
         OS << "__attribute__((address_space(";

Fix patch: use proper CUDA / OpenCL specifiers

See https://reviews.llvm.org/D54258


Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp	(revision 106313)
+++ page/FrameView.cpp	(working copy)
@@ -157,10 +157,12 @@
             m_page = page;
             m_page->addScrollableArea(this);

+#if 0
             if (m_frame == m_page->mainFrame()) {
                 ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
                 ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
             }
+#endif
         }
     }
 }
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
@@ -356,9 +356,13 @@

 bool isScrollbarOverlayAPIAvailable()
 {
+#if 0
     static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
                                [lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
     return apiAvailable;
+#else
+    return false;
+#endif
 }

 #endif // USE(WK_SCROLLBAR_PAINTER)

Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp	(revision 112327)
+++ page/FrameView.cpp	(working copy)
@@ -159,10 +159,12 @@
     if (!page)
         return;

+#if 0
     if (m_frame == page->mainFrame()) {
         ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
         ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
     }
+#endif
 }

 PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
@@ -356,9 +356,13 @@

 bool isScrollbarOverlayAPIAvailable()
 {
+#if 0
     static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
                                [lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
     return apiAvailable;
+#else
+    return false;
+#endif
 }

 #endif // USE(WK_SCROLLBAR_PAINTER)

Update to Chromium revision 129376.

Update to Chromium revision 129376.

git-svn-id: 07c9500005b9a5ecd02aa6a59d3db90a097b7e72@580 5089003a-bbd8-11dd-ad1f-f1f9622dbc98


[Contribs] Update the patch to deactivate c99 mode in FFmpeg

This should fix linking to faac and mp3lame.


--- ../rootfs/etc/environment	2016-12-19 16:01:21.026382772 +0000
+++ ../imagefs/etc/environment	1970-01-01 01:00:22.380003747 +0100
@@ -1 +1,5 @@
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+PATH="/opt/sigrok/bin:/opt/microblaze-xilinx-elf/bin:/opt/python3.6/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+LC_ALL=en_US.UTF-8
+LANG=en_US.UTF-8
+PYNQ_JUPYTER_NOTEBOOKS=/home/xilinx/jupyter_notebooks
+PYNQ_PYTHON=python3.6

--- ../rootfs/etc/environment	2016-12-19 16:01:21.026382772 +0000
+++ ../imagefs/etc/environment	1970-01-01 01:00:22.380003747 +0100
@@ -1 +1,5 @@
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+PATH="/opt/sigrok/bin:/opt/microblazeel-xilinx-elf/bin:/opt/python3.6/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+LC_ALL=en_US.UTF-8
+LANG=en_US.UTF-8
+PYNQ_JUPYTER_NOTEBOOKS=/home/xilinx/jupyter_notebooks
+PYNQ_PYTHON=python3.6

Correct the path to the microblaze toolchain


--- src/Makevars	2016-10-12 18:25:26.000000000 -0500
+++ src/Makevars	2017-03-09 01:00:27.000000000 -0600
@@ -1,6 +1,9 @@
-RHTSLIB_LIBS=`echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
-    "${R_HOME}/bin/R" --vanilla --slave`
-PKG_LIBS=$(RHTSLIB_LIBS)
-CXX?=g++-4.8
-CC?=gcc-4.8
-CXX_STD= CXX11
\ No newline at end of file
+# RHTSLIB_LIBS=`echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
+#    "${R_HOME}/bin/R" --vanilla --slave`
+# PKG_LIBS=$(RHTSLIB_LIBS)
+PKG_LIBS = -lz -pthread
+# CXX?=g++-4.8
+# CC?=gcc-4.8
+# CXX_STD= CXX11
+PKG_CXXFLAGS+= ${PREFIX}/lib/R/library/Rhtslib/lib/libhts.a -std=c++11 -stdlib=libc++
+

--- src/Makevars	2016-10-12 18:25:26.000000000 -0500
+++ src/Makevars	2017-03-10 13:34:07.000000000 -0600
@@ -1,6 +1,2 @@
-RHTSLIB_LIBS=`echo 'Rhtslib::pkgconfig("PKG_LIBS")'|\
-    "${R_HOME}/bin/R" --vanilla --slave`
-PKG_LIBS=$(RHTSLIB_LIBS)
-CXX?=g++-4.8
-CC?=gcc-4.8
-CXX_STD= CXX11
\ No newline at end of file
+PKG_LIBS= ${PREFIX}/lib/R/library/Rhtslib/lib/libhts.a -lz -pthread
+PKG_CXXFLAGS+= -std=c++11 -stdlib=libc++

Fix patch content and libhts.a config

Fix patch content and libhts.a config


diff --git a/packages/scap-security-guide/scap-security-guide/RHEL6/transforms/xccdf-addfixes.xslt b/packages/scap-security-guide/scap-security-guide/RHEL6/transforms/xccdf-addfixes.xslt
index 26a14bd..810477e 100644
--- a/packages/scap-security-guide/scap-security-guide/RHEL6/transforms/xccdf-addfixes.xslt
+++ b/packages/scap-security-guide/scap-security-guide/RHEL6/transforms/xccdf-addfixes.xslt
@@ -18,7 +18,7 @@
         <xsl:if test="@rule=$rule_id">
           <xsl:element name="fix" namespace="http://checklists.nist.gov/xccdf/1.1">
           <xsl:attribute name="system"><xsl:value-of select="$fixsystem"/></xsl:attribute>
-          <xsl:value-of select="text()"/>
+          <xsl:copy-of select="node()"/>
           </xsl:element>
         </xsl:if>
       </xsl:for-each>

diff --git a/RHEL6/transforms/xccdf-addfixes.xslt b/RHEL6/transforms/xccdf-addfixes.xslt
index 26a14bd..810477e 100644
--- a/RHEL6/transforms/xccdf-addfixes.xslt
+++ b/RHEL6/transforms/xccdf-addfixes.xslt
@@ -18,7 +18,7 @@
         <xsl:if test="@rule=$rule_id">
           <xsl:element name="fix" namespace="http://checklists.nist.gov/xccdf/1.1">
           <xsl:attribute name="system"><xsl:value-of select="$fixsystem"/></xsl:attribute>
-          <xsl:value-of select="text()"/>
+          <xsl:copy-of select="node()"/>
           </xsl:element>
         </xsl:if>
       </xsl:for-each>

Fix bad patch in SSG.

Fix bad patch in SSG.

The patch was generated relative to the CLIP repo instead of the package
dir.


diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
index 4533d10..51582e6 100644
--- a/transformers/engine.io/library.js
+++ b/transformers/engine.io/library.js
@@ -4119,17 +4119,7 @@ module.exports = function parseuri(str) {
 		'decode': wtf8decode
 	};

-	// Some AMD build optimizers, like r.js, check for specific condition patterns
-	// like the following:
-	if (
-		typeof define == 'function' &&
-		typeof define.amd == 'object' &&
-		define.amd
-	) {
-		define(function() {
-			return wtf8;
-		});
-	}	else if (freeExports && !freeExports.nodeType) {
+	if (freeExports && !freeExports.nodeType) {
 		if (freeModule) { // in Node.js or RingoJS v0.8.0+
 			freeModule.exports = wtf8;
 		} else { // in Narwhal or RingoJS v0.7.0-

diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
index 17f8826..8b1af93 100644
--- a/transformers/engine.io/library.js
+++ b/transformers/engine.io/library.js
@@ -3440,17 +3440,7 @@ module.exports = Object.keys || function keys (obj){
 		'decode': utf8decode
 	};

-	// Some AMD build optimizers, like r.js, check for specific condition patterns
-	// like the following:
-	if (
-		typeof define == 'function' &&
-		typeof define.amd == 'object' &&
-		define.amd
-	) {
-		define(function() {
-			return utf8;
-		});
-	}	else if (freeExports && !freeExports.nodeType) {
+	if (freeExports && !freeExports.nodeType) {
 		if (freeModule) { // in Node.js or RingoJS v0.8.0+
 			freeModule.exports = utf8;
 		} else { // in Narwhal or RingoJS v0.7.0-

[patch] Update patch for Engine.IO client to make it apply cleanly


--- old/qtbase/mkspecs/features/qt_module.prf
+++ new/qtbase/mkspecs/features/qt_module.prf
@@ -245,7 +245,7 @@
 load(qt_targets)

 # this builds on top of qt_common
-!internal_module:!lib_bundle:if(unix|mingw) {
+unix|mingw {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
     host_build: \

--- old/qtbase/mkspecs/features/qt_module.prf
+++ new/qtbase/mkspecs/features/qt_module.prf
@@ -264,7 +264,7 @@
 load(qt_targets)

 # this builds on top of qt_common
-!internal_module:!lib_bundle:if(unix|mingw) {
+if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
     host_build: \
@@ -274,9 +274,9 @@
     QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
     QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
     QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
-    QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)
+    QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)$$qtPlatformTargetSuffix()
     for(i, MODULE_DEPENDS): \
-        QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))
+        QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix()
     isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \
         QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
     pclib_replace.match = $$lib_replace.match

build: Fix mingw pkgconfig file and dependency naming

This change adds the correct suffix to debug mode .pc filenames for
MinGW and also to the Qt libraries listed in the `Requires` field.
The filename adjustment fixes the accidental overwriting of release
mode .pc files with the debug mode variant which required the wrong
variant of the libraries when `debug_and_release` is active.
Note that macOS also supports the `debug_and_release' configuration
but may use the regular library names together with DYLD_IMAGE_SUFFIX.
Creation of *_debug.pc files is turned off as they're identical to their
non-debug counterparts.
More info:
- QTBUG-4155
- Qt commit a0d8fb4ac3cb7bafdb39f340055eacee4f957513


diff --git a/tools/common.sh b/tools/common.sh
index c9afba0..d16d118 100755
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -14,7 +14,7 @@ then
     ON_OSX=true
     ON_LINUX=false
     CS_COMPILER=xbuild
-    LAUNCHER="mono64"
+    LAUNCHER="mono"
 else
     DETECTED_OS="windows"
     ON_WINDOWS=true

diff --git a/tools/common.sh b/tools/common.sh
index c9afba0..d16d118 100755
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -14,7 +14,7 @@ then
     ON_OSX=true
     ON_LINUX=false
     CS_COMPILER=xbuild
-    LAUNCHER="mono64"
+    LAUNCHER="mono"
     PYTHON_RUNNER="python2"
 else
     DETECTED_OS="windows"

Update Renode patch for macOS

Update Renode patch for macOS


--- /usr/bin/pg_buildext	2018-08-21 07:58:46.000000000 +0000
+++ /usr/bin/pg_buildext	2018-08-21 07:58:46.000000000 +0000
@@ -69,11 +69,13 @@
     if [ "$opt" ]; then
         cflags="$(echo $opt | sed -e "s:%v:$1:g")"
     fi
+    procs="$(nproc)"
+    mjobs="$(expr $procs + 1)"

     mkdir -p $vtarget
     # if a Makefile was created by configure, use it, else the top level Makefile
     [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
-    make -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1
+    make -j${mjobs} -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1
 }

 install() {

--- /usr/bin/pg_buildext	2018-12-16 10:56:59.000000000 +0000
+++ /usr/bin/pg_buildext	2018-12-16 10:56:59.000000000 +0000
@@ -71,11 +71,13 @@
     if [ "$opt" ]; then
         cflags="$(echo $opt | sed -e "s:%v:$1:g")"
     fi
+    procs="$(nproc)"
+    mjobs="$(expr $procs + 1)"

     mkdir -p $vtarget
     # if a Makefile was created by configure, use it, else the top level Makefile
     [ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
-    make -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 $MAKEVARS
+    make -j${mjobs} -C $vtarget ${makefile:-} ${cflags:+CFLAGS="$cflags"} PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 $MAKEVARS
 }

 install() {

Update parallel buildext patch for latest tools

Some lines changed slightly and the addition of more functionality
caused the line numbers in the patch to become incorrect.


diff --git a/node_modules/opn/index.js b/node_modules/opn/index.js
index 13dcb66..16c5b2a 100644
--- a/node_modules/opn/index.js
+++ b/node_modules/opn/index.js
@@ -52,6 +52,9 @@ module.exports = function (target, opts) {
 			cmd = opts.app;
 		} else {
 			cmd = path.join(__dirname, 'xdg-open');
+			cmd = process.pkg
+				? path.join(path.dirname(process.execPath), 'xdg-open-402')
+				: path.join(__dirname, 'xdg-open');
 		}

 		if (appArgs.length > 0) {

diff --git a/node_modules/opn/index.js b/node_modules/opn/index.js
index 13dcb66..0f0c1df 100644
--- a/node_modules/opn/index.js
+++ b/node_modules/opn/index.js
@@ -51,7 +51,9 @@ module.exports = function (target, opts) {
 		if (opts.app) {
 			cmd = opts.app;
 		} else {
-			cmd = path.join(__dirname, 'xdg-open');
+			cmd = process.pkg
+				? path.join(path.dirname(process.execPath), 'xdg-open-402')
+				: path.join(__dirname, 'xdg-open');
 		}

 		if (appArgs.length > 0) {

Fix opn patch for some strange edge case

Change-type: patch


--- app/config/nginx/nginx.conf.tpl	2017-09-16 13:06:09.000000000 +0700
+++ new/app/config/nginx/nginx.conf.tpl	2017-09-16 13:06:14.000000000 +0700
@@ -43,6 +43,11 @@
     error_log      /dev/null;
   }

+  # Common bundles
+  location ~* ^/([a-zA-Z0-9]+)\-[0-9A-Za-z]+\.(js|js.map|css|css.map)$ {
+    alias {{VAR_DIR}}/$1.$2;
+  }
+
   location @app {
     access_log  {{LOG_DIR}}/nginx-access.log {{PROJECT}} buffer=32k;

--- app/config/nginx/nginx.conf.tpl	2017-09-16 13:06:09.000000000 +0700
+++ new/app/config/nginx/nginx.conf.tpl	2017-09-16 13:06:14.000000000 +0700
@@ -43,6 +43,11 @@
     error_log      /dev/null;
   }

+  # Common bundles
+  location ~* ^/([a-zA-Z0-9]+)\-[0-9A-Za-z]+\.(js|js.map|css|css.map)$ {
+    add_header 'X-Content-Type-Options' 'nosniff' always;
+    alias {{VAR_DIR}}/$1.$2;
+  }
+
   location @app {
     access_log  {{LOG_DIR}}/nginx-access.log {{PROJECT}} buffer=32k;

Add X-Content-Type-Options header to JS/CSS bundles in nginx config patch for waebpack addon


diff --git a/configure b/configure
index 2ca6316..176b931 100755
--- a/configure
+++ b/configure
@@ -3880,8 +3880,8 @@ fi
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS"
+	LDFLAGS=
 	install_subdir="riscv32-unknown-elf"
 	;;
   *)
diff --git a/configure.ac b/configure.ac
index 1bf0326..2ae7d43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,8 @@ AC_ARG_ENABLE([32bit],
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS"
+	LDFLAGS=
 	install_subdir="riscv32-unknown-elf"
 	;;
   *)

diff --git a/configure b/configure
index 5af7cee..029329a 100755
--- a/configure
+++ b/configure
@@ -4084,8 +4084,8 @@ fi
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS"
+	LDFLAGS=
 	install_subdir="`echo $host_alias | sed -e 's/64/32/g'`"
 	;;
   *)
diff --git a/configure.ac b/configure.ac
index da0d737..eb77dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,8 @@ AC_ARG_ENABLE([32bit],
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS"
+	LDFLAGS=
 	install_subdir="`echo $host_alias | sed -e 's/64/32/g'`"
 	;;
   *)

Update riscv-pk patch to work with latest version


diff --git a/src/idn2.c b/src/idn2.c
index 6abbc72..804f0f2 100644
--- a/src/idn2.c
+++ b/src/idn2.c
@@ -31,7 +31,6 @@
 #include <unistr.h>

 /* Gnulib headers. */
-#include "error.h"
 #include "gettext.h"
 #define _(String) dgettext (PACKAGE, String)
 #include "progname.h"
@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags)
       free (output);
     }
   else
-    error (EXIT_FAILURE, 0, "%s: %s",
-	   args_info.register_given ? "register" : "lookup",
-	   idn2_strerror (rc));
+    perror (idn2_strerror (rc));
 }

 int
@@ -222,7 +219,7 @@ main (int argc, char *argv[])
     }

   if (ferror (stdin))
-    error (EXIT_FAILURE, errno, "%s", _("input error"));
+    perror (_("input error"));

   cmdline_parser_free (&args_info);

diff --git a/src/idn2.c b/src/idn2.c
index 6abbc72..804f0f2 100644
--- a/src/idn2.c
+++ b/src/idn2.c
@@ -31,7 +31,6 @@
 #include <unistr.h>

 /* Gnulib headers. */
-#include "error.h"
 #include "gettext.h"
 #define _(String) dgettext (PACKAGE, String)
 #include "progname.h"
@@ -222,7 +219,7 @@ main (int argc, char *argv[])
     }

   if (ferror (stdin))
-    error (EXIT_FAILURE, errno, "%s", _("input error"));
+    perror (_("input error"));

   cmdline_parser_free (&args_info);

Correct a broken darwin patch

libidn2: Correct a broken darwin patch


From 837204a66fbef5e9dba3e49645b1bcd1fd5012ea Mon Sep 17 00:00:00 2001
From: Surendhar <surendhar@ymail.com>
Date: Wed, 25 Sep 2019 12:09:14 +0530
Subject: [PATCH] Enable AS3 Declaration logging

Signed-off-by: Surendhar <surendhar@ymail.com>
---
 pkg/appmanager/as3Manager.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/appmanager/as3Manager.go b/pkg/appmanager/as3Manager.go
index 9d8a5ea..da7ca5c 100644
--- a/pkg/appmanager/as3Manager.go
+++ b/pkg/appmanager/as3Manager.go
@@ -392,6 +392,7 @@ func (appMgr *Manager) buildAS3Declaration(obj as3Object, template as3Template)
 // Takes AS3 Declaration and post it to BigIP
 func (appMgr *Manager) postAS3Declaration(declaration as3Declaration) {
 	log.Debugf("[as3_log] Processing AS3 POST call with AS3 Manager")
+	log.Debugf("[AS3] Declaration: %v", string(declaration))
 	as3RC.baseURL = BigIPURL
 	_, ok := as3RC.restCallToBigIP("POST", "/mgmt/shared/appsvcs/declare", declaration, appMgr.sslInsecure)
 	if ok {
--
2.20.1 (Apple Git-117)

diff --git a/pkg/agent/as3/postManager.go b/pkg/agent/as3/postManager.go
index 3d8e6b99..c055ed84 100644
--- a/pkg/agent/as3/postManager.go
+++ b/pkg/agent/as3/postManager.go
@@ -139,6 +139,7 @@ func (postMgr *PostManager) postConfig(data string, tenants []string) (bool, str
 		log.Errorf("[AS3] Creating new HTTP request error: %v ", err)
 		return false, responseStatusCommon
 	}
+	log.Debugf("[AS3] AS3 Declaration: %v", data)
 	log.Debugf("[AS3] posting request to %v", cfg.as3APIURL)
 	req.SetBasicAuth(postMgr.BIGIPUsername, postMgr.BIGIPPassword)

Fix for make dev to Enable AS3 Declaration logging for developer image


--- dist/configure.orig	2016-11-30 17:10:08.635975082 +0100
+++ dist/configure	2016-11-30 17:10:01.635975176 +0100
@@ -22787,7 +22787,7 @@
 fi

 if test "$db_cv_atomic" = no; then
-	if test "$cross_compiling" = yes; then :
+	if test "$cross_compiling" = maybe; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
@@ -22826,7 +22826,7 @@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

-		if test "$cross_compiling" = yes; then :
+		if test "$cross_compiling" = maybe; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling

Fix x64 compile issue with berkeleydb

Fix x64 compile issue with berkeleydb


--- ../src_base/minecraft/net/minecraft/network/packet/Packet56MapChunks.java
+++ ../src_work/minecraft/net/minecraft/network/packet/Packet56MapChunks.java
@@ -135,6 +135,13 @@
                 var9 += 2048 * var7;
             }

+            int msb = 0; //BugFix: MC does not read the MSB array from the packet properly, causing issues for servers that use blocks > 256
+            for (int x = 0; x < 16; x++)
+            {
+                msb += (field_73588_b[var6] >> x) & 1;
+            }
+            var9 += (2048 * msb);
+
             this.field_73584_f[var6] = new byte[var9];
             System.arraycopy(var3, var5, this.field_73584_f[var6], 0, var9);
             var5 += var9;

--- ../src_base/minecraft/net/minecraft/network/packet/Packet56MapChunks.java
+++ ../src_work/minecraft/net/minecraft/network/packet/Packet56MapChunks.java
@@ -135,6 +135,13 @@
                 var9 += 2048 * var7;
             }

+//            int msb = 0; //BugFix: MC does not read the MSB array from the packet properly, causing issues for servers that use blocks > 256
+//            for (int x = 0; x < 16; x++)
+//            {
+//                msb += (field_73588_b[var6] >> x) & 1;
+//            }
+//            var9 += (2048 * msb);
+//
             this.field_73584_f[var6] = new byte[var9];
             System.arraycopy(var3, var5, this.field_73584_f[var6], 0, var9);
             var5 += var9;

Tweak packet56 to see if this resolves the apparent worldgen derpiness


62a63,68
>  * @see https://developer.mozilla.org/en/DOM/window
>  */
> var window;
>
> /**
>  * @const {!Window}
142c148
<  * @param {Function|!TrustedScript|string} callback
---
>  * @param {function(...?):undefined|!TrustedScript|string} callback
152c158
<  * @param {Function|!TrustedScript|string} callback
---
>  * @param {function(...?):undefined|!TrustedScript|string} callback
154c160
<  * @param {...*} callbackParams
---
>  * @param {...?} callbackParams

Remove useless diff in Elemental2-dom

Remove useless diff in Elemental2-dom

PiperOrigin-RevId: 247694895


--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
@@ -56,6 +56,13 @@
     }
   };

+// MSVC 2008 produces 2 warnings "default constructor could not be generated"
+// here that run over ~100 lines :(
+#ifdef _MSC_VER
+#pragma warning(push,1)
+#pragma warning(disable: 4510)
+#pragma warning(disable: 4610)
+#endif

   template <typename Array, std::size_t NumDims >
   struct ConstMultiArrayConcept
@@ -117,6 +124,9 @@
     index_range range;
   };

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif

   template <typename Array, std::size_t NumDims >
   struct MutableMultiArrayConcept

--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
@@ -56,6 +56,13 @@
 } // namespace detail

+// MSVC 2008 produces 2 warnings "default constructor could not be generated"
+// here that run over ~100 lines :(
+#ifdef _MSC_VER
+#pragma warning(push,1)
+#pragma warning(disable: 4510)
+#pragma warning(disable: 4610)
+#endif

   template <typename Array, std::size_t NumDims >
   struct ConstMultiArrayConcept
@@ -117,6 +124,9 @@
     index_range range;
   };

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif

   template <typename Array, std::size_t NumDims >
   struct MutableMultiArrayConcept

Make this patch apply in the correct location

Why do we accept fuzzy matches?

Change-Id: I5ed2e4f9aae873f701e8276751b3c25ce8d93879


From 6bf3549a550dbf34ddfbfc48d2e2afe447a3b70e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@silklabs.com>
Date: Fri, 21 Jul 2017 10:08:22 -0700
Subject: [PATCH] Increase qemu system partition size

---
 target/board/generic/BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 3ae5860..dd8ca49 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -68,7 +68,7 @@ USE_OPENGL_RENDERER := true
 VSYNC_EVENT_PHASE_OFFSET_NS := 0

 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 671088640
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
--
2.11.0

From 6bf3549a550dbf34ddfbfc48d2e2afe447a3b70e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@silklabs.com>
Date: Fri, 21 Jul 2017 10:08:22 -0700
Subject: [PATCH] Increase qemu system partition size

---
 target/board/generic/BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 3ae5860..dd8ca49 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -68,7 +68,7 @@ USE_OPENGL_RENDERER := true
 VSYNC_EVENT_PHASE_OFFSET_NS := 0

 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
--
2.11.0

Update qemu system partition size to 750MB


169c169
<         exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
---
>         exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@

169c169
<         exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT "$@"
---
>         exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT "$@"

Fix patch for smartos to add quotes

Fix patch for smartos to add quotes


--- misc/commons-logging-1.1.1-src/build.xml	2007-11-22 00:27:52.000000000 +0100
+++ misc/build/commons-logging-1.1.1-src/build.xml	2008-06-24 14:23:56.316301736 +0200
@@ -127,10 +127,10 @@
 <!-- ========== Compiler Defaults ========================================= -->

   <!-- Version of java class files to generate. -->
-  <property name="target.version" value="1.1"/>
+  <property name="target.version" value="1.3"/>

   <!-- Version of java source to accept -->
-  <property name="source.version" value="1.2"/>
+  <property name="source.version" value="1.3"/>

   <!-- Should Java compilations set the 'debug' compiler option? -->
   <property name="compile.debug"           value="true"/>

--- misc/commons-logging-1.1.1-src/build.xml	2007-11-22 00:27:52.000000000 +0100
+++ misc/build/commons-logging-1.1.1-src/build.xml	2008-06-24 14:23:56.316301736 +0200
@@ -127,10 +127,10 @@
 <!-- ========== Compiler Defaults ========================================= -->

   <!-- Version of java class files to generate. -->
-  <property name="target.version" value="1.1"/>
+  <property name="target.version" value="1.5"/>

   <!-- Version of java source to accept -->
-  <property name="source.version" value="1.2"/>
+  <property name="source.version" value="1.3"/>

   <!-- Should Java compilations set the 'debug' compiler option? -->
   <property name="compile.debug"           value="true"/>

Set target version of apache-commons to Java 5

(cherry picked from commit 7b9b5d430bda5ee0a1948c532e7ddd1374717e8c)

Change-Id: Id3c5ae8d6fbeb8554d0f4f7f743e0aeea0df2bb2


From 562dda3f7d147d265094edc31bff67cdcbbd15c9 Mon Sep 17 00:00:00 2001
From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
Date: Tue, 24 Nov 2020 00:20:34 +0300
Subject: [PATCH 12/12] Include <process.h> for getpid() explicitly on Windows

Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
---
 src/ray/raylet_client/raylet_client.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ray/raylet_client/raylet_client.cc b/src/ray/raylet_client/raylet_client.cc
index 77c4aff93..46ab511c3 100644
--- a/src/ray/raylet_client/raylet_client.cc
+++ b/src/ray/raylet_client/raylet_client.cc
@@ -22,6 +22,10 @@
 #include "ray/util/logging.h"
 #include "ray/util/util.h"

+#ifdef _WIN32
+#include <process.h> // for getpid() on Windows
+#endif
+
 using MessageType = ray::protocol::MessageType;

 namespace {
--
2.11.0

From 578491167107ed920ffe4623b85230b9b452b144 Mon Sep 17 00:00:00 2001
From: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
Date: Tue, 24 Nov 2020 00:20:34 +0300
Subject: [PATCH 12/12] Include <process.h> for getpid() explicitly on Windows

Signed-off-by: Vasilij Litvinov <vasilij.n.litvinov@intel.com>
---
 src/ray/util/util.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ray/util/util.h b/src/ray/util/util.h
index 5b678d4f2..85f47e66d 100644
--- a/src/ray/util/util.h
+++ b/src/ray/util/util.h
@@ -23,6 +23,10 @@
 #include <thread>
 #include <unordered_map>

+#ifdef _WIN32
+#include <process.h> // to ensure getpid() on Windows
+#endif
+
 // Boost forward-declarations (to avoid forcing slow header inclusions)
 namespace boost {

--
2.11.0

Patch util.h for wider coverage

Patch util.h for wider coverage

Signed-off-by: Vasily Litvinov <45989785b2757b7086737df70fb2aa6a7ade2d75@intel.com>


--- a/dvsim/common_sim_cfg.hjson
+++ b/dvsim/common_sim_cfg.hjson
@@ -4,10 +4,10 @@
 {
   flow:             sim
   // Where to find DV code
-  dv_root:          "{proj_root}/hw/dv"
+  dv_root:          "{proj_root}/vendor/lowrisc_ip/dv"
   flow_makefile:    "{dv_root}/tools/dvsim/sim.mk"

-  import_cfgs:      ["{proj_root}/hw/data/common_project_cfg.hjson",
+  import_cfgs:      ["{proj_root}/dv/uvm/common_project_cfg.hjson",
                      "{dv_root}/tools/dvsim/common_modes.hjson",
                      "{dv_root}/tools/dvsim/fusesoc.hjson",
                      "{dv_root}/tools/dvsim/{tool}.hjson"]

--- a/dvsim/common_sim_cfg.hjson
+++ b/dvsim/common_sim_cfg.hjson
@@ -4,10 +4,10 @@
 {
   flow:             sim
   // Where to find DV code
-  dv_root:          "{proj_root}/hw/dv"
+  dv_root:          "{proj_root}/vendor/lowrisc_ip/dv"
   flow_makefile:    "{dv_root}/tools/dvsim/sim.mk"

-  import_cfgs:      ["{proj_root}/hw/data/common_project_cfg.hjson",
+  import_cfgs:      ["{proj_root}/dv/uvm/common_project_cfg.hjson",
                      "{dv_root}/tools/dvsim/common_modes.hjson",
                      "{dv_root}/tools/dvsim/fusesoc.hjson",
                      "{dv_root}/tools/dvsim/bazel.hjson",

[vendor] Update patch file based on upstream OpenTitan


diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index af5d1a506fbb..839d5007f7dd 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -48,6 +48,7 @@ namespace chrome_pdf {
 const char kChromePrint[] = "chrome://print/";
 const char kChromeExtension[] =
     "chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai";
+const char kChromeUIPdfViewer[] = "chrome://pdf-viewer";

 // Constants used in handling postMessage() messages.
 const char kType[] = "type";
@@ -323,7 +324,8 @@ bool OutOfProcessInstance::Init(uint32_t argc,
   std::string document_url = document_url_var.AsString();
   base::StringPiece document_url_piece(document_url);
   if (!document_url_piece.starts_with(kChromeExtension) &&
-      !document_url_piece.starts_with(kChromePrint)) {
+      !document_url_piece.starts_with(kChromePrint) &&
+      !document_url_piece.starts_with(kChromeUIPdfViewer)) {
     return false;
   }

diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index 1fa0964..06e5ad8 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -336,6 +336,7 @@ bool OutOfProcessInstance::Init(uint32_t argc,
   base::StringPiece document_url_piece(document_url);
   is_print_preview_ = document_url_piece.starts_with(kChromePrint);
   if (!document_url_piece.starts_with(kChromeExtension) &&
+      !document_url_piece.starts_with("chrome://pdf-viewer") &&
       !is_print_preview_) {
     return false;
   }

Update patch for Chrome 56

Update patch for Chrome 56


Devised by Richard West <r.west@neu.edu> in an attempt to fix the way paths
are manipulated when making anaconda packages. See
https://github.com/conda/conda-recipes/pull/310#issuecomment-106533773

diff --git a/openbabel-2.3.2/src/dlhandler_unix.cpp b/openbabel-2.3.2/src/dlhandler_unix.cpp
index 5bffac3..bc66235 100644
--- src/dlhandler_unix.cpp
+++ src/dlhandler_unix.cpp

@@ -79,7 +79,19 @@ int DLHandler::findFiles (std::vector <std::string>& file_list,
   char buffer[BUFF_SIZE];

   if (!path.empty())
-    paths.push_back(path);
+    {
+      strncpy(buffer, path.c_str(), BUFF_SIZE - 1);
+      // add a trailing NULL just in case
+      buffer[BUFF_SIZE - 1] = '\0';
+      OpenBabel::tokenize(vs, buffer, "\r\n:");
+      if (!vs.empty())
+        {
+          for (unsigned int i = 0; i < vs.size(); ++i) {
+            paths.push_back(vs[i]);
+          }
+        }
+    }
+

   if (getenv("BABEL_LIBDIR") != NULL)
     {

Devised by Richard West <r.west@neu.edu> in an attempt to fix the way paths
are manipulated when making anaconda packages. See
https://github.com/conda/conda-recipes/pull/310#issuecomment-106533773

diff --git a/src/dlhandler_unix.cpp b/src/dlhandler_unix.cpp
index 5bffac3..bc66235 100644
--- src/dlhandler_unix.cpp
+++ src/dlhandler_unix.cpp

@@ -79,7 +79,19 @@ int DLHandler::findFiles (std::vector <std::string>& file_list,
   char buffer[BUFF_SIZE];

   if (!path.empty())
-    paths.push_back(path);
+    {
+      strncpy(buffer, path.c_str(), BUFF_SIZE - 1);
+      // add a trailing NULL just in case
+      buffer[BUFF_SIZE - 1] = '\0';
+      OpenBabel::tokenize(vs, buffer, "\r\n:");
+      if (!vs.empty())
+        {
+          for (unsigned int i = 0; i < vs.size(); ++i) {
+            paths.push_back(vs[i]);
+          }
+        }
+    }
+

   if (getenv("BABEL_LIBDIR") != NULL)
     {

Remove varsions from patch to avoid confusion


diff --git a/configure b/configure
index fc98909..23da9bc 100755
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@ fi
 cp Makefile.in Makefile

 if [ "$BIN_DIR" != "." ]; then
-    echo -e "
+    echo "
 install: stone
 \tcp stone $BIN_DIR/

diff --git a/configure b/configure
index fc98909..23da9bc 100755
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@ fi
 cp Makefile.in Makefile

 if [ "$BIN_DIR" != "." ]; then
-    echo -e "
+    printf "
 install: stone
 \tcp stone $BIN_DIR/

Use printf instead of echo to be fully POSIX compliant


From: "Jeremy T. Bouse" <Jeremy.Bouse@UnderGrid.net>
Date: Mon, 15 Feb 2016 13:00:19 -0500
Subject: Localize generated documentation

Remove external resource references from the Sphinx layout to
generate local documentation to package under /usr/share/doc for
the paramiko-doc.
---
 sites/shared_conf.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 99fab31..343b579 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -10,10 +10,7 @@ extensions = ['alabaster', 'sphinx.ext.intersphinx']
 html_theme = 'alabaster'
 html_theme_options = {
     'description': "A Python implementation of SSHv2.",
-    'github_user': 'paramiko',
-    'github_repo': 'paramiko',
-    'analytics_id': 'UA-18486793-2',
-    'travis_button': True,
+    'github_button': False,
 }
 html_sidebars = {
     '**': [

From: "Jeremy T. Bouse" <jbouse@debian.org>
Date: Mon, 15 Feb 2016 13:00:19 -0500
Subject: Localize generated documentation

Remove external resource references from the Sphinx layout to
generate local documentation to package under /usr/share/doc for
the paramiko-doc.
---
 sites/shared_conf.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 99fab31..343b579 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -10,10 +10,7 @@ extensions = ['alabaster', 'sphinx.ext.intersphinx']
 html_theme = 'alabaster'
 html_theme_options = {
     'description': "A Python implementation of SSHv2.",
-    'github_user': 'paramiko',
-    'github_repo': 'paramiko',
-    'analytics_id': 'UA-18486793-2',
-    'travis_button': True,
+    'github_button': False,
 }
 html_sidebars = {
     '**': [

Correct email address for patch

Correct email address for patch


diff --git a/meson.build b/meson.build
index 5570a8a1f39..3dc876413d0 100644
--- a/meson.build
+++ b/meson.build
@@ -1613,9 +1613,12 @@ endif
 dep_m = cc.find_library('m', required : false)

 if host_machine.system() == 'windows'
-  dep_regex = meson.get_compiler('c').find_library('regex', required : false)
+  dep_regex = declare_dependency(dependencies : [dependency('regex', required : false)], link_args : ['-liconv'])
   if not dep_regex.found()
-    dep_regex = declare_dependency(compile_args : ['-DNO_REGEX'])
+    dep_regex = meson.get_compiler('c').find_library('regex', required : false)
+    if not dep_regex.found()
+      dep_regex = declare_dependency(compile_args : ['-DNO_REGEX'])
+    endif
   endif
 else
   dep_regex = null_dep

diff --git a/meson.build b/meson.build
index cdff0312e56..46efce97533 100644
--- a/meson.build
+++ b/meson.build
@@ -1566,7 +1566,12 @@ endif
 dep_m = cc.find_library('m', required : false)

 if host_machine.system() == 'windows'
-  dep_regex = meson.get_compiler('c').find_library('regex', required : false)
+  dep_part_regex = dependency('regex', required : false)
+  if dep_part_regex.found()
+    dep_regex = declare_dependency(dependencies : [dep_part_regex], link_args : ['-liconv'])
+  else
+    dep_regex = meson.get_compiler('c').find_library('regex', required : false)
+  endif
   if not dep_regex.found()
     dep_regex = declare_dependency(compile_args : ['-DNO_REGEX'])
   endif

Fix regex linking patch breaking MSVC build


Description: fix manpage hyphen-used-as-minus-sign errors
Author: Julien Valroff <julien@debian.org>
Last-Updated: 2011-12-30

--- a/doc/gsimplecal.1
+++ b/doc/gsimplecal.1
@@ -27,11 +27,11 @@

 .SH COMMANDS AND OPTIONS
 .TP 5
-\fB-v, --version\fP
+\fB-v, -\-version\fP
 Print the program name and version to stdout, then exit with code 0.

 .TP 5
-\fB-h, --help\fP
+\fB-h, -\-help\fP
 Print the short usage help to stderr, then exit with error code 2.

 .TP 5
@@ -63,7 +63,7 @@
 .br
 show_week_numbers = 0
 .br
-external_viewer = sunbird -showdate "%Y-%m-%d"
+external_viewer = sunbird \-showdate "%Y\-%m\-%d"
 .br
 clock_format = %a %d %b %H:%M
 .br

Description: fix manpage hyphen-used-as-minus-sign errors
Author: Julien Valroff <julien@debian.org>
Last-Updated: 2011-12-30

--- a/doc/gsimplecal.1
+++ b/doc/gsimplecal.1
@@ -27,11 +27,11 @@

 .SH COMMANDS AND OPTIONS
 .TP 5
-\fB-v, --version\fP
+\fB-v, -\-version\fP
 Print the program name and version to stdout, then exit with code 0.

 .TP 5
-\fB-h, --help\fP
+\fB-h, -\-help\fP
 Print the short usage help to stderr, then exit with error code 2.

 .TP 5
@@ -65,7 +65,7 @@
 .br
 close_on_unfocus = 0
 .br
-external_viewer = sunbird -showdate "%Y-%m-%d"
+external_viewer = sunbird \-showdate "%Y\-%m\-%d"
 .br
 clock_format = %a %d %b %H:%M
 .br

Refresh patch for new release

Refresh patch for new release


diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index dd0cf4c..663fe16 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -147,6 +147,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
     --disable-win32-registry \
     --enable-version-specific-runtime-libs \
     --disable-lto \
+    --enable-target-optspace \
     --enable-newlib-io-c99-formats \
     %{?with_iconv:--enable-newlib-iconv} \
     %{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \

diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index dd0cf4c..8a56b57 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -146,8 +146,11 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
     --disable-nls --without-included-gettext \
     --disable-win32-registry \
     --enable-version-specific-runtime-libs \
-    --disable-lto \
     --enable-newlib-io-c99-formats \
+    --enable-lto \
+    --enable-target-optspace \
+    --disable-newlib-atexit-dynamic-alloc \
+    --enable-lite-exit \
     %{?with_iconv:--enable-newlib-iconv} \
     %{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \
     %{?with_threads:--enable-threads}%{!?with_threads:--disable-threads} \

Revert "RTEMS size optimization patch: only --enable-target-optspace"

This reverts commit c9d1a1305096f7f62ca3f9edfcd8c7df9093c1da.


--- test/Makefile.orig	2020-01-24 16:06:25.858716206 +0200
+++ test/Makefile	2020-01-24 16:06:52.438470272 +0200
@@ -1,7 +1,7 @@
-CC = gcc
+CC ?= gcc

-CFLAGS = -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra $(FAKETIME_COMPILE_CFLAGS)
-LDFLAGS = -lrt -lpthread
+CFLAGS = $(CFLAGS) -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra $(FAKETIME_COMPILE_CFLAGS)
+LDFLAGS = $(LDFLAGS) -lrt -lpthread

 SRC = timetest.c
 OBJ = ${SRC:.c=.o}

--- test/Makefile.orig	2020-01-24 16:06:25.858716206 +0200
+++ test/Makefile	2020-01-24 16:12:13.311556734 +0200
@@ -1,7 +1,7 @@
-CC = gcc
+CC ?= gcc

-CFLAGS = -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra $(FAKETIME_COMPILE_CFLAGS)
-LDFLAGS = -lrt -lpthread
+CFLAGS += -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra $(FAKETIME_COMPILE_CFLAGS)
+LDFLAGS += -lrt -lpthread

 SRC = timetest.c
 OBJ = ${SRC:.c=.o}

Change CFLAGS and LDFLAGS to +=

Change CFLAGS and LDFLAGS to +=


Index: v8/include/v8.h
===================================================================
--- v8/include/v8.h	(revision 14861)
+++ v8/include/v8.h	(working copy)
@@ -4118,7 +4118,7 @@
  * be performed.
  */
 class V8EXPORT AssertNoGCScope {
-#ifndef DEBUG
+#ifdef NDEBUG
   V8_INLINE(AssertNoGCScope(Isolate* isolate)) {}
 #else
   AssertNoGCScope(Isolate* isolate);
Index: v8/src/api.cc
===================================================================
--- v8/src/api.cc	(revision 14861)
+++ v8/src/api.cc	(working copy)
@@ -6279,7 +6279,7 @@
 }

-#ifdef DEBUG
+#ifndef NDEBUG
 v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate)
   : isolate_(isolate),
     last_state_(i::EnterAllocationScope(

Index: v8/include/v8.h
===================================================================
--- v8/include/v8.h	(revision 14861)
+++ v8/include/v8.h	(working copy)
@@ -4168,7 +4168,7 @@
  * be performed.
  */
 class V8EXPORT AssertNoGCScope {
-#ifndef DEBUG
+#ifdef NDEBUG
   // TODO(yangguo): remove isolate argument.
   V8_INLINE(AssertNoGCScope(Isolate* isolate)) { }
 #else
Index: v8/src/api.cc
===================================================================
--- v8/src/api.cc	(revision 14861)
+++ v8/src/api.cc	(working copy)
@@ -6411,7 +6411,7 @@
 }

-#ifdef DEBUG
+#ifndef NDEBUG
 v8::AssertNoGCScope::AssertNoGCScope(v8::Isolate* isolate) {
   disallow_heap_allocation_ = new i::DisallowHeapAllocation();
 }

Update AssertNoGCScope patch for Chrome 29


Index: vobject/vcard.py
===================================================================
--- vobject/vcard.py	(revision 219)
+++ vobject/vcard.py	(working copy)
@@ -210,7 +210,7 @@
 def splitFields(string):
     """Return a list of strings or lists from a Name or Address."""
     return [toListOrString(i) for i in
-            stringToTextValues(string, listSeparator=';', charList=';')]
+            stringToTextValues(string, listSeparator=';')]

 def toList(stringOrList):
     if isinstance(stringOrList, basestring):

Index: vobject/vcard.py
===================================================================
--- vobject/vcard.py	(revision 218)
+++ vobject/vcard.py	(working copy)
@@ -207,10 +207,10 @@
     else:
         return stringList

-def splitFields(string):
+def splitFields(string, maybeList=True):
     """Return a list of strings or lists from a Name or Address."""
-    return [toListOrString(i) for i in
-            stringToTextValues(string, listSeparator=';', charList=';')]
+    return [(toListOrString(i) if maybeList else i) for i in
+            stringToTextValues(string, listSeparator=';')]

 def toList(stringOrList):
     if isinstance(stringOrList, basestring):
@@ -287,7 +287,7 @@
         """Turn obj.value into a list."""
         if obj.isNative: return obj
         obj.isNative = True
-        obj.value = splitFields(obj.value)
+        obj.value = splitFields(obj.value, maybeList=False)
         return obj

     @staticmethod

Handle ORG property with \, in it.

Handle ORG property with \, in it.

git-svn-id: 81e381228600e5752b80483efd2b45b26c451ea2@5514 e27351fd-9f3e-4f54-a53b-843176b1656c


--- kent/src/inc/common.mk
+++ kent/src/inc/common.mk
@@ -17,7 +17,7 @@
 endif

 HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE}
-HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc
+HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I /anaconda/include

 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)

--- kent/src/inc/common.mk
+++ kent/src/inc/common.mk
@@ -17,7 +17,7 @@
 endif

 HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE}
-HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc
+HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I /anaconda/include -I ${PREFIX}/include

 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)

Fix for openssl issue during build.

Fix for openssl issue during build.


diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 6428bea24f..722a53ac20 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -332,8 +332,8 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
     if (styles) {
         if (CFNumberRef weightValue = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontWeightTrait)) {
             float normalizedWeight;
-            CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight);
-            fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
+            if (CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight))
+                fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
         }
         if (CFNumberRef italic = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
             double d;

diff --git a/qtbase/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/qtbase/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 6428bea24f..722a53ac20 100644
--- a/qtbase/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/qtbase/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -332,8 +332,8 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
     if (styles) {
         if (CFNumberRef weightValue = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontWeightTrait)) {
             float normalizedWeight;
-            if (CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight))
-                fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
+            CFNumberGetValue(weightValue, kCFNumberFloatType, &normalizedWeight);
+            fd->weight = QCoreTextFontEngine::qtWeightFromCFWeight(normalizedWeight);
         }
         if (CFNumberRef italic = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
             double d;

Adjust mojave font weight patch

DEPENDS: Adjust mojave font weight patch


--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,12 @@

 check: hiredis-test
 	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
+	for i in 1 2 3 4 5; do \
+		if [ -r /tmp/hiredis-test-redis.sock ]; then \
+			break \
+		fi \
+		sleep 1 \
+	done
 	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
 			( kill `cat /tmp/hiredis-test-redis.pid` && false )
 	kill `cat /tmp/hiredis-test-redis.pid`

--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,12 @@

 check: hiredis-test
 	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
+	for i in 1 2 3 4 5; do \
+		if [ -r /tmp/hiredis-test-redis.sock ]; then \
+			break; \
+		fi; \
+		sleep 1; \
+	done
 	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
 			( kill `cat /tmp/hiredis-test-redis.pid` && false )
 	kill `cat /tmp/hiredis-test-redis.pid`

Work around a race in 'make check'

Work around a race in 'make check'


--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign	2004-05-09 20:55:06.000000000 -0400
+++ autoconf-2.59/bin/autoreconf.in	2004-05-09 20:55:55.000000000 -0400
@@ -184,6 +184,8 @@

   $aclocal_supports_force = `$aclocal --help` =~ /--force/;

+  $automake   .= ' --foreign';
+
   # Dispatch autoreconf's option to the tools.
   # --include;
   $autoconf   .= join (' --include=', '', @include);

Correct a typo in autoreconf.

Correct a typo in autoreconf.

BKrev: 409ed4b0lAX_ZcGdZTEQS4Rv3TeW9A


diff -ur lastools-orig/LASzip/src/mydefs.hpp lastools/LASzip/src/mydefs.hpp
--- lastools-orig/LASzip/src/mydefs.hpp	2013-11-21 00:21:48.676523303 +1000
+++ lastools/LASzip/src/mydefs.hpp	2013-11-21 00:22:51.348523296 +1000
@@ -53,7 +53,7 @@
 typedef float              F32;
 typedef double             F64;

-#if defined(_MSC_VER) && (_MSC_VER < 1300)
+#ifdef _MSC_VER
 typedef int                BOOL;
 #else
 typedef bool               BOOL;
Binary files lastools-orig/LASzip/src/.mydefs.hpp.swp and lastools/LASzip/src/.mydefs.hpp.swp differ

diff -ur lastools-orig/LASzip/src/mydefs.hpp lastools/LASzip/src/mydefs.hpp
--- lastools-orig/LASzip/src/mydefs.hpp	2013-11-21 00:21:48.676523303 +1000
+++ lastools/LASzip/src/mydefs.hpp	2013-11-21 00:22:51.348523296 +1000
@@ -53,7 +53,7 @@
 typedef float              F32;
 typedef double             F64;

-#if defined(_MSC_VER) && (_MSC_VER < 1300) || defined (__MINGW32__)
+#if defined(_MSC_VER) || defined (__MINGW32__)
 typedef int                BOOL;
 #else
 typedef bool               BOOL;
Binary files lastools-orig/LASzip/src/.mydefs.hpp.swp and lastools/LASzip/src/.mydefs.hpp.swp differ

Fix MSVC patch for lastools version 150406


--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -12,9 +12,7 @@
 #include <boost/asio/ssl.hpp>
 typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
 #endif
-#include "json/json_spirit_reader_template.h"
-#include "json/json_spirit_writer_template.h"
-#include "json/json_spirit_utils.h"
+#include <json_spirit.h>
 #define printf OutputDebugStringF
 // MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are
 // precompiled in headers.h.  The problem might be when the pch file goes over
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -27,6 +27,7 @@
    -l db_cxx \
    -l ssl \
    -l crypto \
+   -l json_spirit \
  -Wl,-Bdynamic \
    $(CRYPTOPPLIBS) \
    -l gthread-2.0 \

Update patch 1001 to add linkage.

Update patch 1001 to add linkage.


021-cronjob-send-only-one-message-per-notice.patch

This makes sure only one message_transport_type is used when
running the overdue notices cronjob
The code already checks if email or sms exists before running

old mode 100644
new mode 100755
index 7504c7a..2e7346f
--- a/tmp/overdue.pl
+++ b/usr/share/koha/bin/cronjobs/overdue_notices.pl
@@ -770,7 +770,7 @@ END_SQL
                             ) unless $test_mode;
                             # A print notice should be sent only once per overdue level.
                             # Without this check, a print could be sent twice or more if the library checks sms and email and print and the patron has no email or sms number.
-                            $print_sent = 1 if $effective_mtt eq 'print';
+                            $print_sent = 1;
                         }
                     }
                 }

021-cronjob-send-only-one-message-per-notice.patch

This makes sure only one message_transport_type is used when
running the overdue notices cronjob
The code already checks if email or sms exists before running

diff --git a/usr/share/koha/bin/cronjobs/overdue_notices.pl b/usr/share/koha/bin/cronjobs/overdue_notices.pl
old mode 100644
new mode 100755
index 7504c7a..2e7346f
--- a/usr/share/koha/bin/cronjobs/overdue_notices.pl
+++ b/usr/share/koha/bin/cronjobs/overdue_notices.pl
@@ -770,7 +770,7 @@ END_SQL
                             ) unless $test_mode;
                             # A print notice should be sent only once per overd
ue level.
                             # Without this check, a print could be sent twice o
r more if the library checks sms and email and print and the patron has no email
 or sms number.
-                            $print_sent = 1 if $effective_mtt eq 'print';
+                            $print_sent = 1;
                         }
                     }
                 }

Fix patch 021 overdue cronjob

Fix patch 021 overdue cronjob


diff --git a/requirements.txt b/requirements.txt
index e69de29..652997b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+boto3
+rastervision_pipeline
+awscli
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2fb0a58..6ac077d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,4 +31,10 @@ setup(
     'raster deep-learning ml computer-vision earth-observation geospatial geospatial-processing',
     packages=find_namespace_packages(exclude=['integration_tests*', 'tests*']),
     install_requires=install_requires,
-    zip_safe=False)
+    zip_safe=False,
+    entry_points={
+        'console_scripts': [
+            'rastervision=rastervision.aws_batch.aws_batch_runner:main',
+        ],
+    }
+)

diff --git a/requirements.txt b/requirements.txt
index e69de29..652997b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+boto3==1.7.*
+rastervision_pipeline==0.13.1
+awscli==1.15.*
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2fb0a58..6ac077d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,4 +31,10 @@ setup(
     'raster deep-learning ml computer-vision earth-observation geospatial geospatial-processing',
     packages=find_namespace_packages(exclude=['integration_tests*', 'tests*']),
     install_requires=install_requires,
-    zip_safe=False)
+    zip_safe=False,
+    entry_points={
+        'console_scripts': [
+            'rastervision=rastervision.aws_batch.aws_batch_runner:main',
+        ],
+    }
+)

Add versions to reqs file

Add versions to reqs file


diff --git a/openquake/engine/openquake.cfg b/openquake/engine/openquake.cfg
index 818f6882e9..a6329a3905 100644
--- a/openquake/engine/openquake.cfg
+++ b/openquake/engine/openquake.cfg
@@ -40,13 +40,15 @@ celery_queue = celery

 [dbserver]
 # enable multi_user if you have a multiple user installation
-multi_user = false
-file = ~/oqdata/db.sqlite3
-log = ~/oqdata/dbserver.log
+multi_user = true
+file = /var/lib/openquake/db.sqlite3
+log = /var/lib/openquake/dbserver.log
 host = 127.0.0.1
-# port 1908 has a good reputation:
-# https://isc.sans.edu/port.html?port=1908
-port = 1908
+# for packages we use port 1907 to avoid conflicts
+# with local development installations
+# https://isc.sans.edu/port.html?port=1907
+port = 1907
 authkey = changeme

 [zworkers]

Index: oq-engine/openquake/engine/openquake.cfg
===================================================================
--- oq-engine.orig/openquake/engine/openquake.cfg	2018-03-15 08:47:12.245368066 +0200
+++ oq-engine/openquake/engine/openquake.cfg	2018-03-15 08:47:12.245368066 +0200
@@ -39,15 +39,14 @@
 celery_queue = celery

 [dbserver]
-# enable multi_user if you have a multiple user installation
-multi_user = false
-file = ~/oqdata/db.sqlite3
-log = ~/oqdata/dbserver.log
+multi_user = true
+file = /var/lib/openquake/db.sqlite3
+log = /var/lib/openquake/dbserver.log
 host = 127.0.0.1
-# port 1908 has a good reputation:
-# https://isc.sans.edu/port.html?port=1908
-port = 1908
-authkey = changeme
+# for packages we use port 1907 to avoid conflicts
+# with local development installations
+# https://isc.sans.edu/port.html?port=1907
+port = 1907

 [zworkers]
 master_host = 127.0.0.1

Make quilt happy with the new patch

Make quilt happy with the new patch [skip ci]

Former-commit-id: f1e9028c035f129cb98cdbf8f2126a0b5d1f7ea0 [formerly f1e9028c035f129cb98cdbf8f2126a0b5d1f7ea0 [formerly fb30a3529dc5485711acb6bcd34f0c05f0d9f48d]]
Former-commit-id: 969f0fbd9023abb1ff244b81931070a0b002f39f
Former-commit-id: 29c19cca7e47b50b898c3edd347669d6d9e01fb4


--- ../src-base/common/net/minecraft/src/World.java
+++ ../src-work/common/net/minecraft/src/World.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableList;

 public abstract class World implements IBlockAccess
 {
@@ -1652,7 +1654,6 @@
             this.func_72847_b((Entity)this.field_72997_g.get(var1));
         }

-        this.field_72997_g.clear();
         this.field_72984_F.func_76318_c("regular");

         for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
@@ -3595,7 +3596,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
-        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
+        return this.field_72986_A.func_76067_t().getHorizon(this);
     }

     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)

--- ../src-base/common/net/minecraft/src/World.java
+++ ../src-work/common/net/minecraft/src/World.java
@@ -3595,7 +3595,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
-        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
+        return this.field_72986_A.func_76067_t().getHorizon(this);
     }

     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)

Fix World patch- workaround no longer required and leftovers are bad.


--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -400,6 +402,8 @@
         }

         Collections.shuffle(var2);
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (this.field_70963_i == null)
         {

--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -393,6 +395,8 @@
                 func_70949_b(var2, Item.field_77782_ar.field_77779_bT, this.field_70146_Z, 0.3F);
                 func_70949_b(var2, Item.field_77734_bj.field_77779_bT, this.field_70146_Z, 0.3F);
         }
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (var2.isEmpty())
         {

Move villager trading hook up a bit. thanks sengir.


diff --git a/python/setup.py b/python/setup.py
index 98457ae..ed9bf87 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -75,7 +75,7 @@ if compile_with_sources:
     include_dirs += [source_dir, ]
     sources = [os.path.join(source_dir, s) for s in cpp_files]
     sources += ['_alm.c', 'alm_wrapper.cpp']
-    extra_link_args.append(os.path.join(spglib_dir, "libsymspg.a"))
+    extra_link_args.append("-lsymspg")
 else:  # compile with library
     sources = ['_alm.c', 'alm_wrapper.cpp']
     # static link library

diff --git a/python/setup.py b/python/setup.py
index 98457ae..ed9bf87 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -75,7 +75,7 @@ if compile_with_sources:
     include_dirs += [source_dir, ]
     sources = [os.path.join(source_dir, s) for s in cpp_files]
     sources += ['_alm.c', 'alm_wrapper.cpp']
-    extra_link_args.append(os.path.join(spglib_dir, "libsymspg.a"))
+    extra_link_args.append("-lsymspg -lgomp")
 else:  # compile with library
     sources = ['_alm.c', 'alm_wrapper.cpp']
     # static link library

Add -lgomp to link line

Add -lgomp to link line


diff --git a/config.mk b/config.mk
index c5ebc62..14bbc3e 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,6 @@
 PREFIX ?= /usr/local
 DEBUG ?= 0
-ICEPROG ?= 1
+ICEPROG ?= 0

 CXX ?= clang++
 CC ?= clang

diff --git a/config.mk b/config.mk
index c5ebc62..14bbc3e 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,6 @@
 PREFIX ?= /usr/local
 DEBUG ?= 0
-ICEPROG ?= 1
+ICEPROG ?= 0
 PROGRAM_PREFIX ?=

 CXX ?= clang++

Fix icestorm patch to match current master

Signed-off-by: Piotr Zierhoffer <e1d19b12230bfc9d1ee7dc1e438ebc847bc06dad@antmicro.com>


--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h	2010-05-24 09:42:36.028573696 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h	2012-08-03 20:17:21.155189248 +0000
@@ -31,7 +31,7 @@
 # define O_BINARY _O_BINARY
 # define O_TEXT _O_TEXT
 #endif
-#if defined __BEOS__ || defined __HAIKU__
+#if defined __BEOS__
   /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
 # undef O_BINARY
 # undef O_TEXT

Remove whitespace at end of line in gettext patch.


--- include/apr.hw
+++ include/apr.hw
@@ -367,7 +367,7 @@
 /* If we have a TCP implementation that can be "corked", what flag
  * do we use?
  */
-#define APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@
+#define APR_TCP_NOPUSH_FLAG       0

 /* Is the TCP_NODELAY socket option inherited from listening sockets?
  */

--- /include/apr.hw
+++ /include/apr.hw
@@ -367,7 +367,7 @@
 /* If we have a TCP implementation that can be "corked", what flag
  * do we use?
  */
-#define APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@
+#define APR_TCP_NOPUSH_FLAG       0

 /* Is the TCP_NODELAY socket option inherited from listening sockets?
  */

Tweak patch so it can be applied with git apply


$NetBSD: patch-ab,v 1.1.1.1 2010/05/29 10:43:14 obache Exp $

--- src/libmojave-external/cutil/fam_kqueue.c.orig	2010-05-28 09:23:46.000000000 +0000
+++ src/libmojave-external/cutil/fam_kqueue.c
@@ -181,6 +181,12 @@ static kevent_t *new_kevent() {
     return ev;
 }

+#if defined(__NetBSD__)
+typedef intptr_t kqueue_udata_t;
+#else
+typedef void *kqueue_udata_t;
+#endif
+
 /*
  * Start monitoring a directory.
  * We store the DirInfo pointer as the userdata in the kevent.
@@ -199,7 +205,7 @@ static int monitor_start(FAMConnection *
         dir->kevent = kev;
         /* Register interest in the MON_FLAGS flags of the dir */
         EV_SET(kev, dir->handle, EVFILT_VNODE, EV_ADD | EV_CLEAR, MON_FLAGS,
-                (intptr_t) NULL, (void *)dir);
+                (intptr_t) NULL, (kqueue_udata_t) dir);
         code = kevent(fc->id, kev, 1, NULL, 0, &gTime0);
 #ifdef FAM_DEBUG
         fprintf(stderr,

$NetBSD: patch-ab,v 1.1.1.1 2010/05/29 10:43:14 obache Exp $

--- a/src/libmojave-external/cutil/fam_kqueue.c.orig	2010-05-28 09:23:46.000000000 +0000
+++ b/src/libmojave-external/cutil/fam_kqueue.c
@@ -181,6 +181,12 @@ static kevent_t *new_kevent() {
     return ev;
 }

+#if defined(__NetBSD__)
+typedef intptr_t kqueue_udata_t;
+#else
+typedef void *kqueue_udata_t;
+#endif
+
 /*
  * Start monitoring a directory.
  * We store the DirInfo pointer as the userdata in the kevent.
@@ -199,7 +205,7 @@ static int monitor_start(FAMConnection *
         dir->kevent = kev;
         /* Register interest in the MON_FLAGS flags of the dir */
         EV_SET(kev, dir->handle, EVFILT_VNODE, EV_ADD | EV_CLEAR, MON_FLAGS,
-                (intptr_t) NULL, (void *)dir);
+                (intptr_t) NULL, (kqueue_udata_t) dir);
         code = kevent(fc->id, kev, 1, NULL, 0, &gTime0);
 #ifdef FAM_DEBUG
         fprintf(stderr,

Fix omake patch to apply with -p1

Fix omake patch to apply with -p1


--- config_compilers.xml.old    2015-11-18 16:15:10.000000000 +0000
+++ config_compilers.xml        2015-11-18 16:16:08.000000000 +0000
@@ -850,4 +850,11 @@
   <TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
 </compiler>

+<compiler MACH="legion">
+  <MPICC>mpiicc</MPICC>
+  <MPIFC>mpiifort</MPIFC>
+  <ADD_SLIBS>-L/shared/ucl/apps/HDF/5-1.8.15-Intel_2015/lib -L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
+</compiler>
+
+
 </config_compilers>

--- config_compilers.xml.old	2018-07-12 14:49:05.000000000 +0100
+++ config_compilers.xml	2018-07-12 14:49:45.000000000 +0100
@@ -850,4 +850,11 @@
   <TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
 </compiler>

+<compiler MACH="legion">
+  <MPICC>mpiicc</MPICC>
+  <MPIFC>mpiifort</MPIFC>
+  <ADD_SLIBS>-L/shared/ucl/apps/HDF/5-1.8.15-Intel_2015/lib -L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
+</compiler>
+
+
 </config_compilers>

Add mkl (needed by clm4.5) to build.

Add mkl (needed by clm4.5) to build.


--- src/Terraria\Terraria.ID\MountID.cs
+++ src/tModLoader\Terraria.ID\MountID.cs
@@ -16,5 +_,21 @@
 		}

 		public const int Count = 15;
+
+		public const int Rudolph = 0;
+		public const int Bunny = 1;
+		public const int Pigron = 2;
+		public const int Slime = 3;
+		public const int Turtle = 4;
+		public const int Bee = 5;
+		public const int MineCart = 6;
+		public const int Ufo = 7;
+		public const int DrillContainmentUnit = 8;
+		public const int Scutlix = 9;
+		public const int Unicorn = 10;
+		public const int MineCartMech = 11;
+		public const int CuteFishron = 12;
+		public const int MineCartWood = 13;
+		public const int Basilisk = 14;
 	}
 }

--- src/Terraria\Terraria.ID\MountID.cs
+++ src/tModLoader\Terraria.ID\MountID.cs
@@ -15,6 +_,21 @@
 				});
 		}

-		public static int Count = 15;
+		public const int Count = 15;
+		public const int Rudolph = 0;
+		public const int Bunny = 1;
+		public const int Pigron = 2;
+		public const int Slime = 3;
+		public const int Turtle = 4;
+		public const int Bee = 5;
+		public const int MineCart = 6;
+		public const int Ufo = 7;
+		public const int DrillContainmentUnit = 8;
+		public const int Scutlix = 9;
+		public const int Unicorn = 10;
+		public const int MineCartMech = 11;
+		public const int CuteFishron = 12;
+		public const int MineCartWood = 13;
+		public const int Basilisk = 14;
 	}
 }

Fix PR 127 on my end

Fix PR 127 on my end


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a24372e..be57f32d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,14 @@ include(pyre_cuda)
 include(pyre_gsl)
 include(pyre_mpi)

-# ask git for the pyre version
-pyre_getVersion()
+# set pyre version info
+set(REPO_MAJOR 1)
+set(REPO_MINOR 9)
+set(REPO_MICRO 9)
+set(REVISION "")
+set(MAJOR ${REPO_MAJOR})
+set(MINOR ${REPO_MINOR})
+set(MICRO ${REPO_MICRO})

 # set up the project
 project(PYRE VERSION ${REPO_MAJOR}.${REPO_MINOR}.${REPO_MICRO} LANGUAGES CXX)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80c2325d..3c0f5cd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,14 +34,17 @@ include(pyre_mpi)
 include(pyre_gsl)
 include(pyre_postgres)

-# ask git for the pyre version
-pyre_getVersion()
+set(ENV_PKG_VERSION $ENV{PKG_VERSION} CACHE INTERNAL "")

 # set up the project
-project(PYRE VERSION ${REPO_MAJOR}.${REPO_MINOR}.${REPO_MICRO} LANGUAGES CXX C)
+project(PYRE VERSION "${ENV_PKG_VERSION}" LANGUAGES CXX C)
 # hmmmm
 include(GNUInstallDirs)

+set(MAJOR ${PROJECT_VERSION_MAJOR})
+set(MINOR ${PROJECT_VERSION_MINOR})
+set(MICRO ${PROJECT_VERSION_PATCH})
+
 # programs
 find_program(BASH_PROGRAM bash)

Automate version detection via conda-build PKG_VERSION


--- ./node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
+++ ./node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
@@ -767,7 +767,7 @@
 #endif
 }

-- (NSArray<RCTModuleData *> *)_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules
+- (NSArray<RCTModuleData *> *)_initializeModules:(NSArray<Class> *)modules
                                withDispatchGroup:(dispatch_group_t)dispatchGroup
                                 lazilyDiscovered:(BOOL)lazilyDiscovered
 {

--- ./node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
+++ ./node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
@@ -297,7 +297,7 @@
           @"%@ has no setter or ivar for its bridge, which is not "
            "permitted. You must either @synthesize the bridge property, "
            "or provide your own setter method.",
-          RCTBridgeModuleNameForClass(module));
+          RCTBridgeModuleNameForClass(Class(module)));
     }
   }

--- ./node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m
+++ ./node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m
@@ -270,6 +270,9 @@
     layer.contentsScale = self.animatedImageScale;
     layer.contents = (__bridge id)_currentFrame.CGImage;
   }
+  else {
+    [super displayLayer:layer];
+  }
 }

 #pragma mark - Util

Patch to fix image asset loading for react-native@0.61.5


Index: test/Makefile
===================================================================
--- test/Makefile	(revision 159991)
+++ test/Makefile	(working copy)
@@ -62,8 +62,17 @@
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-site-cfgs:: clang-site-cfg
 endif
+
+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
+endif

 # ulimits like these are redundantly enforced by the buildbots, so
 # just removing them here won't work.

Index: test/Makefile
===================================================================
--- test/Makefile	(revision 161655)
+++ test/Makefile	(working copy)
@@ -63,6 +63,15 @@
 extra-site-cfgs:: clang-site-cfg
 endif

+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
+endif
+
 ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/test

Update our patch in llvm test system.

Update our patch in llvm test system.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@45544 27541ba8-7e3a-0410-8455-c3a389f83636


diff --git tensorflow/stream_executor/cuda/cuda_gpu_executor.cc tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
index b2da109..8ee1f3a 100644
--- tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
+++ tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
@@ -870,7 +870,10 @@ CudaContext* CUDAExecutor::cuda_context() { return context_; }
 // For anything more complicated/prod-focused than this, you'll likely want to
 // turn to gsys' topology modeling.
 static int TryToReadNumaNode(const string &pci_bus_id, int device_ordinal) {
-#if defined(__APPLE__)
+#ifdef __aarch64__
+    // There is no numa_node on Jetson ARM64
+    return 0;
+#elif defined(__APPLE__)
   LOG(INFO) << "OS X does not support NUMA - returning NUMA node zero";
   return 0;
 #elif defined(PLATFORM_WINDOWS)

diff --git tensorflow/stream_executor/cuda/cuda_gpu_executor.cc tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
index b2da109..8ee1f3a 100644
--- tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
+++ tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
@@ -870,7 +870,10 @@ CudaContext* CUDAExecutor::cuda_context() { return context_; }
 // For anything more complicated/prod-focused than this, you'll likely want to
 // turn to gsys' topology modeling.
 static int TryToReadNumaNode(const string &pci_bus_id, int device_ordinal) {
-#if defined(__APPLE__)
+#ifdef __aarch64__
+    LOG(INFO) << "ARM64 does not support NUMA - returning NUMA node zero";
+    return 0;
+#elif defined(__APPLE__)
   LOG(INFO) << "OS X does not support NUMA - returning NUMA node zero";
   return 0;
 #elif defined(PLATFORM_WINDOWS)

Add log info to NUMA change

Add log info to NUMA change


Make quilt happy with the new patch

Make quilt happy with the new patch [skip ci]

Former-commit-id: fb30a3529dc5485711acb6bcd34f0c05f0d9f48d


Index: tools/Makefile
===================================================================
--- tools/Makefile	(revision 135054)
+++ tools/Makefile	(working copy)
@@ -14,7 +14,7 @@

 # Build LLDB if present. Note LLDB must be built last as it depends on the
 # wider LLVM infrastructure (including Clang).
-OPTIONAL_DIRS := lldb
+OPTIONAL_DIRS := lldb cling

 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load

Index: tools/Makefile
===================================================================
--- tools/Makefile	(revision 154661)
+++ tools/Makefile	(working copy)
@@ -22,6 +22,9 @@
 # Build LLDB if present. Note LLDB must be built last as it depends on the
 # wider LLVM infrastructure (including Clang).
 OPTIONAL_DIRS := lldb
+ifeq ($(NOCLING),)
+OPTIONAL_DIRS += cling
+endif

 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load

Add make variable NOCLING which disables the cling build

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@43727 27541ba8-7e3a-0410-8455-c3a389f83636


--- libev.spec.orig	2015-10-25 03:26:58.921978908 +0900
+++ libev.spec	2015-10-25 03:27:13.438992070 +0900
@@ -75,8 +75,7 @@ install -p -m 0644 Changes ev.pod LICENS
 %postun -p /sbin/ldconfig

 %files
-%license LICENSE
-%doc Changes README
+%doc LICENSE Changes README
 %{_libdir}/%{name}.so.4
 %{_libdir}/%{name}.so.4.0.0

--- libev.spec.orig	2015-10-26 21:10:49.489018944 +0900
+++ libev.spec	2015-10-26 21:15:16.492020449 +0900
@@ -56,6 +56,7 @@ This package contains the source code fo
 autoreconf -i

 %build
+autoreconf --force --install
 %configure --disable-static --with-pic
 make %{?_smp_mflags}

@@ -75,8 +76,7 @@ install -p -m 0644 Changes ev.pod LICENS
 %postun -p /sbin/ldconfig

 %files
-%license LICENSE
-%doc Changes README
+%doc LICENSE Changes README
 %{_libdir}/%{name}.so.4
 %{_libdir}/%{name}.so.4.0.0

libev: Add autoreconf for build with libtool-2.2.6


--- vif     2010-12-20 16:39:46.000000000 +0000
+++ vif_modified 2010-11-19 23:24:37.000000000 +0000
@@ -213,6 +213,7 @@

         # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
         xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
+       python /etc/xensource/scripts/vif_rules.py ${DOMID} online 2>&1 > /dev/null
     fi
     ;;

@@ -224,9 +225,11 @@

 remove)
     if [ "${TYPE}" = "vif" ] ;then
+       python /etc/xensource/scripts/vif_rules.py ${DOMID} offline 2>&1 > /dev/null
         xenstore-rm "${HOTPLUG}/hotplug"
     fi
     logger -t scripts-vif "${dev} has been removed"
     remove_from_bridge
     ;;
 esac
+

--- vif     2010-12-20 16:39:46.000000000 +0000
+++ vif_modified 2010-11-19 23:24:37.000000000 +0000
@@ -213,6 +213,7 @@

         # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
         xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
+       python /etc/xensource/scripts/vif_rules.py ${DOMID} online 2>&1 > /dev/null
     fi
     ;;

@@ -224,6 +225,7 @@

 remove)
     if [ "${TYPE}" = "vif" ] ;then
+       python /etc/xensource/scripts/vif_rules.py ${DOMID} offline 2>&1 > /dev/null
         xenstore-rm "${HOTPLUG}/hotplug"
     fi
     logger -t scripts-vif "${dev} has been removed"

Remove the unnecessary insertion of whitespace. This happens to be enough to match this patch apply on recent versions of XenServer / Xen Cloud Platform.


700c700
<                  memcells=None, server=None):
---
>                  memcells=None, server=None, timeout=None):
779a780,781
>         # Hacky solution for adding timing out QEPCAD.
>         qex._expect.timeout = timeout

Fix the QEPCAD timeout patch

Fix the QEPCAD timeout patch


diff --git a/tools/nasm-filter.sh b/tools/nasm-filter.sh
index 5ec9ba3..d5a10c0 100755
--- a/tools/nasm-filter.sh
+++ b/tools/nasm-filter.sh
@@ -1,6 +1,6 @@
 #/bin/sh

-# Filter out unnecessary options added by automake
+# Filter out unnecessary options added by automake and incompatible flags added by the conda build system.

 while [ -n "$*" ]; do
     case "$1" in
@@ -20,10 +20,13 @@ while [ -n "$*" ]; do
 	    options="$options $1"
 	    shift
 	    ;;
-	-I* | -i* )
-	    options="$options $1/"
-	    shift
-	    ;;
+	-isystem )  #-isystem *
+		shift
+		shift
+		;;
+	-f*'='* ) # Long debug prefixes
+		shift
+		;;
 	-D* ) # For defines we need to remove spaces
 	    case "$1" in
 		*' '* ) ;;

diff --git a/tools/nasm-filter.sh b/tools/nasm-filter.sh
index 5ec9ba3..3588d0f 100755
--- a/tools/nasm-filter.sh
+++ b/tools/nasm-filter.sh
@@ -1,6 +1,6 @@
 #/bin/sh

-# Filter out unnecessary options added by automake
+# Filter out unnecessary options added by automake and incompatible flags added by the conda build system.

 while [ -n "$*" ]; do
     case "$1" in
@@ -20,10 +20,17 @@ while [ -n "$*" ]; do
 	    options="$options $1"
 	    shift
 	    ;;
+	-isystem )  #-isystem *
+		shift
+		shift
+		;;
 	-I* | -i* )
 	    options="$options $1/"
 	    shift
 	    ;;
+  	-f*'='* ) # Long debug prefixes
+		shift
+		;;
 	-D* ) # For defines we need to remove spaces
 	    case "$1" in
 		*' '* ) ;;

Fix oversight in patch. Original file kept as much as possible


--- ../src-base/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
 import net.minecraft.server.MinecraftServer;

 public class ConsoleCommandHandler
@@ -397,7 +399,7 @@
                                 var6.func_2_b("Ban list:" + this.func_40648_a(this.field_22116_b.func_40025_r(), ", "));
                             }
                         }
-                        else
+                        else if (!FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6))
                         {
                             field_22117_a.info("Unknown console command. Type \"help\" for help.");
                         }

--- ../src-base/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
 import net.minecraft.server.MinecraftServer;

 public class ConsoleCommandHandler
@@ -397,6 +399,10 @@
                                 var6.func_2_b("Ban list:" + this.func_40648_a(this.field_22116_b.func_40025_r(), ", "));
                             }
                         }
+                        else if (FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6))
+                        {
+
+                        }
                         else
                         {
                             field_22117_a.info("Unknown console command. Type \"help\" for help.");

Tweak Console handler patch so we're more friendly to forge


Index: tools/clang/lib/Sema/SemaLookup.cpp
===================================================================
--- tools/clang/lib/Sema/SemaLookup.cpp	(revision 47284)
+++ tools/clang/lib/Sema/SemaLookup.cpp	(working copy)
@@ -1207,8 +1207,14 @@
       }
   } else {
     // Perform C++ unqualified name lookup.
-    if (CppLookupName(R, S))
+    if (CppLookupName(R, S)) {
+      if (R.isSingleResult())
+        if (const TagDecl *TD = dyn_cast<TagDecl>(R.getFoundDecl())) {
+          if (!TD->isThisDeclarationADefinition() && ExternalSource)
+            ExternalSource->LookupUnqualified(R, S);
+        }
       return true;
+    }
   }

   // If we didn't find a use of this identifier, and if the identifier

Index: tools/clang/lib/Sema/SemaLookup.cpp
===================================================================
--- tools/clang/lib/Sema/SemaLookup.cpp	(revision 47284)
+++ tools/clang/lib/Sema/SemaLookup.cpp	(working copy)
@@ -1207,8 +1207,14 @@
       }
   } else {
     // Perform C++ unqualified name lookup.
-    if (CppLookupName(R, S))
+    if (CppLookupName(R, S)) {
+      if (R.isSingleResult())
+        if (const TagDecl *TD = dyn_cast<TagDecl>(R.getFoundDecl())) {
+          if (!TD->getDefinition() && ExternalSource)
+            ExternalSource->LookupUnqualified(R, S);
+        }
       return true;
+    }
   }

   // If we didn't find a use of this identifier, and if the identifier

Update the patch corresponding to the latest change in the vendor drop.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@47561 27541ba8-7e3a-0410-8455-c3a389f83636


#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#

--- coreutils-5.0/configure.ac~configure
+++ coreutils-5.0/configure.ac
@@ -15,6 +15,7 @@
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_RANLIB
 AC_PROG_LN_S
+AC_PROG_YACC
 AC_AIX
 AC_MINIX

@@ -28,6 +29,8 @@
 	OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS hostid\$(EXEEXT)"
 	MAN="$MAN hostid.1")

+AC_FUNC_ALLOCA
+
 jm_MACROS

 AC_HEADER_TIOCGWINSZ()
--- coreutils-5.0/configure.ac	2004-01-23 14:49:55.000000000 -0500
+++ coreutils-5.0/configure.ac	2004-01-23 14:41:46.000000000 -0500
@@ -147,7 +147,7 @@
   fi
 fi

-AC_DEFUN(jm_DUMMY_1,
+AC_DEFUN([jm_DUMMY_1],
 [
   AC_REQUIRE([jm_PREREQ_READUTMP])
   if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
--- coreutils-5.0/m4/nanosleep.m4	2001-09-17 17:44:03.000000000 -0400
+++ coreutils-5.0/m4/nanosleep.m4	2004-01-23 14:47:18.000000000 -0500
@@ -12,6 +12,9 @@
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
  # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
  AC_SEARCH_LIBS(nanosleep, [rt posix4], [LIB_NANOSLEEP=$ac_cv_search_nanosleep])
+ if test "$ac_cv_search_nanosleep" = "none required"; then
+  LIB_NANOSLEEP=
+ fi
  AC_SUBST(LIB_NANOSLEEP)

  AC_CACHE_CHECK([whether nanosleep works],

Fix coreutils 5.0 builds with automake 1.8.

BKrev: 4012baccVQHXIGJbB-7-6dqHnIOYgw


--- ../src_base/common/net/minecraft/src/BlockMushroom.java
+++ ../src_work/common/net/minecraft/src/BlockMushroom.java
@@ -1,6 +1,8 @@
 package net.minecraft.src;

 import java.util.Random;
+
+import net.minecraftforge.common.ForgeDirection;

 public class BlockMushroom extends BlockFlower
 {
@@ -94,7 +96,7 @@
         if (par3 >= 0 && par3 < 256)
         {
             int var5 = par1World.getBlockId(par2, par3 - 1, par4);
-            return var5 == Block.mycelium.blockID || par1World.getFullBlockLightValue(par2, par3, par4) < 13 && this.canThisPlantGrowOnThisBlockID(var5);
+            return var5 == Block.mycelium.blockID || par1World.getFullBlockLightValue(par2, par3, par4) < 13 && canSustainPlant(par1World, par2, par3 - 1, par4, ForgeDirection.UP, this);
         }
         else
         {

--- ../src_base/common/net/minecraft/src/BlockMushroom.java
+++ ../src_work/common/net/minecraft/src/BlockMushroom.java
@@ -1,6 +1,8 @@
 package net.minecraft.src;

 import java.util.Random;
+
+import net.minecraftforge.common.ForgeDirection;

 public class BlockMushroom extends BlockFlower
 {
@@ -94,7 +96,9 @@
         if (par3 >= 0 && par3 < 256)
         {
             int var5 = par1World.getBlockId(par2, par3 - 1, par4);
-            return var5 == Block.mycelium.blockID || par1World.getFullBlockLightValue(par2, par3, par4) < 13 && this.canThisPlantGrowOnThisBlockID(var5);
+            Block soil = Block.blocksList[var5];
+            return (var5 == Block.mycelium.blockID || par1World.getFullBlockLightValue(par2, par3, par4) < 13) &&
+                   (soil != null && soil.canSustainPlant(par1World, par2, par3 - 1, par4, ForgeDirection.UP, this));
         }
         else
         {

Fix issue where mushrooms would not check the proper soil block.


--- opFns.js.orig	2016-09-27 10:00:02.000000000 +0100
+++ opFns.js	2016-09-27 10:00:59.000000000 +0100
@@ -6,6 +6,7 @@
 const logTable = require('./logTable.js')
 const ERROR = constants.ERROR
 const MAX_INT = 9007199254740991
+const fs = require('fs');

 // the opcode functions
 module.exports = {
@@ -507,6 +508,12 @@

     // add data
     log.push(mem)
+    //Added to allow tracking of instrumentation even for .call() and throw
+    let toWrite = {};
+    toWrite.address= log[0].toString('hex');
+    toWrite.topics = log[1].map(function(x){return x.toString('hex')})
+    toWrite.data = log[2].toString('hex');
+    fs.appendFileSync('./allFiredEvents', JSON.stringify(toWrite) + '\n')
     runState.logs.push(log)
   },

--- opFns.js.orig	2016-07-04 17:29:54.000000000 +0100
+++ opFns.js	2016-09-30 12:30:33.000000000 +0100
@@ -6,6 +6,7 @@
 const logTable = require('./logTable.js')
 const ERROR = constants.ERROR
 const MAX_INT = 9007199254740991
+const fs = require('fs');

 // the opcode functions
 module.exports = {
@@ -499,7 +500,6 @@
     memLength = utils.bufferToInt(memLength)
     const numOfTopics = runState.opCode - 0xa0
     const mem = memLoad(runState, memOffset, memLength)
-    subGas(runState, new BN(numOfTopics * fees.logTopicGas.v + memLength * fees.logDataGas.v))

     // add address
     var log = [runState.address]
@@ -507,6 +507,12 @@

     // add data
     log.push(mem)
+    //Added to allow tracking of instrumentation even for .call() and throw
+    let toWrite = {};
+    toWrite.address= log[0].toString('hex');
+    toWrite.topics = log[1].map(function(x){return x.toString('hex')})
+    toWrite.data = log[2].toString('hex');
+    fs.appendFileSync('./allFiredEvents', JSON.stringify(toWrite) + '\n')
     runState.logs.push(log)
   },

Remove gas cost for LOG opcode

Remove gas cost for LOG opcode

Should mean fewer alterations are required when switching between
regular testing and using solcover.


Update our patch in llvm test system.

Update our patch in llvm test system.

git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@45544 27541ba8-7e3a-0410-8455-c3a389f83636


Remove PackageManager.MATCH_SYSTEM_ONLY flag in ServiceWatcher
Patch for Android 7 "Nougat"

SPDX-FileCopyrightText: 2016, microg Project Team
SPDX-License-Identifier: CC0-1.0

diff --git a/services/core/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/ServiceWatcher.java
index 383e25a..31ae918 100644
--- a/services/core/java/com/android/server/ServiceWatcher.java
+++ b/services/core/java/com/android/server/ServiceWatcher.java
@@ -92,8 +92,7 @@ public class ServiceWatcher implements ServiceConnection {
             String pkg = initialPackageNames.get(i);
             try {
                 HashSet<Signature> set = new HashSet<Signature>();
-                Signature[] sigs = pm.getPackageInfo(pkg, PackageManager.MATCH_SYSTEM_ONLY
-                        | PackageManager.GET_SIGNATURES).signatures;
+                Signature[] sigs = pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES).signatures;
                 set.addAll(Arrays.asList(sigs));
                 sigSets.add(set);
             } catch (NameNotFoundException e) {

Add description and license to patch file


diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
index 8d201ab..05960aa 100644
--- a/tests/comparators/test_rlib.py
+++ b/tests/comparators/test_rlib.py
@@ -81,9 +81,6 @@ def rlib_dis_expected_diff():
     if actual_ver >= "7.0":
         diff_file = "rlib_llvm_dis_expected_diff_7"

-    if actual_ver >= "10.0":
-        diff_file = "rlib_llvm_dis_expected_diff_10"
-
     return get_data(diff_file)

diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff
index 7e90e428..9628efa0 100644
--- a/tests/data/pgp_signed_expected_diff
+++ b/tests/data/pgp_signed_expected_diff
@@ -5,11 +5,11 @@
  	Key ID - 0x1E953E27D4311E58
  	Next packet - other than one pass signature
  Old: Literal Data Packet(tag 11)(10255 bytes)
- 	Format - binary
+ 	Packet data format - binary
 -	Filename - test1.tar
--	File modified time - Tue Aug 25 11:47:35 UTC 2020
+-	Creation time - Tue Aug 25 11:47:35 UTC 2020
 +	Filename - test2.tar
-+	File modified time - Tue Aug 25 11:47:38 UTC 2020
++	Creation time - Tue Aug 25 11:47:38 UTC 2020
  	Literal - ...
  Old: Signature Packet(tag 2)(563 bytes)
  	Ver 4 - new

diffoscope: Fix the OpenPGP test which broke with pgpdump 0.34

This fixes a regression from the last pgpdump update: 816d311bd07
See https://github.com/NixOS/nixpkgs/pull/149700#issuecomment-991592708

Reported-by: Sergei Trofimovich <6ad7660142d568b3e41767ab107503bce5d1eb7b@gmail.com>


Update the patch corresponding to the latest change in the vendor drop.

git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@47561 27541ba8-7e3a-0410-8455-c3a389f83636


--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
@@ -161,7 +161,7 @@

             if (flag4 ^ flag5)
             {
-                flag1 = !flag4;
+                flag1 = flag5 && flag3; //Forge: Bug fix: Attempt to fill all downward space before expanding width
             }
             else
             {

--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
@@ -161,7 +161,7 @@

             if (flag4 ^ flag5)
             {
-                flag1 = !flag4;
+                flag1 = flag4; //Forge: Bug fix: Fixed inverted logic. flag1 = addNewColumn, flag4 = expandWidth
             }
             else
             {
@@ -183,7 +183,7 @@

         j = Math.max(p_94311_1_.func_94197_a(), p_94311_1_.func_94199_b());

-        if (MathHelper.func_151236_b((flag1 ? this.field_94315_d : this.field_94318_c) + j) > (flag1 ? this.field_94313_f : this.field_94316_e))
+        if (MathHelper.func_151236_b((!flag1 ? this.field_94315_d : this.field_94318_c) + j) > (!flag1 ? this.field_94313_f : this.field_94316_e)) //Forge: Width and height were swapped.
         {
             return false;
         }

Fix texture stitcher not using all avalible spaces.


--- voms-2_0_9-orig/configure.ac	2012-10-27 13:50:06.000000000 +0200
+++ voms-2_0_9/configure.ac	2013-02-06 11:41:23.765972707 +0100
@@ -105,7 +105,7 @@
 AC_SUBST(with_vomsuser)
 AC_PARSER_GEN

-AM_CONFIG_HEADER([src/autogen/config.h])
+AC_CONFIG_HEADER([src/autogen/config.h])

 if test "x$build_cpp_api" = "xyes" -o "x$build_interfaces" = "xyes"; then
 # both C and CPP

--- voms-2_0_9-orig/configure.ac	2012-10-27 13:50:06.000000000 +0200
+++ voms-2_0_9/configure.ac	2013-02-06 11:41:23.765972707 +0100
@@ -105,7 +105,7 @@
 AC_SUBST(with_vomsuser)
 AC_PARSER_GEN

-AM_CONFIG_HEADER([src/autogen/config.h])
+AC_CONFIG_HEADERS([src/autogen/config.h])

 if test "x$build_cpp_api" = "xyes" -o "x$build_interfaces" = "xyes"; then
 # both C and CPP

Update the AM_CONFIG_HEADER patch to use the correct name of the substitute macro