Skip to content

Commit

Permalink
chore: deprecate apply-patches in favour of git-{import,export}-patch…
Browse files Browse the repository at this point in the history
  • Loading branch information
nornagon authored Oct 24, 2018
1 parent 4185efa commit 335e9f6
Show file tree
Hide file tree
Showing 123 changed files with 4,371 additions and 4,783 deletions.
4 changes: 1 addition & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ hooks = [
'pattern': 'src/electron',
'action': [
'python',
'src/electron/script/apply-patches',
'--project-root=.',
'--commit',
'src/electron/script/apply_all_patches.py',
],
},
{
Expand Down
1 change: 1 addition & 0 deletions patches/common/boringssl/.patches
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
implement-SSL_get_tlsext_status_type.patch
8 changes: 0 additions & 8 deletions patches/common/boringssl/.patches.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aleksei Kuzmin <[email protected]>
Date: Mon, 22 Oct 2018 10:46:33 -0700
Subject: implement-SSL_get_tlsext_status_type.patch

BoringSSL doesn't implement `SSL_get_tlsext_status_type()`,
but Node.js expects it to be present cause OpenSSL has it.

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index d04390df..0b8677ce 100644
index f693030a8a7c4bf79dd791e1abd0e94f8e97a292..59c1881b34289401e6c998cd266cb1e2fb8f7cc9 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -4120,6 +4120,8 @@ extern "C++" OPENSSL_EXPORT void SSL_CTX_sess_set_get_cb(
@@ -4293,6 +4293,8 @@ OPENSSL_EXPORT int OPENSSL_init_ssl(uint64_t opts,
// Use |SSL_enable_ocsp_stapling| instead.
OPENSSL_EXPORT int SSL_set_tlsext_status_type(SSL *ssl, int type);

Expand All @@ -12,10 +20,10 @@ index d04390df..0b8677ce 100644
// success and zero on error. On success, |ssl| takes ownership of |resp|, which
// must have been allocated by |OPENSSL_malloc|.
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index 0c004fd4..6c849b5b 100644
index c68968a514b76717d4c42448ef4b9c440c330fb2..c82ffeaa37268e54c6b142b31706d478ba93ff63 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -2723,6 +2723,14 @@ int SSL_set_tlsext_status_type(SSL *ssl, int type) {
@@ -2896,6 +2896,14 @@ int SSL_set_tlsext_status_type(SSL *ssl, int type) {
return 1;
}

Expand All @@ -30,3 +38,5 @@ index 0c004fd4..6c849b5b 100644
int SSL_set_tlsext_status_ocsp_resp(SSL *ssl, uint8_t *resp, size_t resp_len) {
if (SSL_set_ocsp_response(ssl, resp, resp_len)) {
OPENSSL_free(resp);
--
2.17.0
79 changes: 79 additions & 0 deletions patches/common/chromium/.patches
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
add_realloc.patch
build_gn.patch
dcheck.patch
accelerator.patch
app_indicator_icon_menu.patch
blink_file_path.patch
blink_local_frame.patch
blink_world_context.patch
browser_compositor_mac.patch
browser_plugin_wheel.patch
can_create_window.patch
compositor_delegate.patch
disable_hidden.patch
dom_storage_map.patch
frame_host_manager.patch
net_url_request_job.patch
no_stack_dumping.patch
out_of_process_instance.patch
render_widget_host_view_base.patch
render_widget_host_view_mac.patch
scoped_clipboard_writer.patch
stream_resource_handler.patch
thread_capabilities.patch
use_transparent_window.patch
web_contents.patch
webgl_context_attributes.patch
webview_cross_drag.patch
worker_context_will_destroy.patch
webui_in_subframes.patch
browser_plugin_guest.patch
disable_user_gesture_requirement_for_beforeunload_dialogs.patch
add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
gin_enable_disable_v8_platform.patch
blink-worker-enable-csp-in-file-scheme.patch
disable-redraw-lock.patch
v8_context_snapshot_generator.patch
boringssl_build_gn.patch
pepper_flash.patch
no_cache_storage_check.patch
blink_fix_prototype_assert.patch
libgtkui_export.patch
gtk_visibility.patch
sysroot.patch
mas_blink_no_private_api.patch
mas_no_private_api.patch
resource_file_conflict.patch
scroll_bounce_flag.patch
webview_reattach.patch
mas-cfisobjc.patch
mas-cgdisplayusesforcetogray.patch
mas-audiodeviceduck.patch
mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
allow_webview_file_url.patch
windows_cc_wrapper.patch
enable_osr_components.patch
ignore_rc_check.patch
enable_widevine.patch
chrome_key_systems.patch
allow_nested_error_trackers.patch
blink_initialization_order.patch
disable_detach_webview_frame.patch
ssl_security_state_tab_helper.patch
leveldb_ssize_t.patch
exclude-a-few-test-files-from-build.patch
crashpad_http_status.patch
expose-net-observer-api.patch
desktop_media_list.patch
proxy_config_monitor.patch
gritsettings_resource_ids.patch
isolate_holder.patch
notification_provenance.patch
content_browser_main_loop.patch
dump_syms.patch
command-ismediakey.patch
tts.patch
color_chooser.patch
printing.patch
verbose_generate_breakpad_symbols.patch
web_preferences.patch
Loading

0 comments on commit 335e9f6

Please sign in to comment.