From 94c742f1125028f705869b2db223dbd88e592ae6 Mon Sep 17 00:00:00 2001
From: pdknsk <pdknsk@gmail.com>
Date: Wed, 13 Mar 2019 15:58:53 +0100
Subject: [firefox] housekeeping (#2234)

* disable ContentSecurityPolicyParser target

* disable building av1 (requires new nasm)

* remove ContentSecurityPolicyParser files
---
 projects/firefox/ContentSecurityPolicyParser.diff    | 11 -----------
 projects/firefox/ContentSecurityPolicyParser.options |  2 --
 projects/firefox/Dockerfile                          |  2 --
 projects/firefox/build.sh                            |  8 +++-----
 projects/firefox/mozconfig.coverage                  |  1 +
 5 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 projects/firefox/ContentSecurityPolicyParser.diff
 delete mode 100644 projects/firefox/ContentSecurityPolicyParser.options

(limited to 'projects')

diff --git a/projects/firefox/ContentSecurityPolicyParser.diff b/projects/firefox/ContentSecurityPolicyParser.diff
deleted file mode 100644
index 4cbe7fbc..00000000
--- a/projects/firefox/ContentSecurityPolicyParser.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/dom/security/nsCSPContext.cpp b/dom/security/nsCSPContext.cpp
---- a/dom/security/nsCSPContext.cpp
-+++ b/dom/security/nsCSPContext.cpp
-@@ -756,6 +756,7 @@ nsCSPContext::logToConsole(const char* a
-                            uint32_t aColumnNumber,
-                            uint32_t aSeverityFlag)
- {
-+  return;
-   // we are passing aName as the category so we can link to the
-   // appropriate MDN docs depending on the specific error.
-   nsDependentCString category(aName);
diff --git a/projects/firefox/ContentSecurityPolicyParser.options b/projects/firefox/ContentSecurityPolicyParser.options
deleted file mode 100644
index 8791e2ff..00000000
--- a/projects/firefox/ContentSecurityPolicyParser.options
+++ /dev/null
@@ -1,2 +0,0 @@
-[libfuzzer]
-max_len = 15360
diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile
index dd4a3675..ee75198b 100644
--- a/projects/firefox/Dockerfile
+++ b/projects/firefox/Dockerfile
@@ -21,5 +21,3 @@ RUN hg clone --uncompressed https://hg.mozilla.org/mozilla-central
 RUN git clone --depth 1 https://github.com/mozillasecurity/fuzzdata
 WORKDIR mozilla-central
 COPY build.sh target.c *.options mozconfig.* $SRC/
-COPY *.diff $SRC/mozilla-central/
-RUN hg patch --no-commit ContentSecurityPolicyParser.diff
diff --git a/projects/firefox/build.sh b/projects/firefox/build.sh
index 78af57b4..4cb28c79 100755
--- a/projects/firefox/build.sh
+++ b/projects/firefox/build.sh
@@ -20,8 +20,9 @@ FUZZ_TARGETS=(
   SdpParser
   StunParser
   ContentParentIPC
-  ContentSecurityPolicyParser
-  # Qcms # needn't be enabled; has its own project with more sanitizers/engines
+# Targets which are available but disabled.
+  # Qcms
+  # ContentSecurityPolicyParser
 )
 
 # Firefox object (build) directory and configuration file.
@@ -82,6 +83,3 @@ cp $SRC/fuzzdata/dicts/stun.dict $OUT/StunParser.dict
 
 # ContentParentIPC
 cp $SRC/fuzzdata/settings/ipc/libfuzzer.content.blacklist.txt $OUT/firefox
-
-# ContentSecurityPolicyParser
-cp dom/security/fuzztest/csp_fuzzer.dict $OUT/ContentSecurityPolicyParser.dict
diff --git a/projects/firefox/mozconfig.coverage b/projects/firefox/mozconfig.coverage
index 86459bde..8178d902 100644
--- a/projects/firefox/mozconfig.coverage
+++ b/projects/firefox/mozconfig.coverage
@@ -2,6 +2,7 @@ ac_add_options --disable-debug
 ac_add_options --disable-elf-hack
 ac_add_options --disable-jemalloc
 ac_add_options --disable-crashreporter
+ac_add_options --disable-av1
 ac_add_options --enable-fuzzing
 ac_add_options --enable-optimize=-O1
 ac_add_options --enable-debug-symbols=-gline-tables-only
-- 
cgit v1.2.3