mail-client/thunderbird: security cleanup (#698516)

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

2 files changed, 0 insertions, 157 deletions

diff --git a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
deleted file mode 100644
index 48ebbf154a3f..000000000000
--- a/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-# HG changeset patch
-# User Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-# Date 1543532530 0
-#      Thu Nov 29 23:02:10 2018 +0000
-# Node ID 1c480085935783bd1d240860bb44f410e2d36322
-# Parent  6453222232be364fb8ce3fd29b6cbcd480e5f2e3
-Bug 1270882 - Enable support for SQLite custom FTS3 tokenizers at run time.
-
-Do not require that SQLite has been built with support for custom FTS3
-tokenizers enabled by default. This allows to use system SQLite in
-distributions which provide SQLite configured in this way (which is SQLite
-upstream's default configuration due to security concerns).
-
-Requires exposing the sqlite3_db_config symbol in bundled SQLite.
-
-Disable no longer needed setting of SQLITE_ENABLE_FTS3_TOKENIZER macro in
-bundled SQLite build.
-
---- a/db/sqlite3/src/moz.build	Thu Nov 29 19:08:28 2018 +0000
-+++ b/db/sqlite3/src/moz.build	Thu Nov 29 23:02:10 2018 +0000
-@@ -58,10 +58,6 @@
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
-     DEFINES['SQLITE_ENABLE_LOCKING_STYLE'] = 0
- 
--# Thunderbird needs the 2-argument version of fts3_tokenizer()
--if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']:
--    DEFINES['SQLITE_ENABLE_FTS3_TOKENIZER'] = 1
--
- # Turn on SQLite's assertions in debug builds.
- if CONFIG['MOZ_DEBUG']:
-     DEFINES['SQLITE_DEBUG'] = 1
---- a/db/sqlite3/src/sqlite.symbols     Thu Nov 29 19:08:28 2018 +0000
-+++ b/db/sqlite3/src/sqlite.symbols     Thu Nov 29 23:02:10 2018 +0000
-@@ -45,6 +45,7 @@
- sqlite3_create_function16
- sqlite3_create_module
- sqlite3_data_count
-+sqlite3_db_config
- sqlite3_db_filename
- sqlite3_db_handle
- sqlite3_db_mutex
---- a/storage/mozStorageConnection.cpp	Thu Nov 29 19:08:28 2018 +0000
-+++ b/storage/mozStorageConnection.cpp	Thu Nov 29 23:02:10 2018 +0000
-@@ -679,6 +679,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Do not set mDatabaseFile or mFileURL here since this is a "memory"
-   // database.
- 
-@@ -715,6 +719,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Do not set mFileURL here since this is database does not have an associated
-   // URL.
-   mDatabaseFile = aDatabaseFile;
-@@ -746,6 +754,10 @@
-     return convertResultCode(srv);
-   }
- 
-+#ifdef INIT_SQLITE_FTS3_TOKENIZER
-+  ::sqlite3_db_config(mDBConn, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
-+#endif
-+
-   // Set both mDatabaseFile and mFileURL here.
-   mFileURL = aFileURL;
-   mDatabaseFile = databaseFile;
---- a/storage/moz.build	2018-11-14 10:14:14.000000000 -0500
-+++ b/storage/moz.build	2018-11-29 17:05:42.106058951 -0500
-@@ -101,16 +101,20 @@
- #
- # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
- if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']:
-     if CONFIG['OS_TARGET'] != 'Android':
-         DEFINES['MOZ_STORAGE_MEMORY'] = True
- 
-+# Thunderbird needs the 2-argument version of fts3_tokenizer()
-+if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']:
-+    DEFINES['INIT_SQLITE_FTS3_TOKENIZER'] = 1
-+
- # This is the default value.  If we ever change it when compiling sqlite, we
- # will need to change it here as well.
- DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
- 
- # See Sqlite moz.build for reasoning about TEMP_STORE.
- # For system sqlite we cannot use the compile time option, so we use a pragma.
- if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android'
-                                     or CONFIG['HAVE_64BIT_BUILD']):
diff --git a/mail-client/thunderbird/files/thunderbird-60.9.0-rust-1.38-compat.patch b/mail-client/thunderbird/files/thunderbird-60.9.0-rust-1.38-compat.patch
deleted file mode 100644
index 3591208424a0..000000000000
--- a/mail-client/thunderbird/files/thunderbird-60.9.0-rust-1.38-compat.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- thunderbird-60.9.0/third_party/rust/cssparser/.cargo-checksum.json
-+++ thunderbird-60.9.0_b/third_party/rust/cssparser/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
-\ No newline at end of file
-+{"files":{".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"5f36cd1b18562e427222147ca7c971a1a65c32fbbc8bdd00c57c4dd2f5823fa0","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"}
---- thunderbird-60.9.0/third_party/rust/cssparser/src/parser.rs
-+++ thunderbird-60.9.0_b/third_party/rust/cssparser/src/parser.rs
-@@ -555,28 +555,34 @@
-         }
- 
-         let token_start_position = self.input.tokenizer.position();
--        let token;
--        match self.input.cached_token {
--            Some(ref cached_token)
--            if cached_token.start_position == token_start_position => {
--                self.input.tokenizer.reset(&cached_token.end_state);
--                match cached_token.token {
--                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
--                    _ => {}
--                }
--                token = &cached_token.token
-+        let using_cached_token = self
-+            .input
-+            .cached_token
-+            .as_ref()
-+            .map_or(false, |cached_token| {
-+                cached_token.start_position == token_start_position
-+            });
-+        let token = if using_cached_token {
-+            let cached_token = self.input.cached_token.as_ref().unwrap();
-+            self.input.tokenizer.reset(&cached_token.end_state);
-+            match cached_token.token {
-+                Token::Function(ref name) => self.input.tokenizer.see_function(name),
-+                _ => {}
-             }
--            _ => {
--                let new_token = self.input.tokenizer.next()
-+                &cached_token.token
-+            } else {
-+                let new_token = self
-+                    .input
-+                    .tokenizer
-+                    .next()
-                     .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
-                 self.input.cached_token = Some(CachedToken {
-                     token: new_token,
-                     start_position: token_start_position,
-                     end_state: self.input.tokenizer.state(),
-                 });
--                token = self.input.cached_token_ref()
--            }
--        }
-+                self.input.cached_token_ref()
-+            };
- 
-         if let Some(block_type) = BlockType::opening(token) {
-             self.at_start_of = Some(block_type);