From a9e4500b2884a19e596de7238cdce95232d27bb6 Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Fri, 25 Jan 2019 21:00:54 -0700 Subject: [PATCH] draft --- README.MD | 2 +- patches/integration/10_0_load_scripts.patch | 4 ++-- patches/integration/10_1_compile_flags.patch | 16 ++++++++-------- .../integration/10_2_extended_resources.patch | 12 ++++++------ patches/integration/10_6_lint_filters.patch | 14 +++++++------- patches/integration/30_1_editor_settings.patch | 4 ++-- term/data.js | 6 +++--- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.MD b/README.MD index 7337740..f0152ee 100644 --- a/README.MD +++ b/README.MD @@ -4,7 +4,7 @@ Restarting fresh A patch driven fork of uBlock Origin. -Upstream commit pin: `3dac43eab6096ad57ec372eb67cf9bd5bb012718` or `1.18.0` +Upstream commit pin: `54eb996e105e7ef33d33f531a435057830f5ec8e` or `1.18.1rc0` **Please submit issues to the [Nano Core issues tracker](https://github.com/NanoAdblocker/NanoCore/issues).** diff --git a/patches/integration/10_0_load_scripts.patch b/patches/integration/10_0_load_scripts.patch index d5d7153..622597c 100644 --- a/patches/integration/10_0_load_scripts.patch +++ b/patches/integration/10_0_load_scripts.patch @@ -18,10 +18,10 @@ index 29b9a297..b6f4e760 100644 diff --git a/src/js/background.js b/src/js/background.js -index 8f4a70a9..631b33df 100644 +index 37dff9d9..239411bb 100644 --- a/src/js/background.js +++ b/src/js/background.js -@@ -189,3 +189,7 @@ const µBlock = (function() { // jshint ignore:line +@@ -190,3 +190,7 @@ const µBlock = (function() { // jshint ignore:line })(); /******************************************************************************/ diff --git a/patches/integration/10_1_compile_flags.patch b/patches/integration/10_1_compile_flags.patch index b15de72..205d0da 100644 --- a/patches/integration/10_1_compile_flags.patch +++ b/patches/integration/10_1_compile_flags.patch @@ -1,8 +1,8 @@ diff --git a/src/js/background.js b/src/js/background.js -index 631b33df..d133d38b 100644 +index 239411bb..33b4b81b 100644 --- a/src/js/background.js +++ b/src/js/background.js -@@ -50,6 +50,9 @@ const µBlock = (function() { // jshint ignore:line +@@ -51,6 +51,9 @@ const µBlock = (function() { // jshint ignore:line ignoreRedirectFilters: false, ignoreScriptInjectFilters: false, manualUpdateAssetFetchPeriod: 500, @@ -12,7 +12,7 @@ index 631b33df..d133d38b 100644 popupFontSize: 'unset', requestJournalProcessPeriod: 1000, strictBlockingBypassDuration: 120, -@@ -155,6 +158,7 @@ const µBlock = (function() { // jshint ignore:line +@@ -156,6 +159,7 @@ const µBlock = (function() { // jshint ignore:line assetsBootstrapLocation: 'assets/assets.json', userFiltersPath: 'user-filters', @@ -60,10 +60,10 @@ index 59518f05..3b4e6aff 100644 s = s.slice(2); } diff --git a/src/js/storage.js b/src/js/storage.js -index c02bf557..e31c90c0 100644 +index 52b3eef6..fa381653 100644 --- a/src/js/storage.js +++ b/src/js/storage.js -@@ -428,7 +428,8 @@ +@@ -429,7 +429,8 @@ const onSaved = ( ) => { const compiledFilters = this.compileFilters( filters, @@ -73,7 +73,7 @@ index c02bf557..e31c90c0 100644 ); const snfe = this.staticNetFilteringEngine; const cfe = this.cosmeticFilteringEngine; -@@ -823,7 +824,7 @@ +@@ -824,7 +825,7 @@ /******************************************************************************/ @@ -82,7 +82,7 @@ index c02bf557..e31c90c0 100644 let writer = new this.CompiledLineIO.Writer(); // Populate the writer with information potentially useful to the -@@ -834,6 +835,9 @@ +@@ -835,6 +836,9 @@ } } @@ -92,7 +92,7 @@ index c02bf557..e31c90c0 100644 // Useful references: // https://adblockplus.org/en/filter-cheatsheet // https://adblockplus.org/en/filters -@@ -893,6 +897,8 @@ +@@ -894,6 +898,8 @@ staticNetFilteringEngine.compile(line, writer); } diff --git a/patches/integration/10_2_extended_resources.patch b/patches/integration/10_2_extended_resources.patch index 36949c8..0470576 100644 --- a/patches/integration/10_2_extended_resources.patch +++ b/patches/integration/10_2_extended_resources.patch @@ -61,10 +61,10 @@ index 57441bf8..e9282765 100644 // Ignore instances of exception filter with negated hostnames, // because there is no way to create an exception to an exception. diff --git a/src/js/storage.js b/src/js/storage.js -index e31c90c0..e02a0d9e 100644 +index fa381653..7a139c41 100644 --- a/src/js/storage.js +++ b/src/js/storage.js -@@ -973,7 +973,7 @@ +@@ -974,7 +974,7 @@ /******************************************************************************/ @@ -73,7 +73,7 @@ index e31c90c0..e02a0d9e 100644 var µb = this, content = ''; -@@ -988,9 +988,28 @@ +@@ -989,9 +989,28 @@ onDone(); }; @@ -104,7 +104,7 @@ index e31c90c0..e02a0d9e 100644 } if ( µb.hiddenSettings.userResourcesLocation === 'unset' ) { return onDone(); -@@ -998,16 +1017,24 @@ +@@ -999,16 +1018,24 @@ µb.assets.fetchText(µb.hiddenSettings.userResourcesLocation, onUserResourcesLoaded); }; @@ -133,7 +133,7 @@ index e31c90c0..e02a0d9e 100644 µb.redirectEngine.resourcesFromSelfie(onSelfieReady); }; -@@ -1287,7 +1314,10 @@ +@@ -1288,7 +1315,10 @@ } } // https://github.com/gorhill/uBlock/issues/2594 @@ -145,7 +145,7 @@ index e31c90c0..e02a0d9e 100644 if ( this.hiddenSettings.ignoreRedirectFilters === true && this.hiddenSettings.ignoreScriptInjectFilters === true -@@ -1328,6 +1358,11 @@ +@@ -1329,6 +1359,11 @@ if ( cached ) { this.loadRedirectResources(details.content); } diff --git a/patches/integration/10_6_lint_filters.patch b/patches/integration/10_6_lint_filters.patch index 7a3bdc5..65993b0 100644 --- a/patches/integration/10_6_lint_filters.patch +++ b/patches/integration/10_6_lint_filters.patch @@ -336,10 +336,10 @@ index fdffb2c0..462a64fe 100644 } diff --git a/src/js/storage.js b/src/js/storage.js -index e02a0d9e..08725775 100644 +index 7a139c41..b8b543d4 100644 --- a/src/js/storage.js +++ b/src/js/storage.js -@@ -393,7 +393,11 @@ +@@ -394,7 +394,11 @@ // https://github.com/gorhill/uBlock/issues/1022 // Be sure to end with an empty line. content = content.trim(); @@ -352,7 +352,7 @@ index e02a0d9e..08725775 100644 this.assets.put(this.userFiltersPath, content, callback); this.removeCompiledFilterList(this.userFiltersPath); }; -@@ -837,6 +841,12 @@ +@@ -838,6 +842,12 @@ const nanoKey = nanoAssetKeyOverride || details.assetKey; nano.cf.update(nanoKey); @@ -365,7 +365,7 @@ index e02a0d9e..08725775 100644 // Useful references: // https://adblockplus.org/en/filter-cheatsheet -@@ -850,6 +860,10 @@ +@@ -851,6 +861,10 @@ const lineIter = new this.LineIterator(this.processDirectives(rawText)); while ( lineIter.eot() === false ) { @@ -376,7 +376,7 @@ index e02a0d9e..08725775 100644 // rhill 2014-04-18: The trim is important here, as without it there // could be a lingering `\r` which would cause problems in the // following parsing code. -@@ -858,7 +872,11 @@ +@@ -859,7 +873,11 @@ // Strip comments const c = line.charAt(0); @@ -389,7 +389,7 @@ index e02a0d9e..08725775 100644 // Parse or skip cosmetic filters // All cosmetic filters are caught here -@@ -879,6 +897,7 @@ +@@ -880,6 +898,7 @@ const pos = line.indexOf('#'); if ( pos !== -1 && reIsWhitespaceChar.test(line.charAt(pos - 1)) ) { line = line.slice(0, pos).trim(); @@ -397,7 +397,7 @@ index e02a0d9e..08725775 100644 } // https://github.com/gorhill/httpswitchboard/issues/15 -@@ -888,15 +907,24 @@ +@@ -889,15 +908,24 @@ // Ignore hosts file redirect configuration // 127.0.0.1 localhost // 255.255.255.255 broadcasthost diff --git a/patches/integration/30_1_editor_settings.patch b/patches/integration/30_1_editor_settings.patch index d86b558..591a4b2 100644 --- a/patches/integration/30_1_editor_settings.patch +++ b/patches/integration/30_1_editor_settings.patch @@ -1,8 +1,8 @@ diff --git a/src/js/background.js b/src/js/background.js -index d133d38b..b15b2dc9 100644 +index 33b4b81b..3b89d552 100644 --- a/src/js/background.js +++ b/src/js/background.js -@@ -87,6 +87,8 @@ const µBlock = (function() { // jshint ignore:line +@@ -88,6 +88,8 @@ const µBlock = (function() { // jshint ignore:line hyperlinkAuditingDisabled: true, ignoreGenericCosmeticFilters: false, largeMediaSize: 50, diff --git a/term/data.js b/term/data.js index 2cfa53a..c611cdd 100644 --- a/term/data.js +++ b/term/data.js @@ -38,7 +38,7 @@ const assert = require("assert"); * Version number. * @const {string} */ -exports.version = "1.0.0.85"; +exports.version = "1.0.0.86"; /** * The based on string. @@ -47,8 +47,8 @@ exports.version = "1.0.0.85"; exports.based_on = [ "uBlock Origin", - "Version/1.18.0", - "Commit/3dac43e", + "Version/1.18.1rc0", + "Commit/54eb996", "UserCSS/disabled", ].join(" ");