[patch] dev-lang/dart/files

dart-1.8.patch (text/plain), 4.91 KB, created by Simon Maurer on 2015-03-22 01:19:08 UTC

--- dart/dart.gyp	2015-03-21 23:04:20.694445653 +0100
+++ dart/dart.gyp	2015-03-21 23:04:57.303929789 +0100
@@ -9,11 +9,9 @@
       'type': 'none',
       'dependencies': [
         'analysis_server',
-        'analyzer_java',
         'create_sdk',
         'dart2js',
         'dartanalyzer',
-        'editor',
         'packages',
         'runtime',
         'samples',
@@ -57,13 +55,6 @@
       ],
     },
     {
-      'target_name': 'analyzer_java',
-      'type': 'none',
-      'dependencies': [
-        'editor/analyzer_java.gyp:analyzer',
-      ],
-    },
-    {
       'target_name': 'dartfmt',
       'type': 'none',
       'dependencies': [
@@ -132,45 +123,6 @@
       ],
     },
     {
-      'target_name': 'editor',
-      'type': 'none',
-      'dependencies': [
-        'editor/build/generated/editor_deps.gyp:editor_deps',
-
-        # This dependency on create_sdk does not mean that the
-        # Editor is rebuilt if the SDK is. It only means that when you build
-        # the Editor, you should also build the SDK. If we wanted to
-        # make sure that the editor is rebuilt when the SDK is, we
-        # should list a *file* in PRODUCT_DIR which the action below
-        # uses as input.
-        # This is the desired behavior as we would otherwise have to
-        # rebuild the editor each time the VM, dart2js, or library
-        # code changes.
-        'create_sdk',
-      ],
-      'actions': [
-        {
-          'action_name': 'create_editor_py',
-          'inputs': [
-            'tools/create_editor.py',
-            '<(SHARED_INTERMEDIATE_DIR)/editor_deps/editor.stamp',
-            '<!@(["python", "tools/list_files.py", "", "editor/tools/features/'
-            'com.google.dart.tools.deploy.feature_releng"])',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/editor/VERSION',
-          ],
-          'action': [
-            'python',
-            'tools/create_editor.py',
-            '--out', '<(PRODUCT_DIR)/editor',
-            '--build', '<(INTERMEDIATE_DIR)',
-          ],
-          'message': 'Creating editor.',
-        },
-      ],
-    },
-    {
       'target_name': 'samples',
       'type': 'none',
       'dependencies': [],
--- dart/runtime/bin/filter.h	2015-03-21 00:57:35.095531828 +0100
+++ dart/runtime/bin/filter.h	2015-03-21 00:57:51.575259265 +0100
@@ -8,7 +8,7 @@
 #include "bin/builtin.h"
 #include "bin/utils.h"
 
-#include "../third_party/zlib/zlib.h"
+#include <zlib.h>
 
 
 namespace dart {
--- dart/runtime/bin/bin.gypi	2015-03-21 01:14:13.148993894 +0100
+++ dart/runtime/bin/bin.gypi	2015-03-21 01:14:23.248825763 +0100
@@ -189,11 +189,6 @@
         'io_natives.cc',
       ],
       'conditions': [
-        ['dart_io_support==1', {
-          'dependencies': [
-            'bin/net/ssl.gyp:libssl_dart',
-          ],
-        }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-liphlpapi.lib' ],

--- dart/runtime/bin/io_impl_sources.gypi	2015-03-21 01:04:48.468364141 +0100
+++ dart/runtime/bin/io_impl_sources.gypi	2015-03-21 08:53:45.235172959 +0100
@@ -5,6 +5,22 @@
 # This file contains some C++ sources for the dart:io library.  The other
 # implementation files are in builtin_impl_sources.gypi.
 {
+  'include_dirs': [
+    '<(sysroot)/usr/include/nspr',
+    '<(sysroot)/usr/include/nss',
+  ],
+  'link_settings': {
+    'libraries': [
+      '-lplds4',
+      '-lplc4', 
+      '-lnspr4',
+      '-lssl3',
+      '-lsmime3',
+      '-lnss3',
+      '-lnssutil3',
+      '-lz',
+    ],
+  },
   'sources': [
     'eventhandler.cc',
     'eventhandler.h',
--- dart/runtime/bin/secure_socket.cc	2015-03-21 12:00:08.795532214 +0100
+++ dart/runtime/bin/secure_socket.cc	2015-03-21 11:56:29.369045550 +0100
@@ -665,6 +665,40 @@
 }
 
 
+static CERTCertificate *
+FindCertByNameString(CERTCertDBHandle *handle, char *nameStr)
+{
+    CERTName *name;
+    SECItem *nameItem;
+    CERTCertificate *cert = NULL;
+    PLArenaPool *arena = NULL;
+    
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    
+    if ( arena == NULL ) {
+	goto loser;
+    }
+    
+    name = CERT_AsciiToName(nameStr);
+    
+    if ( name ) {
+	nameItem = SEC_ASN1EncodeItem (arena, NULL, (void *)name,
+				       CERT_NameTemplate);
+	if ( nameItem != NULL ) {
+            cert = CERT_FindCertByName(handle, nameItem);
+	}
+	CERT_DestroyName(name);
+    }
+
+loser:
+    if ( arena ) {
+	PORT_FreeArena(arena, PR_FALSE);
+    }
+    
+    return(cert);
+}
+
+
 void SSLFilter::Connect(const char* host_name,
                         RawAddr* raw_addr,
                         int port,
@@ -740,7 +774,7 @@
         ThrowPRException("CertificateException",
                          "Certificate database cannot be loaded");
       }
-      certificate = CERT_FindCertByNameString(certificate_database,
+      certificate = FindCertByNameString(certificate_database,
           const_cast<char*>(certificate_name));
       if (certificate == NULL) {
         ThrowCertificateException(