--- ../src-base/minecraft/net/minecraft/entity/EntityAgeable.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityAgeable.java
@@ -31,7 +31,7 @@
         {
             if (!this.field_70170_p.field_72995_K)
             {
-                Class <? extends Entity > oclass = EntityList.func_90035_a(itemstack.func_77960_j());
+                Class <? extends Entity > oclass = EntityList.field_75625_b.get(net.minecraft.item.ItemMonsterPlacer.getEntityName(itemstack));

                 if (oclass != null && this.getClass() == oclass)
                 {

Allow forge-type spawn-eggs to spawn child entities when clicking EntityAgeable


From 46104342420da83beb89a5ae83b5b27a6fe05f29 Mon Sep 17 00:00:00 2001
From: Kondapally Kalyan <kalyan.kondapally@intel.com>
Date: Sun, 25 May 2014 21:38:33 +0300
Subject: [PATCH] Temporary patch to fix linking issue.

---
 .../views/app_list/linux/app_list_service_linux.cc |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
index e6df273..e49ba00 100644
--- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
+++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
@@ -84,14 +84,18 @@ void AppListServiceLinux::MoveNearCursor(app_list::AppListView* view) {

 // static
 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
+#if defined(USE_ASH)
   if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     return AppListServiceAsh::GetInstance();
+#endif

   return AppListServiceLinux::GetInstance();
 }

 // static
 void AppListService::InitAll(Profile* initial_profile) {
+#if defined(USE_ASH)
   AppListServiceAsh::GetInstance()->Init(initial_profile);
+#endif
   AppListServiceLinux::GetInstance()->Init(initial_profile);
 }
--
1.7.9.5

Fix linking issue when building Chrome.

Garndeing: Fix linking issue when building Chrome.

Effecting CL: https://codereview.chromium.org/270383007


diff --git a/app/jquery/jquery.formbuilder.js b/app/jquery/jquery.formbuilder.js
--- a/app/jquery/jquery.formbuilder.js
+++ b/app/jquery/jquery.formbuilder.js
@@ -381,7 +381,7 @@
 					$.ajax({
 						type: "POST",
 						url: opts.save_url,
-						data: $(ul_obj).serializeFormList(),
+						data: {form: $(ul_obj).serializeFormList(), xsrf_token: window.xsrf_token},
 						success: function(xml){  }
 					});
 				}

Store the patch that sends XSRF token also with the form data in jquery formbuilder plugin.

This patch was written for jQuery formbuilder plugin v0.2. If the subsequent
versions of the plugin ever provides an API to add custom data to post, we
an get rid of this patch.

But until then we will have to apply this patch everytime we update jquery
formbuilder plugin to make sure we pass on the XSRF token along with the
formbuilder POST data, we otherwise get an AUTHORIZED REQUEST HTTP Response,
response code 403. But now the XSRF failure should be warned by the
corresponding middleware which does the check for XSRF.


diff -urN lua-5.1.3/Makefile lua-5.1.3-haiku/Makefile
--- lua-5.1.3/Makefile	2008-01-17 17:53:37.000000000 +0000
+++ lua-5.1.3-haiku/Makefile	2008-07-24 20:31:06.000000000 +0000
@@ -33,7 +33,7 @@
 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========

 # Convenience platforms targets.
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris

 # What to install.
 TO_BIN= lua luac
diff -urN lua-5.1.3/src/Makefile lua-5.1.3-haiku/src/Makefile
--- lua-5.1.3/src/Makefile	2008-01-19 19:37:58.000000000 +0000
+++ lua-5.1.3-haiku/src/Makefile	2008-07-24 20:19:12.000000000 +0000
@@ -20,7 +20,7 @@

 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========

-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris

 LUA_A=	liblua.a
 CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
@@ -95,6 +95,9 @@
 generic:
 	$(MAKE) all MYCFLAGS=

+haiku:
+	$(MAKE) all MYCFLAGS="-DLUA_ANSI" LIBS=$(MYLIBS)
+
 linux:
 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"

Patch to add Haiku as a target platform for lua


74,83c74,85
<     if version > 7:
<        # 10.5
<         try:
<             file = open("/usr/lib/python2.5/string.pyc")
<         except IOError:
<             sys.path.append("/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5")
<             import socket_live8 as socket
<         else:
<             sys.path.append("/usr/lib/python2.5")
<             import socket
---
>     import socket
>
>     # if version > 7:
>     #    # 10.5
>     #     try:
>     #         file = open("/usr/lib/python2.5/string.pyc")
>     #     except IOError:
>     #         sys.path.append("/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5")
>     #         import socket_live8 as socket
>     #     else:
>     #         sys.path.append("/usr/lib/python2.5")
>     #         import socket

Add patch file for to fix bug in LiveOSC


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

 		public static 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;
 	}
 }

Add mount names to MountIDs

Add mount names to MountIDs


From 7ae75179963246c82f554c83efdaf35f6be53efc Mon Sep 17 00:00:00 2001
From: Joshua Harlow <jxharlow@godaddy.com>
Date: Thu, 22 Sep 2016 17:18:14 -0700
Subject: [PATCH] If group provided ensure to elevate perms to call setgid

Change-Id: If8e0f2beeec81c1f05326542c196638e10ea7825
---
 functions-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-common b/functions-common
index 04f7c0f..6e166c5 100644
--- a/functions-common
+++ b/functions-common
@@ -1347,7 +1347,7 @@ function _run_process {
     # Run under ``setsid`` to force the process to become a session and group leader.
     # The pid saved can be used with pkill -g to get the entire process group.
     if [[ -n "$group" ]]; then
-        setsid sg $group "$command" & echo $! >$SERVICE_DIR/$SCREEN_NAME/$service.pid
+        sudo setsid sg $group "$command" & echo $! >$SERVICE_DIR/$SCREEN_NAME/$service.pid
     else
         setsid $command & echo $! >$SERVICE_DIR/$SCREEN_NAME/$service.pid
     fi
--
2.7.4 (Apple Git-66)

Add potential devstack change to fix sudo setgid problem

May or may not be related to lp bug #1626786


diff --git a/node_modules/os-locale/index.js b/node_modules/os-locale/index.js
index 1ada7a4..1304aa1 100644
--- a/node_modules/os-locale/index.js
+++ b/node_modules/os-locale/index.js
@@ -25,11 +25,11 @@ function getLocale(str) {
 }

 function getAppleLocale() {
-	return execa.stdout('defaults', ['read', '-g', 'AppleLocale']);
+	return execa.stdout('defaults', ['read', '-g', 'AppleLocale'], { preferLocal: false });
 }

 function getAppleLocaleSync() {
-	return execa.sync('defaults', ['read', '-g', 'AppleLocale']).stdout;
+	return execa.sync('defaults', ['read', '-g', 'AppleLocale'], { preferLocal: false }).stdout;
 }

 function getUnixLocale() {
@@ -37,7 +37,8 @@ function getUnixLocale() {
 		return getAppleLocale();
 	}

-	return execa.stdout('locale')
+	const args = null;
+	return execa.stdout('locale', args, { preferLocal: false })
 		.then(stdout => getLocale(parseLocale(stdout)));
 }

@@ -50,7 +51,7 @@ function getUnixLocaleSync() {
 }

 function getWinLocale() {
-	return execa.stdout('wmic', ['os', 'get', 'locale'])
+	return execa.stdout('wmic', ['os', 'get', 'locale'], { preferLocal: false })
 		.then(stdout => {
 			const lcidCode = parseInt(stdout.replace('Locale', ''), 16);
 			return lcid.from(lcidCode);
@@ -58,7 +59,7 @@ function getWinLocale() {
 }

 function getWinLocaleSync() {
-	const stdout = execa.sync('wmic', ['os', 'get', 'locale']).stdout;
+	const stdout = execa.sync('wmic', ['os', 'get', 'locale'], { preferLocal: false }).stdout;
 	const lcidCode = parseInt(stdout.replace('Locale', ''), 16);
 	return lcid.from(lcidCode);
 }

os-locale: Include 'preferLocal: false' option when using execa

Thanks to Rich Mirch for pointing this out.


diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 9808948..856c318 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -336,10 +336,6 @@ void LocalFrame::detach(FrameDetachType type)
     m_loader.stopAllLoaders();
     m_loader.detach();
     document()->detach();
-    // This is the earliest that scripting can be disabled:
-    // - FrameLoader::detach() can fire XHR abort events
-    // - Document::detach()'s deferred widget updates can run script.
-    ScriptForbiddenScope forbidScript;
     m_loader.clear();
     if (!client())
         return;
@@ -348,6 +344,7 @@ void LocalFrame::detach(FrameDetachType type)
     // Notify ScriptController that the frame is closing, since its cleanup ends up calling
     // back to FrameLoaderClient via WindowProxy.
     script().clearForClose();
+    ScriptForbiddenScope forbidScript;
     setView(nullptr);
     willDetachFrameHost();
     InspectorInstrumentation::frameDetachedFromParent(this);

Allow running script in willReleaseScriptContext

According to electron/electron#3699, it is unreliable to use |unload|
event for process.exit('exit'), so we have to do that in
willReleaseScriptContext.

However Chromium then disallowed scripting in willReleaseScriptContext
in https://codereview.chromium.org/1657583002, and crash will happen
when there is code doing that.

This patch reverts the change to fix the crash in Electron.


diff -ur official/framework/main.php gambit/framework/main.php
--- official/framework/main.php	2016-07-14 16:03:28.493731011 +0300
+++ gambit/framework/main.php	2016-07-14 16:14:23.069065061 +0300
@@ -13,6 +13,7 @@
  * @package framework
  * @subpackage core
  */
+/* THE GAMBIT CREW ARE AWESOME */

 if (version_compare(phpversion(), '5.3.3', '<')) {
 	header("HTTP/1.1 500 Server Error");

Add a sample patch for documentation purposes


Mark Vaile is recorded in the Hansard as voting after he left parliament! So, assuming that the Hansard is wrong.


Index: twisted/web2/error.py
===================================================================
--- twisted/web2/error.py	(revision 26969)
+++ twisted/web2/error.py	(working copy)
@@ -92,7 +92,7 @@
             "
%s
%s") % (
         response.code, title, title, message)

-    response.headers.setHeader("content-type", http_headers.MimeType('text', 'html'))
+    response.headers.setHeader("content-type", http_headers.MimeType('text', 'html', {'charset':'utf-8'}))
     response.stream = stream.MemoryStream(body)

     return response

Fix UTF-7 XSS attacks due to browser charset auto-detection.

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


From 1ce94299ca1138499910b4d29784b1cde0f1a751 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Thu, 2 Apr 2015 14:33:58 +0100
Subject: [PATCH] chaps: fixup Linux build for new SecureBlob API

Commit 89f59bbe5df changed the interface for the SecureBlob class
and updated most of the Chaps code, but some of the Linux-specific
code was missed.

BUG=None
TEST=Chaps unit tests
---
 chaps/pam_helper.cc               | 3 ++-
 chaps/token_file_manager_linux.cc | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chaps/pam_helper.cc b/chaps/pam_helper.cc
index 0c27a78954da..11d86d807439 100644
--- a/chaps/pam_helper.cc
+++ b/chaps/pam_helper.cc
@@ -82,7 +82,8 @@ bool PamHelper::GetPamPassword(pam_handle_t* pam_handle,
     return false;
   }

-  SecureBlob tmp(data_raw, strlen(data_raw));
+  string data_string(data_raw, strlen(data_raw));
+  SecureBlob tmp(data_string);
   data->swap(tmp);

   // Note: data_raw is the actual data, so should not be overwritten or freed.
diff --git a/chaps/token_file_manager_linux.cc b/chaps/token_file_manager_linux.cc
index 0e9f8bcfcf5e..00ba1c9c23c4 100644
--- a/chaps/token_file_manager_linux.cc
+++ b/chaps/token_file_manager_linux.cc
@@ -143,14 +143,14 @@ bool TokenFileManager::SaltAuthData(const FilePath& token_path,
   }

   SecureBlob out_key(kSaltedKeyBytes);
-  if (1 != PKCS5_PBKDF2_HMAC(static_cast<const char *>(auth_data.data()),
+  if (1 != PKCS5_PBKDF2_HMAC(auth_data.char_data(),
                              auth_data.size(),
                              salt.data(),
                              kSaltBytes,
                              kSaltIterations,
                              EVP_sha512(),
                              kSaltedKeyBytes,
-                             out_key.data()) {
+                             out_key.data())) {
     LOG(ERROR) << "Could not salt authorization data.";
     return false;
   }
--
2.2.0.rc0.207.ga3a616c

Add local patch for SecureBlob API fixup

This patch should disappear once the changes are accepted upstream.


--- configure.original  2015-02-14 10:21:03.614173700 +0000
+++ configure   2015-02-14 10:22:32.255918100 +0000
@@ -13,7 +13,7 @@
 ##

 #source_path="`dirname \"$0\"`"
-source_path=${0%/*}
+source_path="`pwd`"
 . "${source_path}/build/make/configure.sh"

 show_help(){
@@ -179,7 +179,7 @@
     die "Perl is required to build"
 fi

-
+source_path="`pwd`"
 if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; then
   # test to see if source_path already configured
   if [ -f "${source_path}/vpx_config.h" ]; then

Fix unfathomable directory name difficulty


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(

Fix linker errors about v8::AssertNoGCScope on Windows

    [8/9] LINK(DLL) chromiumcontent.dll
    FAILED: D:\Python27\python.exe gyp-win-tool link-wrapper environment.x86 link.exe /nologo /IMPLIB:chromiumcontent.dll.lib /DLL /OUT:chromiumcontent.dll /PDB:chromiumcontent.dll.pdb @chromiumcontent.dll.rsp && D:\Python27\python.exe gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist chromiumcontent.dll.manifest del chromiumcontent.dll.manifest && D:\Python27\python.exe gyp-win-tool manifest-wrapper environment.x86 mt.exe -nologo -manifest obj\chromiumcontent\chromiumcontent.chromiumcontent.dll.intermediate.manifest -out:chromiumcontent.dll.manifest
    v8_base.ia32.lib(v8_base.ia32.api.obj) : error LNK2005: "private: __thiscall v8::AssertNoGCScope::AssertNoGCScope(class v8::Isolate *)" (??0AssertNoGCScope@v8@@AAE@PAVIsolate@1@@Z) already defined in webcore_rendering.lib(webcore_rendering.stylevisualdata.obj)

V8 is using the DEBUG macro to control how v8::AssertNoGCScope is compiled. But
not all projects define a DEBUG macro in their Debug configurations. So now we
switch V8 to use NDEBUG instead, which is used everywhere.


--- sabnzbd/api.py.orig	2012-02-14 21:32:10.000000000 +0100
+++ sabnzbd/api.py	2012-02-14 21:32:31.000000000 +0100
@@ -26,7 +26,10 @@
 import time
 import cherrypy
 import locale
-locale.setlocale(locale.LC_ALL, "")
+try:
+    locale.setlocale(locale.LC_ALL, "")
+except:
+    pass
 try:
     import win32api, win32file
 except ImportError:

Add patch for SABnzbd: catch exception if default locale is not supported.


diff -ur a/src/common_interface.c b/src/common_interface.c
--- a/src/common_interface.c
+++ b/src/common_interface.c
@@ -51,6 +51,20 @@
 # define HTOLE_32(x)   (x)
 #endif /* linux */

+#elif defined(__GNUC__) || defined(__clang__)
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define LETOH_16(x)   __builtin_bswap16(x)
+# define HTOLE_16(x)   __builtin_bswap16(x)
+# define LETOH_32(x)   __builtin_bswap32(x)
+# define HTOLE_32(x)   __builtin_bswap32(x)
+#else
+# define LETOH_16(x)   (x)
+# define HTOLE_16(x)   (x)
+# define LETOH_32(x)   (x)
+# define HTOLE_32(x)   (x)
+#endif /* gcc or clang */
+
 #elif defined(__sun)

 #include <sys/byteorder.h>

Fix libpciaccess compilation on non-Linux systems

Both gcc and clang have __builtin_bswap16 and __builtin_bswap32.


	Sets a couple of options on the socket to the Monet DB server,
	increasing performance by a factor of 15.

	Adds a big long comment about the one socket option I didn't
	copy from MonetDB stream.c.

	To apply,

		$ cd /usr/local/lib/python2.5/site-packages/monetdb
		$ patch -p0 < mapi2.setsockopt.patch

--- /dev/null	2010-01-03 17:02:43.000000000 -0500
+++ ./mapi2.py	2010-01-04 00:30:41.000000000 -0500
@@ -66,6 +66,23 @@
         self.language = language

         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+	s = self.socket
+
+        #
+        # For performance, mirror MonetDB/src/common/stream.c socket settings.
+        #
+
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 0)
+        s.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
+        #
+        # Except for the IP packet type-of-service attribute.  Python
+        # didn't provide socket.IPTOS_THROUGHPUT, I didn't like the
+        # look of picking throughput over reliability (see ip(7)), and
+        # performance was much improved with the above two tweaks on their
+        # own.
+        #
+        #s.setsockopt(socket.IPPROTO_IP, socket.IP_TOS, socket.IPTOS_THROUGHPUT)

         try:
             self.socket.connect((hostname, port))

Patch MonetDB's Python backend so it sets socket options. Makes things faster.


--- a/CMakeLists.txt	2017-11-16 15:31:24.236356700 +0800
+++ b/CMakeLists.txt	2017-11-16 16:01:41.086054700 +0800
@@ -119,9 +119,9 @@
 project(freetype)

-if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
-  message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
-endif ()
+#if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
+#  message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
+#endif ()

 # Disallow in-source builds
 if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
@@ -163,6 +163,11 @@
 # Compiler definitions for building the library
 add_definitions(-DFT2_BUILD_LIBRARY)

+if (MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+endif ()
+

 # Find dependencies
 foreach (d ZLIB BZip2 PNG HarfBuzz)
@@ -254,6 +259,19 @@
     "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1"
     FTOPTION_H "${FTOPTION_H}")
 endif ()
+if (BUILD_SHARED_LIBS)
+  # Windows/MSVC: Define FT_EXPORT and FT_EXPORT_DEF appropriately to dllexport/dllimport when building Freetype DLL
+  if (MSVC)
+    string(REGEX REPLACE
+      "/\\* +(#define +FT_EXPORT\\(x\\)+ +extern x) +\\*/"
+      "#ifdef FT2_BUILD_LIBRARY\n# define FT_EXPORT(x) extern __declspec(dllexport) x\n#else\n# define FT_EXPORT(x) extern __declspec(dllimport) x\n#endif"
+      FTOPTION_H "${FTOPTION_H}")
+    string(REGEX REPLACE
+      "/\\* +(#define +FT_EXPORT_DEF\\(x\\)+ +x) +\\*/"
+      "#ifdef FT2_BUILD_LIBRARY\n# define FT_EXPORT_DEF(x) __declspec(dllexport) x\n#else\n# define FT_EXPORT_DEF(x) __declspec(dllimport) x\n#endif"
+      FTOPTION_H "${FTOPTION_H}")
+  endif ()
+endif ()
 file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h-new"
   "${FTOPTION_H}")
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different

Add patch for CMake builds

FreeType: Add patch for CMake builds

This enables CMake builds on Visual Studio to build DLLs, so we no
longer need to patch ftoption.h when we start to use CMake to build our
deps.


diff -Naur paragon-old/ifslinux/ufsdvfs.c paragon-new/ifslinux/ufsdvfs.c
--- paragon-old/ifslinux/ufsdvfs.c	2011-05-30 06:59:42.000000000 -0400
+++ paragon-new/ifslinux/ufsdvfs.c	2013-05-10 23:59:34.952451762 -0400
@@ -129,7 +129,7 @@
   && (defined HAVE_DECL_POSIX_ACL_FROM_XATTR && HAVE_DECL_POSIX_ACL_FROM_XATTR) \
   && !defined UFSD_DISABLE_UGM
   #include <linux/posix_acl_xattr.h>
-  #define UFSD_USE_XATTR              "Include code to support xattr and acl"
+  //#define UFSD_USE_XATTR              "Include code to support xattr and acl"
 #endif

 //

Add patch to Paragon driver

Add patch to Paragon driver


--- 8192cu.orig/os_dep/linux/ioctl_cfg80211.c	2012-08-30 10:23:18.527544335 -0400
+++ 8192cu/os_dep/linux/ioctl_cfg80211.c	2012-08-30 12:23:38.907615310 -0400
@@ -3157,11 +3157,15 @@

 	printk("%s\n", __func__);

-	if(dev)
+	/* Only allow the deletion of monitor interfaces because those are
+	   the only types that can be created */
+	if(dev && dev->type == ARPHRD_IEEE80211_RADIOTAP)
 	{
-		unregister_netdev(dev);
+		if (dev->reg_state == NETREG_REGISTERED)
+			unregister_netdevice(dev);

-		free_netdev(dev);
+		if (dev->reg_state == NETREG_UNREGISTERED)
+			free_netdev(dev);

 		if(dev == pwdev_priv->pmon_ndev)
 		{

Fix lockups deleting virtual interfaces

[wrt] 8192cu: Fix lockups deleting virtual interfaces

unregister_netdevice must be used inside the context of an ioctl because
the spinlock is already held. Also only allow deletion of monitor interfaces because that's the only kind
the driver will allow you to create.


diff -ur texinfo-4.13.orig/gnulib/lib/config.charset texinfo-4.13/gnulib/lib/config.charset
--- texinfo-4.13.orig/gnulib/lib/config.charset	2007-12-25 23:57:18.000000000 +0000
+++ texinfo-4.13/gnulib/lib/config.charset	2008-11-09 15:48:51.000000000 +0000
@@ -478,8 +478,8 @@
 	# space nevertheless.
 	echo "* UTF-8"
 	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
+    beos*|haiku*)
+	# BeOS has a single locale, and it has UTF-8 encoding. Same for Haiku.
 	echo "* UTF-8"
 	;;
     msdosdjgpp*)
diff -ur texinfo-4.13.orig/system.h texinfo-4.13/system.h
--- texinfo-4.13.orig/system.h	2008-07-26 22:54:54.000000000 +0000
+++ texinfo-4.13/system.h	2008-11-09 15:43:55.000000000 +0000
@@ -151,7 +151,7 @@
 # define va_end(args)
 #endif

-#if O_BINARY
+#if O_BINARY && !defined(__HAIKU__)
 # ifdef HAVE_IO_H
 #  include <io.h>
 # endif

Patch for texinfo 4.13a, Haiku.

Patch for texinfo 4.13a, Haiku.


From 807ef0caaf4a436b5a07e133736660fae9d91347 Mon Sep 17 00:00:00 2001
From: Robert Lehmann <robert.lehmann@sitec-systems.de>
Date: Wed, 4 Oct 2017 10:58:50 +0200
Subject: [PATCH] CMakeLists: Fix boost-python3 find routine

---
 device/iothub_client_python/CMakeLists.txt | 2 +-
 service/CMakeLists.txt                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device/iothub_client_python/CMakeLists.txt b/device/iothub_client_python/CMakeLists.txt
index 0f850b8..000dc1b 100644
--- a/device/iothub_client_python/CMakeLists.txt
+++ b/device/iothub_client_python/CMakeLists.txt
@@ -49,7 +49,7 @@ else()
     else()
         # Remove the period from python version for boost component
         string(REPLACE "." "" boost_python ${build_python})
-        find_package(Boost COMPONENTS "python-py${boost_python}")
+        find_package(Boost COMPONENTS "python3")
     endif()
 endif()

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index bf82c34..371fc89 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -49,7 +49,7 @@ else()
     else()
         # Remove the period from python version for boost component
         string(REPLACE "." "" boost_python ${build_python})
-        find_package(Boost COMPONENTS "python-py${boost_python}")
+        find_package(Boost COMPONENTS "python3")
     endif()
 endif()

--
2.1.4

Add patch for python3 build

azure-iot-sdk: Add patch for python3 build

Fix the find_package arguments for finding the boost_python3 libraries

Ticket #2053


diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
index 157d362..3ddee86 100644
--- a/modules/rtpproxy/rtpproxy.c
+++ b/modules/rtpproxy/rtpproxy.c
@@ -3914,7 +3914,11 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args, pv_spec_
 				 * 3) no ip in rtpproxy response (started using unix socket and no -l param)
 				 *    must revert to default of proxy ip
 				 */
-				newip.s = args->arg2 ? args->arg2 : argv[1] ? argv[1] : ip_addr2a(&msg->rcv.dst_ip);
+				newip.s = args->arg2 ? args->arg2 : argv[1];
+				if (newip.s == NULL) {
+					newip.s = ip_addr2a(&msg->rcv.dst_ip);
+					pf1 = msg->rcv.dst_ip.af;
+				}
 				newip.len = strlen(newip.s);
 			}
 			/* marker to double check : newport goes: str -> int -> str ?!?! */

Enable IPv6 on OpenSIPS, apply patch for the rtpproxy to handle IPv6 properly (experimental).


diff --git a/transformers/engine.io/library.js b/transformers/engine.io/library.js
index 3200bc9..aa46cec 100644
--- a/transformers/engine.io/library.js
+++ b/transformers/engine.io/library.js
@@ -2004,23 +2004,6 @@ WS.prototype.addEventListeners = function(){
 };

 /**
- * Override `onData` to use a timer on iOS.
- * See: https://gist.github.com/mloughran/2052006
- *
- * @api private
- */
-
-if ('undefined' != typeof navigator
-  && /iPad|iPhone|iPod/i.test(navigator.userAgent)) {
-  WS.prototype.onData = function(data){
-    var self = this;
-    setTimeout(function(){
-      Transport.prototype.onData.call(self, data);
-    }, 0);
-  };
-}
-
-/**
  * Writes data to socket.
  *
  * @param {Array} array of packets.

[patch] Remove workaround for iOS 5 WebSocket bug from Engine.IO client


diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index 0876ce6..48c0ba1 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -102,8 +102,8 @@ function error500(message)
 end

 function authenticator.htmlauth(validator, accs, default)
-	local user = http.formvalue("luci_username")
-	local pass = http.formvalue("luci_password")
+	local user = http.formvalue("luci_username") or http.formvalue("username")
+	local pass = http.formvalue("luci_password") or http.formvalue("password")

 	if user and validator(user, pass) then
 		return user

[wrt] Allow logins with legacy form field names for this release, still requires POST on changes


diff -ruN --label original original ./src/compiler/instruction.h
--- original
+++ ./src/compiler/instruction.h
@@ -865,7 +865,7 @@ class InstructionBlock FINAL : public ZoneObject {

 typedef ZoneDeque<Constant> ConstantDeque;
 typedef std::map<int, Constant, std::less<int>,
-                 zone_allocator<std::pair<int, Constant> > > ConstantMap;
+                 zone_allocator<std::pair<int const, Constant> > > ConstantMap;

 typedef ZoneDeque<Instruction*> InstructionDeque;
 typedef ZoneDeque<PointerMap*> PointerMapDeque;

Add v8 patch for clang 9.0

Add v8 patch for clang 9.0


Index: tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	(版本 179269)
+++ tools/clang/include/clang/Basic/DiagnosticSemaKinds.td	(工作副本)
@@ -5736,6 +5736,8 @@
 def warn_null_arg : Warning<
   "null passed to a callee which requires a non-null argument">,
   InGroup<NonNull>;
+def warn_null_ptr_deref: Warning<
+  "you are about to dereference null ptr, which probably will lead to seg violation. Do you want to proceed?[y/n]">;

 // CHECK: returning address/reference of stack memory
 def warn_ret_stack_addr : Warning<

Add the new diagnostic as a patch.

Add the new diagnostic as a patch.


Description: Remove dependency on codeNarc v0.18 as it is not available in Debian
Author: Komal Sukhani <komaldsukhani@gmail.com>
Forwarded: no
Last-Update: 2015-06-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: debian-groovy2/gradle/quality.gradle
===================================================================
--- debian-groovy2.orig/gradle/quality.gradle	2015-06-06 13:24:16.403972433 +0530
+++ debian-groovy2/gradle/quality.gradle	2015-06-06 13:27:52.359978033 +0530
@@ -46,8 +46,7 @@
         codenarcClasspath = rootProject.sourceSets.main.output +
                 project(':groovy-templates').sourceSets.main.output +
                 project(':groovy-xml').sourceSets.main.output +
-                configurations.compile +
-                files(configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)})
+                configurations.compile
     }

     tasks.withType(Checkstyle) {

Add .diff extension to patch file

Add .diff extension to patch file


--- library/Makefile.orig	2012-12-06 12:45:58.000000000 +0100
+++ library/Makefile	2012-12-06 12:46:14.000000000 +0100
@@ -4,7 +4,7 @@
 # To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your
 # environment
 #
-CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W
 OFLAGS	= -O2

 ifdef DEBUG
--- programs/Makefile.orig	2012-12-06 12:45:32.000000000 +0100
+++ programs/Makefile	2012-12-06 12:45:45.000000000 +0100
@@ -3,7 +3,7 @@
 # To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your env
 # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS

-CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
+CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W
 OFLAGS	= -O2
 LDFLAGS	+= -L../library -lpolarssl $(SYS_LDFLAGS)

Fix polarssl for powerpc and ppc824x

Fix polarssl for powerpc and ppc824x


Index: test/Makefile
===================================================================
--- test/Makefile	(revision 153954)
+++ test/Makefile	(working copy)
@@ -61,6 +61,8 @@
 ifndef TESTSUITE
 ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test

 # Force creation of Clang's lit.site.cfg.
 clang-lit-site-cfg: FORCE

Enable global check-all to include cling if checked out.

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


From 205c9b9fe98b51a03b3541ec40283337e4a689b1 Mon Sep 17 00:00:00 2001
From: Tim Horton <hortont@svn.gnome.org>
Date: Thu, 18 Jun 2009 18:54:58 -0400
Subject: [PATCH] Add annotation for gtk_tree_model_get_value's out argument

---
 gir/Gtk-custom.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gir/Gtk-custom.c b/gir/Gtk-custom.c
index 16e3ce3..f7c187d 100644
--- a/gir/Gtk-custom.c
+++ b/gir/Gtk-custom.c
@@ -1394,6 +1394,13 @@ gtk_dialog_get_vbox(GtkDialog *dialog)
  */

 /**
+ * gtk_tree_model_get_value:
+ * @iter:
+ * @column:
+ * @value: (out) (transfer none):
+ */
+
+/**
  * gtk_tree_model_iter_children:
  * @parent: (allow-none):
  */
--
1.6.3.2

Add patch to add "out" annotation to gtk_tree_model_get_value


diff -ruN orig/Control/Concurrent/Async.hs new/Control/Concurrent/Async.hs
--- orig/Control/Concurrent/Async.hs	2014-08-11 12:23:17.688591763 +0300
+++ new/Control/Concurrent/Async.hs	2014-08-11 12:23:17.000000000 +0300
@@ -246,7 +246,10 @@
 --
 {-# INLINE waitCatch #-}
 waitCatch :: Async a -> IO (Either SomeException a)
-waitCatch = atomically . waitCatchSTM
+waitCatch = tryAgain . atomically . waitCatchSTM
+  where
+    -- See: https://github.com/simonmar/async/issues/14
+    tryAgain f = f `catch` \BlockedIndefinitelyOnSTM -> f

 -- | Check whether an 'Async' has completed yet.  If it has not
 -- completed yet, then the result is @Nothing@, otherwise the result
diff -ruN orig/test/test-async.hs new/test/test-async.hs
--- orig/test/test-async.hs	2014-08-11 12:23:17.688591763 +0300
+++ new/test/test-async.hs	2014-08-11 12:23:17.000000000 +0300
@@ -29,6 +29,7 @@
          testCase "async_cancel"       async_cancel
   , testCase "async_poll"        async_poll
   , testCase "async_poll2"       async_poll2
+  , testCase "withasync_waitCatch_blocked" withasync_waitCatch_blocked
  ]

 value = 42 :: Int
@@ -104,3 +105,13 @@
   when (isNothing r) $ assertFailure ""
   r <- poll a   -- poll twice, just to check we don't deadlock
   when (isNothing r) $ assertFailure ""
+
+withasync_waitCatch_blocked :: Assertion
+withasync_waitCatch_blocked = do
+  r <- withAsync (newEmptyMVar >>= takeMVar) waitCatch
+  case r of
+    Left e ->
+        case fromException e of
+            Just BlockedIndefinitelyOnMVar -> return ()
+            Nothing -> assertFailure $ show e
+    Right () -> assertFailure ""

Patch for MVar deadlocking in async

Patch for MVar deadlocking in async


diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 06762fb..e89b1f0 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -448,15 +448,11 @@ blink::WebInputEventResult BrowserPlugin::handleInputEvent(

   DCHECK(!blink::WebInputEvent::isTouchEventType(event.type()));

-  // With direct event routing turned on, BrowserPlugin should almost never
-  // see wheel events any more. The two exceptions are (1) scroll bubbling, and
-  // (2) synthetic mouse wheels generated by touchpad GesturePinch events on
-  // Mac, which always go to the mainframe and thus may hit BrowserPlugin if
-  // it's in a top-level embedder. In both cases we should indicate the event
-  // as not handled (for GesturePinch on Mac, indicating the event has been
-  // handled leads to touchpad pinch not working).
-  if (event.type() == blink::WebInputEvent::MouseWheel)
-    return blink::WebInputEventResult::NotHandled;
+  if (event.type() == blink::WebInputEvent::MouseWheel) {
+    auto wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
+    if (wheel_event.resendingPluginId == browser_plugin_instance_id_)
+      return blink::WebInputEventResult::NotHandled;
+  }

   if (blink::WebInputEvent::isGestureEventType(event.type())) {
     auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);

Add patch to revert https://codereview.chromium.org/2745153002/

This was suggested in
https://bugs.chromium.org/p/chromium/issues/detail?id=725970#c5 to fix
electron/electron#9578.


From 7a2923020f3686b030d38c3e604b1f3801ca2e43 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <tmueller@sysgo.com>
Date: Mon, 8 Feb 2021 19:17:20 +0100
Subject: [PATCH] Fix typo in definition of netif_is_flag_set() macro

---
 src/include/lwip/netif.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index 5ecf8cdc8..6e04ce84b 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -469,7 +469,7 @@ void netif_set_gw(struct netif *netif, const ip4_addr_t *gw);

 #define netif_set_flags(netif, set_flags)     do { (netif)->flags = (u8_t)((netif)->flags |  (set_flags)); } while(0)
 #define netif_clear_flags(netif, clr_flags)   do { (netif)->flags = (u8_t)((netif)->flags & (u8_t)(~(clr_flags) & 0xff)); } while(0)
-#define netif_is_flag_set(nefif, flag)        (((netif)->flags & (flag)) != 0)
+#define netif_is_flag_set(netif, flag)        (((netif)->flags & (flag)) != 0)

 void netif_set_up(struct netif *netif);
 void netif_set_down(struct netif *netif);

pkg/lwip: Add patch to fix netif_is_flag_set macro

Had spelling mistake: `nefif` instead of `netif`.


diff --git a/vendor/github.com/containerd/containerd/defaults/defaults_unix.go b/vendor/github.com/containerd/containerd/defaults/defaults_unix.go
index 30ed42235e..e3f46720f4 100644
--- a/vendor/github.com/containerd/containerd/defaults/defaults_unix.go
+++ b/vendor/github.com/containerd/containerd/defaults/defaults_unix.go
@@ -26,7 +26,7 @@ const (
 	// transient data
 	DefaultStateDir = "/run/containerd"
 	// DefaultAddress is the default unix socket address
-	DefaultAddress = "/run/containerd/containerd.sock"
+	DefaultAddress = "/run/containerd/bogus-containerd.sock" // this includes "-bogus" to prevent "dockerd-in-snappy" from ever trying to connect to "containerd-outside-snappy" (https://forum.snapcraft.io/t/docker-snap-18-09-9-error/14171/5)
 	// DefaultDebugAddress is the default unix socket address for pprof data
 	DefaultDebugAddress = "/run/containerd/debug.sock"
 	// DefaultFIFODir is the default location used by client-side cio library

Add a patch to block containerd.sock from containerd on the host from ever being accessed

See https://forum.snapcraft.io/t/docker-snap-18-09-9-error/14171/5


diff --git a/setup.py b/setup.py
index 6667adc..79f7482 100644
--- a/setup.py
+++ b/setup.py
@@ -29,4 +29,5 @@ setup(name = 'sgp4',
         'Topic :: Scientific/Engineering :: Astronomy',
         ],
       packages = ['sgp4'],
+      package_data={'sgp4': ['tcppver.out', 'SGP4-VER.TLE', 'LICENSE'],},
       )

diff --git a/setup.py b/setup.py
index 6667adc..79f7482 100644
--- a/setup.py
+++ b/setup.py
@@ -29,4 +29,5 @@ setup(name = 'sgp4',
         'Topic :: Scientific/Engineering :: Astronomy',
         ],
       packages = ['sgp4'],
+      package_data={'sgp4': ['tcppver.out', 'SGP4-VER.TLE', },
       )

Drop LICENSE from package data

Drop LICENSE from package data


--- ../src-base/minecraft/net/minecraft/src/IntegratedServerListenThread.java
+++ ../src-work/minecraft/net/minecraft/src/IntegratedServerListenThread.java
@@ -4,6 +4,12 @@
 import cpw.mods.fml.common.asm.SideOnly;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
 import net.minecraft.server.MinecraftServer;

 @SideOnly(Side.CLIENT)
@@ -48,7 +54,32 @@

             try
             {
-                this.field_71757_g = new ServerListenThread(this, InetAddress.getLocalHost(), var1);
+                InetAddress add = null;
+                NetworkInterface notLocal = null;
+                for (NetworkInterface ni : Collections.list(NetworkInterface.getNetworkInterfaces()))
+                {
+                    if (!ni.isLoopback() && ni.isUp())
+                    {
+                        notLocal = ni;
+                        break;
+                    }
+                }
+                if (notLocal != null)
+                {
+                    for (InetAddress inadd : Collections.list(notLocal.getInetAddresses()))
+                    {
+                        if (inadd.getAddress().length == 4)
+                        {
+                            add = inadd;
+                            break;
+                        }
+                    }
+                }
+                if (add == null)
+                {
+                    add = InetAddress.getLocalHost();
+                }
+                this.field_71757_g = new ServerListenThread(this, add, var1);
                 this.field_71757_g.start();
             }
             catch (IOException var3)

Fix LAN to try hard to find a real network interface, not just localhost most of the time


diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index f893d6a..844fed4 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -197,7 +197,7 @@ void CommonSubprocessInit(const std::string& process_type) {
   setlocale(LC_NUMERIC, "C");
 #endif

-#if !defined(OFFICIAL_BUILD)
+#if 0
   // Print stack traces to stderr when crashes occur. This opens up security
   // holes so it should never be enabled for official builds.
   base::debug::EnableInProcessStackDumping();

Add patch to disable the stack dumping by default


diff --git a/src/ostreams.h b/src/ostreams.h
index e72c8ee..9f25bca 100644
--- a/src/ostreams.h
+++ b/src/ostreams.h
@@ -34,7 +34,7 @@ class OFStreamBase : public std::streambuf {

 // An output stream writing to a file.
-class V8_EXPORT_PRIVATE OFStream : public std::ostream {
+class V8_EXPORT_PRIVATE OFStream : public NON_EXPORTED_BASE(std::ostream) {
  public:
   explicit OFStream(FILE* f);
   virtual ~OFStream();

Fix the C4275 warning when building v8

Fix the C4275 warning when building v8


Update atilib to avoid a segfault

Update atilib to avoid a segfault


diff -urN vorbis-tools-1.2.0/configure.ac vorbis-tools-1.2.0-haiku/configure.ac
--- vorbis-tools-1.2.0/configure.ac	2009-02-21 06:39:35.000000000 +0000
+++ vorbis-tools-1.2.0-haiku/configure.ac	2009-02-21 06:28:52.000000000 +0000
@@ -155,6 +155,7 @@

 SOCKET_LIBS=
 AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork")
 AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")

Add -lnetwork check to vorbis-tools configure.ac


39082a39083
>
39084,39085c39085,39094
<     return replaceFromMapObject(_str, ENTITY_TO_UNICODE);
< }
---
>     var keys = Object.keys(stringMappings.entityToUnicode).join('|');
>     var translate_re = new RegExp("&(" + keys + ");", "g"),
>         translate = stringMappings.entityToUnicode,
>         translator = function($0, $1) {
>             return translate[$1];
>         };
>
>      return _str.replace(translate_re, translator);
> };
>
39098c39107
<     str = convertEntities(str)
---
>     // str = convertEntities(str)
39106c39115
<         .replace(NEWLINES, ' ');
---
>     str.replace(NEWLINES, ' ');
39230a39240
>             parti = convertEntities(parti);
46446a46457,46461
>     countrycolors: {
>         valType: 'data_array',
>         editType: 'calc',
>
>     },
59172a59188
>         coerce('countrycolors');
64155a64172
>         var color = d.countrycolor ? d.countrycolor : sclFunc(d.z);
64157c64174
<             .attr('fill', sclFunc(d.z))
---
>             .attr('fill', color)
64320a64338
>     Lib.mergeArray(trace.countrycolors, cd, 'countrycolor');
67529c67547
< });
\ No newline at end of file
---
> });

Add diff with local plotly changes

Add diff with local plotly changes


diff --git a/content/public/browser/resource_request_details.cc b/content/public/browser/resource_request_details.cc
index ad5f47e..0873a32 100644
--- a/content/public/browser/resource_request_details.cc
+++ b/content/public/browser/resource_request_details.cc
@@ -22,6 +22,10 @@ ResourceRequestDetails::ResourceRequestDetails(const net::URLRequest* request,
       ssl_cert_id(cert_id),
       ssl_cert_status(request->ssl_info().cert_status),
       socket_address(request->GetSocketAddress()) {
+  if (request->response_info().headers.get())
+    headers = new net::HttpResponseHeaders(
+        request->response_info().headers->raw_headers());
+
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   resource_type = info->GetResourceType();
   render_frame_id = info->GetRenderFrameID();
diff --git a/content/public/browser/resource_request_details.h b/content/public/browser/resource_request_details.h
index f776f4d..af13e87 100644
--- a/content/public/browser/resource_request_details.h
+++ b/content/public/browser/resource_request_details.h
@@ -10,6 +10,7 @@
 #include "content/public/common/resource_type.h"
 #include "net/base/host_port_pair.h"
 #include "net/cert/cert_status_flags.h"
+#include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"

@@ -43,6 +44,7 @@ struct ResourceRequestDetails {
   // HTTP response code. See HttpResponseHeaders::response_code().
   // -1 if there are no response headers yet.
   int http_response_code;
+  scoped_refptr<net::HttpResponseHeaders> headers;
 };

 // Details about a redirection of a resource request.

Add patch to provide headers in ResourceRequestDetails


From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 3 Nov 2021 10:17:28 +0100
Subject: [PATCH] Disable the chown tests

See https://github.com/golang/go/issues/42525 and
https://github.com/NixOS/nix/issues/3245
---
 os/os_unix_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/os/os_unix_test.go b/os/os_unix_test.go
index 51693fd..0936542 100644
--- a/src/os/os_unix_test.go
+++ b/src/os/os_unix_test.go
@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
 }

 func TestChown(t *testing.T) {
+        t.Skipf("https://github.com/golang/go/issues/42525")
 	// Use TempDir() to make sure we're on a local file system,
 	// so that the group ids returned by Getgroups will be allowed
 	// on the file. On NFS, the Getgroups groups are
@@ -83,6 +84,7 @@ func TestChown(t *testing.T) {
 }

 func TestFileChown(t *testing.T) {
+        t.Skipf("https://github.com/golang/go/issues/42525")
 	// Use TempDir() to make sure we're on a local file system,
 	// so that the group ids returned by Getgroups will be allowed
 	// on the file. On NFS, the Getgroups groups are
@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) {
 }

 func TestLchown(t *testing.T) {
+        t.Skipf("https://github.com/golang/go/issues/42525")
 	// Use TempDir() to make sure we're on a local file system,
 	// so that the group ids returned by Getgroups will be allowed
 	// on the file. On NFS, the Getgroups groups are
--
2.31.1

Fix the build in non-root sandboxes

go: Fix the build in non-root sandboxes

Workaround for <https://github.com/golang/go/issues/42525>

(Also related to <https://github.com/NixOS/nix/issues/3245>)


--- flickrapi-1.1/flickrapi/__init__.py	2008-04-15 10:18:51.000000000 -0700
+++ flickrapi-1.1-patched/flickrapi/__init__.py	2008-07-01 08:51:05.000000000 -0700
@@ -242,10 +242,15 @@ class FlickrAPI:
     def parse_etree(self, rest_xml):
         '''Parses a REST XML response from Flickr into an ElementTree object.'''

-        # Only import it here, to maintain Python 2.4 compatibility
-        import xml.etree.ElementTree
+        try:
+            import xml.etree.ElementTree

-        rsp = xml.etree.ElementTree.fromstring(rest_xml)
+            rsp = xml.etree.ElementTree.fromstring(rest_xml)
+        except ImportError:
+            # For Python 2.4 compatibility:
+            import elementtree.ElementTree
+
+            rsp = elementtree.ElementTree.fromstring(rest_xml)
         if rsp.attrib['stat'] == 'ok' or not self.fail_on_error:
             return rsp

Patch for FlickrAPI 1.1 that adds Python 2.4 compatibility when using ElementTree.

git-svn-id: f090271b2067667b50c48ba07372168c552a006f@35 356b7e19-ef4e-0410-b57b-97b486cf1154


From 84c8ea684d13cd71128de95a0939460e0d7d8827 Mon Sep 17 00:00:00 2001
From: torque <torque@1>
Date: Fri, 30 Jan 2015 22:20:54 -0800
Subject: [PATCH] Don't use approximation in rasterizer.

Removes a small amount of error for a (negligible?) loss of performance.
---
 libass/ass_rasterizer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libass/ass_rasterizer.c b/libass/ass_rasterizer.c
index ee19ad4..d520077 100644
--- a/libass/ass_rasterizer.c
+++ b/libass/ass_rasterizer.c
@@ -161,9 +161,7 @@ static inline int add_line(ASS_Rasterizer *rst, OutlinePoint pt0, OutlinePoint p
     line->a *= 1 << shift;
     line->b *= 1 << shift;
     line->c *= 1 << shift;
-    line->scale = (uint64_t)0x53333333 * (uint32_t)(max_ab * (uint64_t)max_ab >> 32) >> 32;
-    line->scale += 0x8810624D - (0xBBC6A7EF * (uint64_t)max_ab >> 32);
-    //line->scale = ((uint64_t)1 << 61) / max_ab;
+    line->scale = ((uint64_t)1 << 61) / max_ab;
     return 1;
 }

--
2.2.1

Add patch to increase libass rasterizer accuracy.


diff --git a/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.Tests/UptimeCheckServiceClientTest.g.cs b/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.Tests/UptimeCheckServiceClientTest.g.cs
index 908754958..a175b0030 100644
--- a/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.Tests/UptimeCheckServiceClientTest.g.cs
+++ b/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.Tests/UptimeCheckServiceClientTest.g.cs
@@ -14,6 +14,9 @@

 // Generated code. DO NOT EDIT!

+// Do not warn when using obsolete members
+#pragma warning disable CS0612
+
 namespace Google.Cloud.Monitoring.V3.Tests
 {
     using Google.Api.Gax;
diff --git a/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.sln b/apis/Google.Cloud.Monitoring.V3/Google.Cloud.Monitoring.V3.sln
index a68a9530d..a3f940a9e 100644

Add patch for Monitoring to suppress obsolete member warnings in unit tests

This will fix the error in #3616.


Index: include/clang/Basic/ConvertUTF.h
===================================================================
--- include/clang/Basic/ConvertUTF.h	(revision 152265)
+++ include/clang/Basic/ConvertUTF.h	(working copy)
@@ -135,6 +135,7 @@
   const UTF8** sourceStart, const UTF8* sourceEnd,
   UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);

+#define CLANG_NEEDS_THESE_ONE_DAY // LLDB wants these functions
 #ifdef CLANG_NEEDS_THESE_ONE_DAY
 ConversionResult ConvertUTF16toUTF8 (
   const UTF16** sourceStart, const UTF16* sourceEnd,

Patch for clang to include the UTF conversion routines that LLDB needs

git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@163250 91177308-0d34-0410-b5e6-96231b3b80d8


--- ../src_base/minecraft/net/minecraft/crash/CrashReportCategory.java
+++ ../src_work/minecraft/net/minecraft/crash/CrashReportCategory.java
@@ -130,8 +130,11 @@
     public int func_85073_a(int par1)
     {
         StackTraceElement[] astacktraceelement = Thread.currentThread().getStackTrace();
-        this.stackTrace = new StackTraceElement[astacktraceelement.length - 3 - par1];
-        System.arraycopy(astacktraceelement, 3 + par1, this.stackTrace, 0, this.stackTrace.length);
+        //BugFix: Causes AIOOB for stacks < 3 + par1
+        int len = astacktraceelement.length - 3 - par1;
+        if (len <= 0) len = astacktraceelement.length;
+        this.stackTrace = new StackTraceElement[len];
+        System.arraycopy(astacktraceelement, len, this.stackTrace, 0, this.stackTrace.length);
         return this.stackTrace.length;
     }

Fix AIOOB in crash report stack trimming.


From 00663891e82c32fc032ee93ab8718e32a7a643d2 Mon Sep 17 00:00:00 2001
From: Amit Prakash Ambasta <amit.ambasta@delhivery.com>
Date: Wed, 7 Jun 2017 19:37:49 +0530
Subject: [PATCH] Patch to fix invalid includedir for try_compile

---
 cmake/DetermineGflagsNamespace.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/DetermineGflagsNamespace.cmake b/cmake/DetermineGflagsNamespace.cmake
index e5e50cc..3a30df8 100755
--- a/cmake/DetermineGflagsNamespace.cmake
+++ b/cmake/DetermineGflagsNamespace.cmake
@@ -35,7 +35,7 @@ int main(int argc, char**argv)
         "${CMAKE_BINARY_DIR}" "${_check_file}"
         COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}" -DGFLAGS_NAMESPACE=${_namespace}
         LINK_LIBRARIES "${gflags_LIBRARIES}"
-        CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING="${gflags_INCLUDE_DIR}"
+        CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${gflags_INCLUDE_DIR}"
         OUTPUT_VARIABLE OUTPUT)

       if (${VARIABLE})
--
2.13.0

Patch glog for invalid includedir argument


diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index a76df80..be20f31 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -197,7 +197,7 @@ int RendererMain(const MainFunctionParams& parameters) {
     if (!no_sandbox) {
       run_loop = platform.EnableSandbox();
     } else {
-      LOG(ERROR) << "Running without renderer sandbox";
+      LOG(INFO) << "Renderer process started";
 #ifndef NDEBUG
       // For convenience, we print the stack traces for crashes.  When sandbox
       // is enabled, the in-process stack dumping is enabled as part of the

Add patch to turn sandbox error message to warm warning.


--- a/net/minecraft/client/ClientBrandRetriever.java
+++ b/net/minecraft/client/ClientBrandRetriever.java
@@ -6,6 +6,6 @@
 @OnlyIn(Dist.CLIENT)
 public class ClientBrandRetriever {
    public static String getClientModName() {
-      return "vanilla";
+      return "basin"; // BS
    }
 }

Replace the client's brand as well so Mojang doesn't get mad at us ...


From feaa0af17a4d4e1a87c7de1d53a72fe19e708286 Mon Sep 17 00:00:00 2001
From: Evgeny Eltsin <eaeltsin@google.com>
Date: Tue, 21 Dec 2010 21:06:19 +0300
Subject: [PATCH 63/63] [binutils] Force assembler to align code section size

Assembler pads code sections with NOPs, which is exactly what we need for NaCl.

This change introduces NOP padding at the end of the code section. Whitout this change, linker may add zero padding to code sections, which does not validate.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=499
TEST=code sections in object files should be padded with NOPs at the end when needed

Review URL: http://codereview.chromium.org/6001005
---
 binutils/gas/config/tc-i386.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/binutils/gas/config/tc-i386.c b/binutils/gas/config/tc-i386.c
index 6cc6b72..2140582 100644
--- a/binutils/gas/config/tc-i386.c
+++ b/binutils/gas/config/tc-i386.c
@@ -8716,6 +8716,25 @@ md_undefined_symbol (name)

 /* Round up a section size to the appropriate boundary.  */

+#ifdef TC_NACL_C
+valueT
+md_section_align (segment, size)
+     segT segment;
+     valueT size;
+{
+  if (bfd_get_section_flags (stdoutput, segment) & SEC_CODE)
+    {
+      /* For NaCl, force the code section size to be aligned. This implies
+	 padding with NOPs that is required for validation.  */
+      int align;
+
+      align = bfd_get_section_alignment (stdoutput, segment);
+      size = ((size + (1 << align) - 1) & ((valueT) -1 << align));
+    }
+
+  return size;
+}
+#else
 valueT
 md_section_align (segment, size)
      segT segment ATTRIBUTE_UNUSED;
@@ -8738,6 +8757,7 @@ md_section_align (segment, size)

   return size;
 }
+#endif

 /* On the i386, PC-relative offsets are relative to the start of the
    next instruction.  That is, the address of the offset, plus its
--
1.7.3.1

Update binutils patches from git.

Update binutils patches from git.

Review URL: http://codereview.chromium.org/6001005/

Review URL: http://codereview.chromium.org/6037008

git-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@4024 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2


diff -ruN tables-3.1.0/setup.py tables-3.1.0-new/setup.py
--- tables-3.1.0/setup.py	2014-01-20 05:05:14.000000000 -0700
+++ tables-3.1.0-new/setup.py	2014-03-22 06:41:44.636524200 -0600
@@ -357,20 +357,35 @@
     }
 elif os.name == 'nt':
     _Package = WindowsPackage
-    _platdep = {  # package tag -> platform-dependent components
+    HDF5_LIBNAMES_LACK_DLL = os.environ.get('HDF5_LIBNAMES_LACK_DLL', '')
+    if HDF5_LIBNAMES_LACK_DLL:
+      _platdep = {  # package tag -> platform-dependent components
+        'HDF5': ['hdf5', 'hdf5'],
+        'LZO2': ['lzo2', 'lzo2'],
+        'LZO': ['liblzo', 'lzo1'],
+        'BZ2': ['bzip2', 'bzip2'],
+        'BLOSC': ['blosc', 'blosc'],
+      }
+    else:
+      _platdep = {  # package tag -> platform-dependent components
         'HDF5': ['hdf5dll', 'hdf5dll'],
         'LZO2': ['lzo2', 'lzo2'],
         'LZO': ['liblzo', 'lzo1'],
         'BZ2': ['bzip2', 'bzip2'],
         'BLOSC': ['blosc', 'blosc'],
-    }
+      }

     # Copy the next DLL's to binaries by default.
     # Update these paths for your own system!
-    dll_files = ['\\windows\\system\\zlib1.dll',
-                 '\\windows\\system\\szip.dll',
-                 ]
+# Bilder builds without compression
+    # dll_files = ['\\windows\\system\\zlib1.dll',
+                 # '\\windows\\system\\szip.dll',
+                 # ]
+    dll_files = []
     if '--debug' in sys.argv:
+      if HDF5_LIBNAMES_LACK_DLL:
+        _platdep['HDF5'] = ['hdf5d', 'hdf5d']
+      else:
         _platdep['HDF5'] = ['hdf5ddll', 'hdf5ddll']

 hdf5_package = _Package("HDF5", 'HDF5', 'H5public', *_platdep['HDF5'])

Update patch for latest tables.

Update patch for latest tables.

git-svn-id: 06aac1f7aa6783202dd435920b98a457d633d0b0@1164 a9e16012-fd73-49ee-95cb-036de7809213


diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc53f08..4a09793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,6 @@ else()
     set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
 endif()

-include(OpenCVPCHSupport.cmake REQUIRED)
 include(OpenCVModule.cmake REQUIRED)

 if(UNIX)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 53a0f2f..372af8d 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -2,7 +2,6 @@ if(ANDROID)
  configure_file("${CMAKE_SOURCE_DIR}/Android.mk.modules.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
 endif()

-add_subdirectory(calib3d)
 add_subdirectory(core)
 add_subdirectory(features2d)
 add_subdirectory(flann)
@@ -13,7 +12,6 @@ if(MSVC OR MINGW)
    endif()
 endif()

-add_subdirectory(highgui)
 add_subdirectory(imgproc)
 add_subdirectory(legacy)
 add_subdirectory(contrib)
@@ -27,8 +25,6 @@ endif()
 add_subdirectory(video)

 if(NOT ANDROID)
-add_subdirectory(haartraining)
-add_subdirectory(traincascade)
 add_subdirectory(gpu)
 endif()

Add patch for OpenCV 2.2.

Add patch for OpenCV 2.2.


Index: sysklogd-1.5/Makefile
===================================================================
--- sysklogd-1.5.orig/Makefile	2009-06-09 13:02:41.000000000 +0200
+++ sysklogd-1.5/Makefile	2009-06-09 13:03:06.000000000 +0200
@@ -127,8 +127,8 @@
 	rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd

 install_exec: syslogd klogd
-	${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
-	${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
+	${INSTALL} -m 500 syslogd ${BINDIR}/syslogd
+	${INSTALL} -m 500 klogd ${BINDIR}/klogd

 install_man:
 	${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8

Remove -s (strip) from install.

sysklog-1.5: Remove -s (strip) from install.

We want OE do the stripping for us, which splits off the
debugging info instead of throwing it away.

Signed-off-by: Leon Woestenberg <be92910ae7bb6f58bb9b7c6f845bc30640119592@sidebranch.com>


--- source/execute_cmd.c	2016-08-26 05:10:08.000000000 -0600
+++ source-new/execute_cmd.c	2018-11-17 07:32:59.626764573 -0700
@@ -1335,15 +1335,17 @@
   nullcmd = (command == 0) || (command->type == cm_simple && command->value.Simple->words == 0 && command->value.Simple->redirects == 0);
   if (posixly_correct && nullcmd)
     {
-#if defined (HAVE_GETRUSAGE)
+#if defined (HAVE_GETRUSAGE) && defined (HAVE_GETTIMEOFDAY)
       selfb.ru_utime.tv_sec = kidsb.ru_utime.tv_sec = selfb.ru_stime.tv_sec = kidsb.ru_stime.tv_sec = 0;
       selfb.ru_utime.tv_usec = kidsb.ru_utime.tv_usec = selfb.ru_stime.tv_usec = kidsb.ru_stime.tv_usec = 0;
       before.tv_sec = shell_start_time;
       before.tv_usec = 0;
 #else
+#  if defined (HAVE_TIMES)
       before.tms_utime = before.tms_stime = before.tms_cutime = before.tms_cstime = 0;
       tbefore = shell_start_time;
 #endif
+#endif
     }

   old_flags = command->flags;

bash: Patch for incorrect feature checks in execute-cmd.c


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

Patch allowing if the found decl is fwd declare it asks the autoloader to try to find full one.

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


Index: fValidation.php
===================================================================
--- fValidation.php	(revision 1042)
+++ fValidation.php	(working copy)
@@ -434,11 +434,10 @@
 	 * Adds a rule to make sure at least one field of multiple has a value
 	 *
 	 * @param  string $field    One of the fields to check for a value
-	 * @param  string $field_2  Another field to check for a value
 	 * @param  string ...
 	 * @return fValidation  The validation object, to allow for method chaining
 	 */
-	public function addOneOrMoreRule($field, $field_2)
+	public function addOneOrMoreRule($field)
 	{
 		$fields = func_get_args();
 		$this->one_or_more_rules[] = $fields;

Add fValidation patch to prevent PHP warning


Index: tools/clang/lib/Sema/Sema.cpp
===================================================================
--- tools/clang/lib/Sema/Sema.cpp	(revision 47812)
+++ tools/clang/lib/Sema/Sema.cpp	(working copy)
@@ -572,7 +572,8 @@

   if (TUKind == TU_Prefix) {
     // Translation unit prefixes don't need any of the checking below.
-    TUScope = 0;
+    if (!PP.isIncrementalProcessingEnabled())
+       TUScope = 0;
     return;
   }

@@ -754,7 +755,8 @@
   assert(ParsingInitForAutoVars.empty() &&
          "Didn't unmark var as having its initializer parsed");

-  TUScope = 0;
+  if (!PP.isIncrementalProcessingEnabled())
+     TUScope = 0;
 }

Index: tools/clang/lib/Parse/Parser.cpp
===================================================================
--- tools/clang/lib/Parse/Parser.cpp	(revision 47812)
+++ tools/clang/lib/Parse/Parser.cpp	(working copy)
@@ -564,8 +564,7 @@
     // Late template parsing can begin.
     if (getLangOpts().DelayedTemplateParsing)
       Actions.SetLateTemplateParser(LateTemplateParserCallback, this);
-    if (!PP.isIncrementalProcessingEnabled())
-      Actions.ActOnEndOfTranslationUnit();
+    Actions.ActOnEndOfTranslationUnit();
     //else don't tell Sema that we ended parsing: more input might come.

     return true;

Add correspoding patch ready to go in clang's mainline.

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


diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index beb166ef89b4..f7aa3875c441 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -129,7 +129,7 @@ config("skia_library_config") {

   defines = []

-  if (!use_system_freetype) {
+  if (is_win || is_mac) {
     defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
   }

Add patch to fix linking error on arm64

Add patch to fix linking error on arm64

Currently we are seeing this linking error for arm64:
./libskia.so: undefined reference to `FT_Get_Var_Design_Coordinates'
./libskia.so: undefined reference to `FT_Set_Default_Properties'

According to https://codereview.chromium.org/2892163003, removing
SK_FREETYPE_MINIMUM_RUNTIME_VERSION should be able to fix this, but also
according to https://crbug.com/715429, removing it would cause crash on
old Android systems.

Since we are not building for Android, let's just pick the easy fix.


--- libs/lucid-http/luasrc/lucid/http/server.lua.orig	2016-02-20 08:43:54.476971044 -0500
+++ libs/lucid-http/luasrc/lucid/http/server.lua	2016-02-20 08:45:34.520744877 -0500
@@ -341,18 +341,17 @@
 end

 local hdr2env = {
-	["Content-Length"] = "CONTENT_LENGTH",
-	["Content-Type"] = "CONTENT_TYPE",
-	["Content-type"] = "CONTENT_TYPE",
-	["Accept"] = "HTTP_ACCEPT",
-	["Accept-Charset"] = "HTTP_ACCEPT_CHARSET",
-	["Accept-Encoding"] = "HTTP_ACCEPT_ENCODING",
-	["Accept-Language"] = "HTTP_ACCEPT_LANGUAGE",
-	["Connection"] = "HTTP_CONNECTION",
-	["Cookie"] = "HTTP_COOKIE",
-	["Host"] = "HTTP_HOST",
-	["Referer"] = "HTTP_REFERER",
-	["User-Agent"] = "HTTP_USER_AGENT"
+	["content-length"] = "CONTENT_LENGTH",
+	["content-type"] = "CONTENT_TYPE",
+	["accept"] = "HTTP_ACCEPT",
+	["accept-charset"] = "HTTP_ACCEPT_CHARSET",
+	["accept-encoding"] = "HTTP_ACCEPT_ENCODING",
+	["accept-language"] = "HTTP_ACCEPT_LANGUAGE",
+	["connection"] = "HTTP_CONNECTION",
+	["cookie"] = "HTTP_COOKIE",
+	["host"] = "HTTP_HOST",
+	["referer"] = "HTTP_REFERER",
+	["user-agent"] = "HTTP_USER_AGENT"
 }

 --- Parse the request headers and prepare the environment.
@@ -386,7 +385,7 @@
 			key, val = line:match("^([%w-]+)%s?:%s?(.*)")
 			if key then
 				req.headers[key] = val
-				envkey = hdr2env[key]
+				envkey = hdr2env[key:lower()]
 				if envkey then
 					env[envkey] = val
 				end

[wrt] Use case insensitive compare for adding HTTP headers into the environment


diff --git a/interpreter/llvm/src/tools/clang/lib/Sema/SemaTemplate.cpp b/interpreter/llvm/src/tools/clang/lib/Sema/SemaTemplate.cpp
index 985189b..eea2985 100644
--- a/interpreter/llvm/src/tools/clang/lib/Sema/SemaTemplate.cpp
+++ b/interpreter/llvm/src/tools/clang/lib/Sema/SemaTemplate.cpp
@@ -1462,6 +1462,13 @@ bool Sema::CheckTemplateParameterList(TemplateParameterList *NewParams,
       Invalid = true;
     }

+    if (RedundantDefaultArg &&
+        (((*OldParam)->hasAttr<AnnotateAttr>() &&
+         (*OldParam)->getAttr<AnnotateAttr>()->getAnnotation() == "rootmap") ||
+        ((*NewParam)->hasAttr<AnnotateAttr>() &&
+         (*NewParam)->getAttr<AnnotateAttr>()->getAnnotation() == "rootmap"))) {
+      RedundantDefaultArg = false;
+    }
     if (RedundantDefaultArg) {
       // C++ [temp.param]p12:
       //   A template-parameter shall not be given default arguments

Add patch for not checking duplicate template default args from rootmap.


450-add-missing-runreport-csv-headers.patch

diff --git a/misc/cronjons/runreport.pl b/misc/cronjons/runreport.pl
index 370c479..3042eec 100755
--- a/misc/cronjons/runreport.pl
+++ b/misc/cronjons/runreport.pl
@@ -274,6 +274,7 @@ foreach my $report_id (@ARGV) {
             quote_char  => $quote,
             sep_char    => $separator,
             });
+        $message .= join(',', @{ $sth->{NAME_lc} }) . "\n";
         while (my $line = $sth->fetchrow_arrayref) {
             $csv->combine(@$line);
             $message .= $csv->string() . "\n";

Add csv headers to runreports cronjob

Add csv headers to runreports cronjob


diff --git a/third_party/WebKit/Source/core/editing/EditingBehavior.h b/third_party/WebKit/Source/core/editing/EditingBehavior.h
index 2a500e3..8297121 100644
--- a/third_party/WebKit/Source/core/editing/EditingBehavior.h
+++ b/third_party/WebKit/Source/core/editing/EditingBehavior.h
@@ -69,7 +69,7 @@ public:
     // On Mac and Windows, pressing backspace (when it isn't handled otherwise) should navigate back.
     bool shouldNavigateBackOnBackspace() const
     {
-        return m_type != EditingUnixBehavior && m_type != EditingAndroidBehavior;
+        return false;
     }

     // On Mac, selecting backwards by word/line from the middle of a word/line, and then going

Add patch to disable history.back on backspace


--- /tmp/rrdtool-1.4.5/bindings/lua/rrdlua.c	2009-05-26 11:24:26.000000000 -0400
+++ rrdtool-1.4.5/bindings/lua/rrdlua.c	2011-05-21 14:57:01.836173403 -0400
@@ -66,7 +66,7 @@
   for (i=1; i<argc; i++) {
     /* accepts string or number */
     if (lua_isstring(L, i) || lua_isnumber(L, i)) {
-      if (!(argv[i] = strdup(lua_tostring (L, i)))) {
+      if (!(argv[i] = lua_tostring (L, i))) {
         /* raise an error and never return */
         luaL_error(L, "%s - error duplicating string area for arg #%d",
                    cmd, i);

Fix for memory leak in RRD LUA bindings

[openwrt] Fix for memory leak in RRD LUA bindings


--- ../src-base/minecraft/net/minecraft/block/SoundType.java
+++ ../src-work/minecraft/net/minecraft/block/SoundType.java
@@ -48,7 +48,6 @@
         return this.field_185861_n;
     }

-    @SideOnly(Side.CLIENT)
     public SoundEvent func_185845_c()
     {
         return this.field_185862_o;
@@ -64,7 +63,6 @@
         return this.field_185864_q;
     }

-    @SideOnly(Side.CLIENT)
     public SoundEvent func_185846_f()
     {
         return this.field_185865_r;

Remove sideonly on all other SoundType methods (cherry picked from commit 46c7cac)


diff --git a/transformers/sockjs/library.js b/transformers/sockjs/library.js
index 585215c..26cccb0 100644
--- a/transformers/sockjs/library.js
+++ b/transformers/sockjs/library.js
@@ -268,13 +268,14 @@ utils.userSetCode = function (code) {
 // See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/
 // and RFC 2988.
 utils.countRTO = function (rtt) {
-    var rto;
-    if (rtt > 100) {
-        rto = 3 * rtt; // rto > 300msec
-    } else {
-        rto = rtt + 200; // 200msec < rto <= 300msec
-    }
-    return rto;
+    // In a local environment, when using IE8/9 and the `jsonp-polling`
+    // transport the time needed to establish a connection (the time that pass
+    // from the opening of the transport to the call of `_dispatchOpen`) is
+    // around 200ms (the lower bound used in the official client) and this
+    // causes spurious timeouts. For this reason we calculate a value slightly
+    // larger than that used in official client.
+    if (rtt > 100) return 4 * rtt; // rto > 400ms
+    return 300 + rtt;              // 300ms < rto <= 400ms
 }

 utils.log = function() {

[fix] Add a patch for the SockJS client to prevent spurious connection timeouts


Index: django-shibsso.spec
===================================================================
--- django-shibsso.spec	(revision 20)
+++ django-shibsso.spec	(working copy)
@@ -2,13 +2,12 @@

 Summary: Shibboleth (R) Authentication Backend for Django (R).
 Name: django-shibsso
-Version: 0.1
+Version: 0.2
 Release: 2%{?dist}
 License: Apache License, Version 2.0
 Group: Development/Libraries
 Source: django-shibsso-%{version}.tar.gz
 URL: README.rst
-Packager: David Rodrigues
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Buildarch: noarch
 BuildRequires: python-devel, python-setuptools

Patch for RPM spec file

Patch for RPM spec file


diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart
index 804c5699e..572087e9d 100644
--- a/frontend_server/lib/server.dart
+++ b/frontend_server/lib/server.dart
@@ -39,6 +39,11 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{
     _compiler.acceptLastDelta();
   }

+  @override
+  Future<Null> rejectLastDelta() async {
+    return _compiler.rejectLastDelta();
+  }
+
   @override
   void invalidate(Uri uri) {
     _compiler.invalidate(uri);

Patch engine until next dart roll lands

[hhh] Patch engine until next dart roll lands

Incompatible change landed https://dart-review.googlesource.com/c/sdk/+/72540.

Change-Id: I618650964ec953ae8f0efe9c45e59ecd356a2840
Reviewed-on: https://dart-review.googlesource.com/73685
Reviewed-by: Martin Kustermann <a35dd5b79fac84b2bb3b026a16b8becc55af5961@google.com>
Reviewed-by: Ben Konyi <67ffcaedcc3dc3d87dddb9627b72dd41756b31b1@google.com>


From 9043fb8fd625ffd1ffe38bd03814ad8a776abfc1 Mon Sep 17 00:00:00 2001
From: "Andrew C. Smith" <acsmith@gumstix.com>
Date: Thu, 29 Mar 2018 16:09:52 -0400
Subject: [PATCH] Update the overlay makefile to compile the new wilink8 and
 tlv overlays.

---
 arch/arm/boot/dts/overlays/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index d4d3176..7ede187 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -103,6 +103,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
 	sdhost.dtbo \
 	sdio.dtbo \
 	sdio-1bit.dtbo \
+	sdio-wlink8.dtbo \
 	sdtweak.dtbo \
 	smi.dtbo \
 	smi-dev.dtbo \
@@ -118,6 +119,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
 	spi2-2cs.dtbo \
 	spi2-3cs.dtbo \
 	tinylcd35.dtbo \
+	tlv320aic3x-simple.dtbo \
 	uart0.dtbo \
 	uart1.dtbo \
 	vc4-fkms-v3d.dtbo \
--
2.7.4

Modify the overlay makefile to compile the Gumstix overlays for the WiLink8 and audio codec.


diff -urN faad2-2.7.orig/frontend/main.c faad2-2.7/frontend/main.c
--- faad2-2.7.orig/frontend/main.c	2011-05-15 20:09:04.131377319 +0900
+++ faad2-2.7/frontend/main.c	2011-05-15 20:09:45.972631155 +0900
@@ -1249,6 +1249,8 @@
         result = decodeAACfile(aacFileName, audioFileName, adtsFileName, writeToStdio,
             def_srate, object_type, outputFormat, format, downMatrix, infoOnly, adts_out,
             old_format, &length);
+        if (result)
+          return result;
     }

     if (!result && !infoOnly)

Add a patch to return valid error code

sample: Add a patch to return valid error code


--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2041,11 +2041,11 @@
     {"enable-wifi-credential-sync", flag_descriptions::kWifiCredentialSyncName,
      flag_descriptions::kWifiCredentialSyncDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},
+#endif  // OS_CHROMEOS
     {"enable-potentially-annoying-security-features",
      flag_descriptions::kExperimentalSecurityFeaturesName,
      flag_descriptions::kExperimentalSecurityFeaturesDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)},
-#endif  // OS_CHROMEOS
     {"mark-non-secure-as", flag_descriptions::kMarkHttpAsName,
      flag_descriptions::kMarkHttpAsDescription, kOsAll,
      MULTI_VALUE_TYPE(kMarkHttpAsChoices)},

Add enable-potentially-annoying-security-features flag to chrome://flag for all OS types

Flag enables a number of potentially annoying security features (strict
mixed content mode, powerful feature restrictions, etc.). It could be
useful for security-conscious users who don't mind a little annoyance
in their day-to-day browsing.


diff --git a/test/v3ext.c b/test/v3ext.c
index 7a240cd706..6cec6f1a9b 100644
--- a/test/v3ext.c
+++ b/test/v3ext.c
@@ -15,6 +15,7 @@
 #include <openssl/err.h>
 #include "internal/nelem.h"

+#include <string.h>
 #include "testutil.h"

 static const char *infile;

Fix compilation error when building OpenSSL 1.1.1q in MacOS 11+

"error: implicitly declaring library function 'memcmp'"
Downstream backport of https://github.com/openssl/openssl/issues/18720


=== modified file 'ngx_http_fancyindex_module.c'
--- ngx_http_fancyindex_module.c	2008-09-11 17:55:52 +0000
+++ ngx_http_fancyindex_module.c	2008-12-10 01:33:43 +0000
@@ -383,7 +383,7 @@
         entry->mtime   = ngx_de_mtime(&dir);
         entry->size    = ngx_de_size(&dir);
         entry->utf_len = (r->utf8)
-            ?  ngx_utf8_length(entry->name.data, entry->name.len)
+            ?  ngx_utf_length(entry->name.data, entry->name.len)
             : len;
     }

@@ -478,8 +478,7 @@
                 copy = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
             }

-            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
-                                          copy, entry[i].name.len);
+            b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy);
             last = b->last;

         } else {

Add patch for nginx 0.6

Add patch for nginx 0.6


diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 20efc6dc0319238ce80218cdc6977775b375d2c2..74ddc56dde3ac79459756628e3d0323cb0568c26 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -52,9 +52,10 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
     // cached and there's no more need to access the registry. If the sandbox
     // is disabled, we don't have to make this dummy call.
     std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
-
-    InitializeDWriteFontProxy();
   }
+
+  InitializeDWriteFontProxy();
+
   // TODO(robliao): This should use WebScreenInfo. See http://crbug.com/604555.
   blink::WebFontRendering::setDeviceScaleFactor(display::win::GetDPIScale());
 }

Add patch to always call InitializeDWriteFontProxy


diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
index 96a1732..745d564 100755
--- a/doc/doxyparse.pl
+++ b/doc/doxyparse.pl
@@ -273,7 +273,7 @@ foreach (keys %manpages) {

 	print MAN $MAN_MIDDLE;

-	if (defined(@$also)) {
+	if (@$also) {
 		print MAN "\n.SH SEE ALSO\n\\fI";
 		print MAN join "\\fR, \\fI", @$also;
 		print MAN "\\fR.\nAnd ";

Add fix to ldns Makefile for compiling with build environment that uses Perl 5.22+


diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc
index 9b4cbd1..0935bd67 100644
--- a/content/public/browser/browser_message_filter.cc
+++ b/content/public/browser/browser_message_filter.cc
@@ -157,7 +157,7 @@ base::TaskRunner* BrowserMessageFilter::OverrideTaskRunnerForMessage(

 bool BrowserMessageFilter::CheckCanDispatchOnUI(const IPC::Message& message,
                                                 IPC::Sender* sender) {
-#if defined(OS_WIN)
+#if 0
   // On Windows there's a potential deadlock with sync messsages going in
   // a circle from browser -> plugin -> renderer -> browser.
   // On Linux we can avoid this by avoiding sync messages from browser->plugin.

Allow handling sync message on UI thread


diff --git i/Makefile.in w/Makefile.in
index 9ea86fa..2e384af 100644
--- i/Makefile.in
+++ w/Makefile.in
@@ -30415,7 +30415,7 @@ src-maintainer-clean: src-distclean
 $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
 	$(OCT_V_JAVAC)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
 	( cd $(srcdir)/scripts/java; \
-	  "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \
+	  "$(JAVAC)" -source 1.7 -target 1.7 -Xlint:-options \
 	             -d $(abs_top_builddir)/scripts/java \
 	             $(org_octave_dir)/$(<F) )

diff --git i/scripts/java/module.mk w/scripts/java/module.mk
index 2923049..9af8e94 100644
--- i/scripts/java/module.mk
+++ w/scripts/java/module.mk
@@ -47,7 +47,7 @@ oct__v_JAVAC_1 =
 $(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp)
 	$(OCT_V_JAVAC)$(MKDIR_P) %reldir%/$(org_octave_dir) && \
 	( cd $(srcdir)/scripts/java; \
-	  "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \
+	  "$(JAVAC)" -source 1.7 -target 1.7 -Xlint:-options \
 	             -d $(abs_top_builddir)/scripts/java \
 	             $(org_octave_dir)/$(<F) )

Patch Octave 5.1.0 for java

Patch Octave 5.1.0 for java


# Apply this patch to your Erlang/OTP sources in order to
# chain function calls like
#
#   Person:new(id, "Joe"):save()
#
# To apply it, cd into your OTP source directory and type
#
#   patch -p1 < /path/to/this/patch
#
--- a/lib/stdlib/src/erl_parse.yrl	2013-02-25 13:21:31.000000000 -0600
+++ b/lib/stdlib/src/erl_parse.yrl	2013-03-26 18:54:55.000000000 -0500
@@ -253,7 +253,7 @@
 expr_700 -> record_expr : '$1'.
 expr_700 -> expr_800 : '$1'.

-expr_800 -> expr_max ':' expr_max :
+expr_800 -> expr_700 ':' expr_max :
 	{remote,?line('$2'),'$1','$3'}.
 expr_800 -> expr_max : '$1'.

Patch for chained functions e.g. foo():bar():baz()


From 03cca51b6ca935f08dbc37a9a36de2ad77cf4d30 Mon Sep 17 00:00:00 2001
From: Jianqiu Zhang <zhangjianqiu13@gmail.com>
Date: Thu, 10 Nov 2016 00:22:09 +0800
Subject: [PATCH] Fix compabability issue with NEUOJ Product version

NEUOJ has bug that json_encode will encode a int to string and D-judge cannot decode the json strcture correctly, so D-judge make config adapt with it
---
 config/config.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/config.go b/config/config.go
index bf65544..70224f3 100644
--- a/config/config.go
+++ b/config/config.go
@@ -26,15 +26,15 @@ type SystemConfig struct {
 }

 type JudgeInfo struct {
-	SubmitID      int64  `json:"submitid"`
+	SubmitID      int64  `json:"submitid,string"`
 	ContestID     int64  `json:"cid"`
-	TeamID        int64  `json:"teamid"`
-	JudgingID     int64  `json:"judgingid"`
-	ProblemID     int64  `json:"probid"`
+	TeamID        int64  `json:"teamid,string"`
+	JudgingID     int64  `json:"judgingid,string"`
+	ProblemID     int64  `json:"probid,string"`
 	Language      string `json:"langid"`
-	TimeLimit     int64  `json:"maxruntime"`
-	MemLimit      int64  `json:"memlimit"`
-	OutputLimit   int64  `json:"output_limit"`
+	TimeLimit     int64  `json:"maxruntime,string"`
+	MemLimit      int64  `json:"memlimit,string"`
+	OutputLimit   int64  `json:"output_limit,string"`
 	BuildZip      string `json:"compile_script"`
 	BuildZipMD5   string `json:"compile_script_md5sum"`
 	RunZip        string `json:"run"`
@@ -45,9 +45,9 @@ type JudgeInfo struct {
 }

 type TestcaseInfo struct {
-	TestcaseID   int64  `json:"testcaseid"`
+	TestcaseID   int64  `json:"testcaseid,string"`
 	Rank         int64  `json:"rank"`
-	ProblemID    int64  `json:"probid"`
+	ProblemID    int64  `json:"probid,string"`
 	MD5SumInput  string `json:"md5sum_input"`
 	MD5SumOutput string `json:"md5sum_output"`
 }
--
2.10.0

Add patch to fix compability with json_encode staff


--- a/utils/make_packages.sh
+++ b/utils/make_packages.sh
@@ -243,7 +243,7 @@ if [ "$type" == "deb" ]; then

         info Building binary packages locally
         pushd ${build_dir} > /dev/null 2>&1
-           BUILD_DIR="${build_dir}" INSOURCE=1 dpkg-buildpackage -rfakeroot -uc -us -b -j${jobs} || die dpkg-buildpackage failed
+           BUILD_DIR="${build_dir}" INSOURCE=1 dpkg-buildpackage -uc -us -b -j${jobs} || die dpkg-buildpackage failed
         popd > /dev/null 2>&1

         # Apparently, dpkg-buildpackage has to generate .deb files in ../ (go figure ...)

Add patch so packages can be built

Add patch so packages can be built


--- DEPS.old	2017-02-15 13:32:32.000000000 +0000
+++ DEPS	2017-02-15 13:27:38.000000000 +0000
@@ -5,7 +5,7 @@
 deps = {
   # Remember to keep the revision in sync with the Makefile.
   "v8/build/gyp":
-    "http://gyp.googlecode.com/svn/trunk@1501",
+    "https://chromium.googlesource.com/external/gyp@f7bc250ccc4d619a1cf238db87e5979f89ff36d7",
 }

 deps_os = {

Patch for v8 for new gyp repo for 3.15

Patch for v8 for new gyp repo for 3.15


--- libpng-1.2.8/scripts/makefile.linux	2004-12-03 01:14:31.000000000 +0100
+++ libpng/scripts/makefile.linux	2006-07-14 10:12:00.000000000 +0200
@@ -13,7 +13,7 @@
 # where "make install" puts libpng12.a, libpng12.so*,
 # libpng12/png.h and libpng12/pngconf.h
 # Prefix must be a full pathname.
-prefix=/usr/local
+prefix=$(PREFIX)

 # Where the zlib library and include files are located.
 #ZLIBLIB=/usr/local/lib
@@ -53,7 +53,7 @@
 # If you're going to install into a temporary location
 # via DESTDIR, $(DESTDIR)$(prefix) must already exist before
 # you execute make install.
-DESTDIR=
+#DESTDIR=

 DB=$(DESTDIR)$(BINPATH)
 DI=$(DESTDIR)$(INCPATH)

Fix libpng properly (forgot this in a previous commit).


patch-package
--- a/node_modules/express-graphql/index.js
+++ b/node_modules/express-graphql/index.js
@@ -20,6 +20,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 module.exports = graphqlHTTP;

+const parseValue = (value) => {
+  let parsedValue = value
+  if (
+    !Number.isNaN(Number(value)) &&
+    (typeof value === "string" && value.trim() !== "")
+  ) {
+    parsedValue = Number(value)
+  } else if (
+    value !== null &&
+    (value.toLowerCase() === "true" || value.toLowerCase() === "false")
+  ) {
+    parsedValue = value.toLowerCase() === "true"
+  }
+
+  return parsedValue
+}
+
 function graphqlHTTP(options) {
   if (!options) {
     throw new Error('GraphQL middleware requires options.');
@@ -81,6 +98,10 @@ function graphqlHTTP(options) {

       query = params.query;
       variables = params.variables;
+      const parsedVariables = {}
+      Object.entries(variables).forEach(([name, value]) => {
+        parsedVariables[`${name}`] = parseValue(value)
+      })
       operationName = params.operationName;
       showGraphiQL = canDisplayGraphiQL(request, params) && graphiql; // If there is no query, but GraphiQL will be displayed, do not produce
       // a result, otherwise return a 400: Bad Request.
@@ -154,7 +175,7 @@ function graphqlHTTP(options) {
           document: documentAST,
           rootValue,
           contextValue: context,
-          variableValues: variables,
+          variableValues: parsedVariables,
           operationName,
           fieldResolver,
           typeResolver

[Package] Add patch to express-graphql to parse certain string variables to booleans or ints


diff --git a/Source/platform/mac/KillRingMac.mm b/Source/platform/mac/KillRingMac.mm
index 63fd8f8..de3a3b2 100644
--- a/Source/platform/mac/KillRingMac.mm
+++ b/Source/platform/mac/KillRingMac.mm
@@ -32,12 +32,14 @@ extern "C" {

 // Kill ring calls. Would be better to use NSKillRing.h, but that's not available as API or SPI.

+#ifndef MAS_BUILD
 void _NSInitializeKillRing();
 void _NSAppendToKillRing(NSString *);
 void _NSPrependToKillRing(NSString *);
 NSString *_NSYankFromKillRing();
 void _NSNewKillRingSequence();
 void _NSSetKillRingToYankedState();
+#endif

 }

@@ -46,38 +48,52 @@ static void initializeKillRingIfNeeded()
     static bool initializedKillRing = false;
     if (!initializedKillRing) {
         initializedKillRing = true;
+#ifndef MAS_BUILD
         _NSInitializeKillRing();
+#endif
     }
 }

 void KillRing::append(const String& string)
 {
     initializeKillRingIfNeeded();
+#ifndef MAS_BUILD
     _NSAppendToKillRing(string);
+#endif
 }

 void KillRing::prepend(const String& string)
 {
     initializeKillRingIfNeeded();
+#ifndef MAS_BUILD
     _NSPrependToKillRing(string);
+#endif
 }

 String KillRing::yank()
 {
     initializeKillRingIfNeeded();
+#ifndef MAS_BUILD
     return _NSYankFromKillRing();
+#else
+    return "";
+#endif
 }

 void KillRing::startNewSequence()
 {
     initializeKillRingIfNeeded();
+#ifndef MAS_BUILD
     _NSNewKillRingSequence();
+#endif
 }

 void KillRing::setToYankedState()
 {
     initializeKillRingIfNeeded();
+#ifndef MAS_BUILD
     _NSSetKillRingToYankedState();
+#endif
 }

 } // namespace blink

mas: Add patch to disable code using private APIs in blink


diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index bc73448..053408a 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -5,7 +5,7 @@ After=network.target docker.socket
 Requires=docker.socket

 [Service]
-ExecStart=/usr/bin/docker -d -H fd://
+ExecStart=/usr/bin/docker -d -H fd:// -H unix:///var/run/docker.sock -s zfs --storage-opt zfs.fsname=mistify/guests
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576

Enable zfs graphdriver when starting Docker


diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index c20325d..0e34390 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -238,6 +238,7 @@
             '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
+            '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
             '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
             '<(tcmalloc_dir)/src/base/atomicops.h',
             '<(tcmalloc_dir)/src/base/basictypes.h',

Add patch to fix multiple definition of 'AtomicOps_Internalx86CPUFeatures'

See also:
https://code.google.com/p/chromium/issues/detail?id=455263


diff -urN vorbis-tools-1.2.0/configure.ac vorbis-tools-1.2.0-haiku/configure.ac
--- vorbis-tools-1.2.0/configure.ac	2009-02-28 18:51:08.000000000 +0000
+++ vorbis-tools-1.2.0-haiku/configure.ac	2009-02-28 18:36:00.000000000 +0000
@@ -156,6 +156,8 @@
 SOCKET_LIBS=
 AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
 AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork")
+AC_CHECK_LIB(network, gethostbyname, SOCKET_LIBS="$SOCKET_LIBS")

 dnl --------------------------------------------------
diff -urN vorbis-tools-1.2.0/oggenc/oggenc.c vorbis-tools-1.2.0-haiku/oggenc/oggenc.c
--- vorbis-tools-1.2.0/oggenc/oggenc.c	2009-02-28 18:51:09.000000000 +0000
+++ vorbis-tools-1.2.0-haiku/oggenc/oggenc.c	2009-02-28 18:49:09.000000000 +0000
@@ -262,12 +262,13 @@
             {
                 /* Create a filename from existing filename, replacing extension with .ogg or .oga */
                 char *start, *end;
+                char *extension;

                 start = infiles[i];
                 end = strrchr(infiles[i], '.');
                 end = end?end:(start + strlen(infiles[i])+1);

-                char *extension = (opt.with_skeleton) ? ".oga" : ".ogg";
+                extension = (opt.with_skeleton) ? ".oga" : ".ogg";
                 out_fn = malloc(end - start + 5);
                 strncpy(out_fn, start, end-start);
                 out_fn[end-start] = 0;

Patch to enable vorbis-tools to build on Haiku


--- gdal-2.4.1_orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
+++ gdal-2.4.1/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
@@ -83,7 +83,7 @@ int OGRwillNeverBeTrue = FALSE;
 void OGRCleanupAll()

 {
-    GDALDestroyDriverManager();
+    GDALDestroy();
 #if defined(WIN32) && defined(_MSC_VER)
 // Horrible hack: for some reason MSVC doesn't export those classes&symbols
 // if they are not referenced from the DLL itself

Add patch for OGRCleanup fct in gdal

Add patch for OGRCleanup fct in gdal


--- DOMWindow.idl	2013-06-29 04:05:12.000000000 +0800
+++ DOMWindow_mod.idl	2013-07-19 10:33:52.788062858 +0800
@@ -131,7 +131,8 @@

     [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow opener;
     [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow parent;
-    [DoNotCheckSecurityOnGetter] readonly attribute DOMWindow top;
+    // Glowstone Custom WebKit change: allow frame.top to be removed
+    [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow top;

     // DOM Level 2 AbstractView Interface
     readonly attribute Document document;

Add a patch for WebKit for full instance security isolation in frames.

Signed-off-by: Jimmie Lin <102b87741d32796bccbdd4155abf5abdf0293694@gmail.com>


Index: tools/clang/include/clang/Parse/Parser.h
===================================================================
--- tools/clang/include/clang/Parse/Parser.h	(revision 160958)
+++ tools/clang/include/clang/Parse/Parser.h	(working copy)
@@ -277,7 +277,7 @@
   /// the EOF was encountered.
   bool ParseTopLevelDecl(DeclGroupPtrTy &Result);

-private:
+protected:
   //===--------------------------------------------------------------------===//
   // Low-Level token peeking and consumption methods.
   //
@@ -676,7 +676,7 @@
     return Diag(Tok, DiagID);
   }

-private:
+protected:
   void SuggestParentheses(SourceLocation Loc, unsigned DK,
                           SourceRange ParenRange);
   void CheckNestedObjCContexts(SourceLocation AtLoc);

Add a patch in clang for testing. It will allow us to use the lookup functions on platforms where the visibility modifiers are part of the linker symbols (Eg. windows).

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


From eba362af5ea5af5ca7f36082a58a807ed0cd140f Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 25 May 2016 13:06:00 +0800
Subject: [PATCH] output/codeview.c: Fix for C89 compilers

This ensures that the latest nasm release is still buildable on pre-2013
Visual Studio.
---
 output/codeview.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/output/codeview.c b/output/codeview.c
index f9750bf..210df8b 100644
--- a/output/codeview.c
+++ b/output/codeview.c
@@ -364,6 +364,8 @@ static void register_reloc(struct coff_Section *const sect,
 {
     struct coff_Reloc *r;
     struct coff_Section *sec;
+    int i;
+    uint32_t j;

     r = *sect->tail = nasm_malloc(sizeof(struct coff_Reloc));
     sect->tail = &r->next;
@@ -375,7 +377,7 @@ static void register_reloc(struct coff_Section *const sect,
     r->type = type;

     r->symbol = 0;
-    for (int i = 0; i < coff_nsects; i++) {
+    for (i = 0; i < coff_nsects; i++) {
         sec = coff_sects[i];
         if (!strcmp(sym, sec->name)) {
             return;
@@ -384,7 +386,7 @@ static void register_reloc(struct coff_Section *const sect,
     }

     saa_rewind(coff_syms);
-    for (uint32_t i = 0; i < coff_nsyms; i++) {
+    for (j = 0; j < coff_nsyms; j++) {
         struct coff_Symbol *s = saa_rstruct(coff_syms);
         r->symbol++;
         if (s->strpos == -1 && !strcmp(sym, s->name)) {
--
2.8.1.windows.1

nasm: Add patch to build on pre-2013 Visual Studio

nasm is moving towards using C99 for its builds, so we need to patch the
code a bit to build on pre-2013 Visual Studio.


Index: tools/cling/lib/Interpreter/LookupHelper.cpp
===================================================================
--- tools/cling/lib/Interpreter/LookupHelper.cpp	(revision 46197)
+++ tools/cling/lib/Interpreter/LookupHelper.cpp	(working copy)
@@ -617,7 +617,7 @@
           //  Do template argument deduction and function argument matching.
           //
           FunctionDecl* Specialization;
-          sema::TemplateDeductionInfo TDI(Context, SourceLocation());
+          sema::TemplateDeductionInfo TDI( (SourceLocation()) );
           Sema::TemplateDeductionResult TDR
             = S.DeduceTemplateArguments(FTD,
                          const_cast<TemplateArgumentListInfo*>(FuncTemplateArgs),
Index: tools/cling/lib/Interpreter/InvocationOptions.cpp
===================================================================
--- tools/cling/lib/Interpreter/InvocationOptions.cpp	(revision 46197)
+++ tools/cling/lib/Interpreter/InvocationOptions.cpp	(working copy)
@@ -25,7 +25,7 @@
   static const OptTable::Info ClingInfoTable[] = {
 #define OPTION(NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM,              \
                HELPTEXT, METAVAR)                                       \
-    { NAME, HELPTEXT, METAVAR, Option::KIND##Class, FLAGS, PARAM,       \
+    { NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, FLAGS, PARAM, \
       OPT_##GROUP, OPT_##ALIAS },
 #include "cling/Interpreter/ClingOptions.inc"
 #undef OPTION

  Add special folder in patches - ToT (Top of Tree) for LLVM. There will go the
patches, which make cling to work with llvm's trunk, before our vendor drop gets
in sync.
  EC picks the patches from there only for our nightlies.

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


diff --git a/content/common/dom_storage/dom_storage_map.cc b/content/common/dom_storage/dom_storage_map.cc
index 71368bd..047054f 100644
--- a/content/common/dom_storage/dom_storage_map.cc
+++ b/content/common/dom_storage/dom_storage_map.cc
@@ -64,10 +64,12 @@ bool DOMStorageMap::SetItem(
   size_t new_item_size = size_of_item(key, value);
   size_t new_bytes_used = bytes_used_ - old_item_size + new_item_size;

+#if 0
   // Only check quota if the size is increasing, this allows
   // shrinking changes to pre-existing files that are over budget.
   if (new_item_size > old_item_size && new_bytes_used > quota_)
     return false;
+#endif

   values_[key] = base::NullableString16(value, false);
   ResetKeyIterator();

Add patch to disable localStorage size limit


diff --git a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
index e971477da892..bbf5304600cc 100644
--- a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
@@ -224,6 +224,11 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(const String& scheme) {
   return GetURLSchemesRegistry().cors_enabled_schemes.Contains(scheme);
 }

+void SchemeRegistry::RegisterURLSchemeAsCORSEnabled(const String& scheme) {
+  DCHECK_EQ(scheme, scheme.DeprecatedLower());
+  GetMutableURLSchemesRegistry().cors_enabled_schemes.insert(scheme);
+}
+
 String SchemeRegistry::ListOfCORSEnabledURLSchemes() {
   StringBuilder builder;
   bool add_separator = false;

Add a patch to restore a way to add custom CORS-enabled schemes

Method was removed in
https://chromium-review.googlesource.com/c/chromium/src/+/530888


--- src-reference/minecraft_server/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ src-work/minecraft_server/net/minecraft/src/NetServerHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLHandler;
 import net.minecraft.server.MinecraftServer;

 public class NetServerHandler extends NetHandler implements ICommandListener
@@ -558,7 +560,10 @@
                 }
             }

-            if (var2.startsWith("/"))
+            if (FMLHandler.instance().handleChatPacket(p_23_1_,field_16_e)) {
+              // We handled it
+            }
+            else if (var2.startsWith("/"))
             {
                 this.func_4010_d(var2);
             }
@@ -898,4 +903,9 @@
     {
         this.field_16_e.field_35214_K.field_35658_b = p_50003_1_.field_50005_b && this.field_16_e.field_35214_K.field_35659_c;
     }
+
+    @Override
+    public void func_44001_a(Packet250CustomPayload p_44001_1_) {
+      FMLHandler.instance().handlePacket250(p_44001_1_, field_16_e);
+    }
 }

Update patches for network handler

Update patches for network handler