MSVSphere Packaging Team
1 year ago
parent
5e1c602447
commit
5d73cffdc4
@ -1,5 +1,7 @@
|
|||||||
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
|
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
|
||||||
17154a4f25191801a829b403bd343555ddc88bdc SOURCES/firefox-102.15.1esr.processed-source.tar.xz
|
6a421b655b8310153e13f3ba323f091e1735feaf SOURCES/firefox-115.3.1esr.processed-source.tar.xz
|
||||||
7a5750e2bbd11bbb3386017b350bdcc2297bc111 SOURCES/firefox-langpacks-102.15.1esr-20230913.tar.xz
|
fea6ac1599da96cac5fcdd931c353feb8d6c14a0 SOURCES/firefox-langpacks-115.3.1esr-20230929.tar.xz
|
||||||
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
|
||||||
a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
|
9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
||||||
|
df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
SOURCES/cbindgen-vendor.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/firefox-102.15.1esr.processed-source.tar.xz
|
SOURCES/firefox-115.3.1esr.processed-source.tar.xz
|
||||||
SOURCES/firefox-langpacks-102.15.1esr-20230913.tar.xz
|
SOURCES/firefox-langpacks-115.3.1esr-20230929.tar.xz
|
||||||
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
SOURCES/mochitest-python.tar.gz
|
||||||
SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
|
SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
||||||
|
SOURCES/nss-3.90.0-3.el9_0.src.rpm
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
|
|
||||||
Date: Fri, 4 Mar 2022 12:00:26 +0100
|
|
||||||
Subject: [PATCH] GLIBCXX fix for GCC 12?
|
|
||||||
|
|
||||||
---
|
|
||||||
build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
index 0180f6bcfa998..8d7a542ff11f0 100644
|
|
||||||
--- a/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
+++ b/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
GLIBCXX_3.4.27 is from gcc 10
|
|
||||||
GLIBCXX_3.4.28 is from gcc 10
|
|
||||||
GLIBCXX_3.4.29 is from gcc 11
|
|
||||||
+ GLIBCXX_3.4.30 is from gcc 12
|
|
||||||
|
|
||||||
This file adds the necessary compatibility tricks to avoid symbols with
|
|
||||||
version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
|
|
||||||
@@ -69,6 +70,19 @@ void __attribute__((weak)) __throw_bad_array_new_length() { MOZ_CRASH(); }
|
|
||||||
} // namespace std
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if _GLIBCXX_RELEASE >= 12
|
|
||||||
+namespace std {
|
|
||||||
+
|
|
||||||
+/* This avoids the GLIBCXX_3.4.30 symbol version. */
|
|
||||||
+void __attribute__((weak))
|
|
||||||
+__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
|
|
||||||
+ const char* __condition) {
|
|
||||||
+ MOZ_CRASH();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+} // namespace std
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* While we generally don't build with exceptions, we have some host tools
|
|
||||||
* that do use them. libstdc++ from GCC 5.0 added exception constructors with
|
|
||||||
* char const* argument. Older versions only have a constructor with
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
|
|
||||||
--- a/parser/expat/lib/xmlparse.c
|
|
||||||
+++ b/parser/expat/lib/xmlparse.c
|
|
||||||
@@ -5652,12 +5652,18 @@
|
|
||||||
else
|
|
||||||
#endif /* XML_DTD */
|
|
||||||
{
|
|
||||||
processor = contentProcessor;
|
|
||||||
/* see externalEntityContentProcessor vs contentProcessor */
|
|
||||||
- return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
|
|
||||||
- nextPtr, (XML_Bool)!ps_finalBuffer);
|
|
||||||
+ result = doContent(parser, parser->m_parentParser ? 1 : 0,
|
|
||||||
+ parser->m_encoding, s, end, nextPtr,
|
|
||||||
+ (XML_Bool)! parser->m_parsingStatus.finalBuffer);
|
|
||||||
+ if (result == XML_ERROR_NONE) {
|
|
||||||
+ if (! storeRawNames(parser))
|
|
||||||
+ return XML_ERROR_NO_MEMORY;
|
|
||||||
+ }
|
|
||||||
+ return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static enum XML_Error PTRCALL
|
|
||||||
errorProcessor(XML_Parser parser,
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia 2020-01-02 22:33:02.000000000 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h 2020-01-03 09:00:37.537296105 +0100
|
|
||||||
@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
|
|
||||||
|
|
||||||
static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
|
|
||||||
Sk4h hs = Sk4h::Load(&rgba);
|
|
||||||
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
float32x4_t fs;
|
|
||||||
asm ("fcvtl %[fs].4s, %[hs].4h \n" // vcvt_f32_f16(...)
|
|
||||||
: [fs] "=w" (fs) // =w: write-only NEON register
|
|
||||||
@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
|
|
||||||
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
float32x4_t vec = fs.fVec;
|
|
||||||
asm ("fcvtn %[vec].4h, %[vec].4s \n" // vcvt_f16_f32(vec)
|
|
||||||
: [vec] "+w" (vec)); // +w: read-write NEON register
|
|
||||||
diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h 2020-01-03 10:11:41.259219508 +0100
|
|
||||||
@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
|
|
||||||
}
|
|
||||||
|
|
||||||
SI U16 to_half(F f) {
|
|
||||||
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
||||||
+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
||||||
&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
||||||
return vcvt_f16_f32(f);
|
|
||||||
|
|
||||||
diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h 2020-01-03 10:11:53.513250979 +0100
|
|
||||||
@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
|
|
||||||
SI U16 Half_from_F(F f) {
|
|
||||||
#if defined(USING_NEON_FP16)
|
|
||||||
return bit_pun<U16>(f);
|
|
||||||
-#elif defined(USING_NEON_F16C)
|
|
||||||
- return (U16)vcvt_f16_f32(f);
|
|
||||||
#elif defined(USING_AVX512F)
|
|
||||||
return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
|
|
||||||
#elif defined(USING_AVX_F16C)
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
|
|
||||||
--- firefox-73.0/media/libaom/moz.build.old 2020-02-07 23:13:28.000000000 +0200
|
|
||||||
+++ firefox-73.0/media/libaom/moz.build 2020-02-17 10:30:08.509805092 +0200
|
|
||||||
@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
|
|
||||||
|
|
||||||
for f in SOURCES:
|
|
||||||
if f.endswith('neon.c'):
|
|
||||||
- SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
|
|
||||||
+ SOURCES[f].flags += CONFIG['NEON_FLAGS']
|
|
||||||
|
|
||||||
if CONFIG['OS_TARGET'] == 'Android':
|
|
||||||
# For cpu-features.h
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c
|
|
||||||
--- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old 2019-03-12 21:07:35.356677522 +0100
|
|
||||||
+++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c 2019-03-12 21:07:42.937693394 +0100
|
|
||||||
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include "main_FIX.h"
|
|
||||||
+#include "fixed/main_FIX.h"
|
|
||||||
#include "NSQ.h"
|
|
||||||
#include "SigProc_FIX.h"
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
diff -up firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7 firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py
|
|
||||||
--- firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7 2022-06-23 09:11:39.000000000 +0200
|
|
||||||
+++ firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py 2022-08-16 13:24:31.697757209 +0200
|
|
||||||
@@ -73,6 +73,8 @@ class Reader(object):
|
|
||||||
self.name = "<unicode string>"
|
|
||||||
self.check_printable(stream)
|
|
||||||
self.buffer = stream+'\0'
|
|
||||||
+ #self.encoding = 'utf-8'
|
|
||||||
+ #self.raw_decode = codecs.utf_8_decode
|
|
||||||
elif isinstance(stream, bytes):
|
|
||||||
self.name = "<byte string>"
|
|
||||||
self.raw_buffer = stream
|
|
||||||
@@ -83,6 +85,11 @@ class Reader(object):
|
|
||||||
self.eof = False
|
|
||||||
self.raw_buffer = None
|
|
||||||
self.determine_encoding()
|
|
||||||
+ print("DEBUG_OUTPUT:")
|
|
||||||
+ print(self.name)
|
|
||||||
+ print(self.encoding)
|
|
||||||
+ print(self.stream)
|
|
||||||
+ #print(self.stream.read())
|
|
||||||
|
|
||||||
def peek(self, index=0):
|
|
||||||
try:
|
|
||||||
diff -up firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7 firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py
|
|
||||||
--- firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7 2022-08-16 14:16:33.432529817 +0200
|
|
||||||
+++ firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py 2022-08-17 08:01:38.175878171 +0200
|
|
||||||
@@ -37,7 +37,7 @@ def generate_feature_manifest(fd, input_
|
|
||||||
write_fm_js_headers(fd)
|
|
||||||
nimbus_dir_path = pathlib.Path(input_file).parent
|
|
||||||
try:
|
|
||||||
- with open(input_file, "r") as yaml_input:
|
|
||||||
+ with open(input_file, "r", encoding="utf-8") as yaml_input:
|
|
||||||
data = yaml.safe_load(yaml_input)
|
|
||||||
with pathlib.Path(nimbus_dir_path, FEATURE_MANIFEST_SCHEMA).open() as f:
|
|
||||||
schema = json.load(f)
|
|
||||||
@@ -92,7 +92,7 @@ def generate_platform_feature_manifest(f
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
- with open(input_file, "r") as yaml_input:
|
|
||||||
+ with open(input_file, "r", encoding="utf-8") as yaml_input:
|
|
||||||
data = yaml.safe_load(yaml_input)
|
|
||||||
fd.write(file_structure(data))
|
|
||||||
except (IOError) as e:
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -up firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s
|
||||||
|
--- firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 2023-07-25 09:01:42.602375809 +0200
|
||||||
|
+++ firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s 2023-07-25 09:01:48.273373924 +0200
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
# See the full LICENSE under scripts/.
|
||||||
|
|
||||||
|
.machine "any"
|
||||||
|
-.abiversion 2
|
||||||
|
+.abiversion 1
|
||||||
|
.text
|
||||||
|
|
||||||
|
.globl sha512_block_p8
|
||||||
@ -1,49 +0,0 @@
|
|||||||
diff -up firefox-102.0/media/ffvpx/config_common.h.dav1d-remove firefox-102.0/media/ffvpx/config_common.h
|
|
||||||
--- firefox-102.0/media/ffvpx/config_common.h.dav1d-remove 2022-08-08 12:48:33.218128539 +0200
|
|
||||||
+++ firefox-102.0/media/ffvpx/config_common.h 2022-08-08 12:48:52.986003374 +0200
|
|
||||||
@@ -24,15 +24,11 @@
|
|
||||||
#undef CONFIG_VP8_VAAPI_HWACCEL
|
|
||||||
#undef CONFIG_VP9_VAAPI_HWACCEL
|
|
||||||
#undef CONFIG_AV1_VAAPI_HWACCEL
|
|
||||||
-#undef CONFIG_LIBDAV1D
|
|
||||||
-#undef CONFIG_AV1_DECODER
|
|
||||||
#define CONFIG_VAAPI 1
|
|
||||||
#define CONFIG_VAAPI_1 1
|
|
||||||
#define CONFIG_VP8_VAAPI_HWACCEL 1
|
|
||||||
#define CONFIG_VP9_VAAPI_HWACCEL 1
|
|
||||||
#define CONFIG_AV1_VAAPI_HWACCEL 1
|
|
||||||
-#define CONFIG_LIBDAV1D 1
|
|
||||||
-#define CONFIG_AV1_DECODER 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff -up firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove firefox-102.0/media/ffvpx/libavcodec/moz.build
|
|
||||||
--- firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove 2022-08-08 12:44:24.098710736 +0200
|
|
||||||
+++ firefox-102.0/media/ffvpx/libavcodec/moz.build 2022-08-08 12:46:42.635828719 +0200
|
|
||||||
@@ -104,17 +104,23 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
|
|
||||||
]
|
|
||||||
if CONFIG['MOZ_WAYLAND']:
|
|
||||||
LOCAL_INCLUDES += ['/media/mozva']
|
|
||||||
+ if CONFIG['MOZ_DAV1D_ASM']:
|
|
||||||
+ SOURCES += [
|
|
||||||
+ 'libdav1d.c',
|
|
||||||
+ ]
|
|
||||||
SOURCES += [
|
|
||||||
'atsc_a53.c',
|
|
||||||
- 'libdav1d.c',
|
|
||||||
'vaapi_av1.c',
|
|
||||||
'vaapi_decode.c',
|
|
||||||
'vaapi_vp8.c',
|
|
||||||
'vaapi_vp9.c',
|
|
||||||
]
|
|
||||||
+ if CONFIG['MOZ_DAV1D_ASM']:
|
|
||||||
+ USE_LIBS += [
|
|
||||||
+ 'dav1d',
|
|
||||||
+ 'media_libdav1d_asm',
|
|
||||||
+ ]
|
|
||||||
USE_LIBS += [
|
|
||||||
- 'dav1d',
|
|
||||||
- 'media_libdav1d_asm',
|
|
||||||
'mozva'
|
|
||||||
]
|
|
||||||
|
|
||||||
@ -0,0 +1,242 @@
|
|||||||
|
diff --git a/dom/media/webrtc/third_party_build/webrtc.mozbuild b/dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||||
|
index 30169c36c2..335e3cb1a1 100644
|
||||||
|
--- a/dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||||
|
+++ b/dom/media/webrtc/third_party_build/webrtc.mozbuild
|
||||||
|
@@ -35,6 +35,3 @@ if CONFIG['MOZ_WEBRTC']:
|
||||||
|
|
||||||
|
if CONFIG['MOZ_X11']:
|
||||||
|
DEFINES['WEBRTC_USE_X11'] = True
|
||||||
|
-
|
||||||
|
- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
||||||
|
- DEFINES['WEBRTC_USE_PIPEWIRE'] = True
|
||||||
|
diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
|
||||||
|
index 8c56b6b8e5..eaf8d7087a 100644
|
||||||
|
--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
|
||||||
|
+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
|
||||||
|
@@ -232,102 +232,6 @@ if CONFIG["CPU_ARCH"] == "aarch64":
|
||||||
|
DEFINES["WEBRTC_ARCH_ARM64"] = True
|
||||||
|
DEFINES["WEBRTC_HAS_NEON"] = True
|
||||||
|
|
||||||
|
-if CONFIG["CPU_ARCH"] == "arm":
|
||||||
|
-
|
||||||
|
- CXXFLAGS += [
|
||||||
|
- "-mfpu=neon"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- DEFINES["WEBRTC_ARCH_ARM"] = True
|
||||||
|
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
|
||||||
|
- DEFINES["WEBRTC_HAS_NEON"] = True
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
-if CONFIG["CPU_ARCH"] == "mips32":
|
||||||
|
-
|
||||||
|
- DEFINES["MIPS32_LE"] = True
|
||||||
|
- DEFINES["MIPS_FPU_LE"] = True
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
-if CONFIG["CPU_ARCH"] == "mips64":
|
||||||
|
-
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
if CONFIG["CPU_ARCH"] == "ppc64":
|
||||||
|
|
||||||
|
DEFINES["USE_X11"] = "1"
|
||||||
|
@@ -410,97 +314,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
|
||||||
|
|
||||||
|
DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
|
||||||
|
|
||||||
|
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
|
||||||
|
-
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
|
||||||
|
-
|
||||||
|
- CXXFLAGS += [
|
||||||
|
- "-msse2"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
|
||||||
|
-
|
||||||
|
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
- DEFINES["_GNU_SOURCE"] = True
|
||||||
|
-
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/gfx/angle/checkout/include/",
|
||||||
|
- "/third_party/drm/drm/",
|
||||||
|
- "/third_party/drm/drm/include/",
|
||||||
|
- "/third_party/drm/drm/include/libdrm/",
|
||||||
|
- "/third_party/gbm/gbm/",
|
||||||
|
- "/third_party/libepoxy/libepoxy/include/",
|
||||||
|
- "/third_party/pipewire/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- UNIFIED_SOURCES += [
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
|
||||||
|
- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
|
||||||
|
|
||||||
|
DEFINES["USE_X11"] = "1"
|
||||||
|
diff --git a/third_party/libwebrtc/modules/portal/portal_gn/moz.build b/third_party/libwebrtc/modules/portal/portal_gn/moz.build
|
||||||
|
index 77603c780b..e6f2c9e724 100644
|
||||||
|
--- a/third_party/libwebrtc/modules/portal/portal_gn/moz.build
|
||||||
|
+++ b/third_party/libwebrtc/modules/portal/portal_gn/moz.build
|
||||||
|
@@ -26,7 +26,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
|
||||||
|
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
|
||||||
|
DEFINES["WEBRTC_POSIX"] = True
|
||||||
|
DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
|
||||||
|
-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
+DEFINES["WEBRTC_USE_PIPEWIRE"] = False
|
||||||
|
DEFINES["_FILE_OFFSET_BITS"] = "64"
|
||||||
|
DEFINES["_GNU_SOURCE"] = True
|
||||||
|
DEFINES["_LARGEFILE64_SOURCE"] = True
|
||||||
|
diff --git a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
|
||||||
|
index 86a0daf8fa..e895f2eb15 100644
|
||||||
|
--- a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
|
||||||
|
+++ b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
|
||||||
|
@@ -24,7 +24,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
|
||||||
|
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
|
||||||
|
DEFINES["WEBRTC_POSIX"] = True
|
||||||
|
DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
|
||||||
|
-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||||
|
+DEFINES["WEBRTC_USE_PIPEWIRE"] = False
|
||||||
|
DEFINES["_FILE_OFFSET_BITS"] = "64"
|
||||||
|
DEFINES["_GNU_SOURCE"] = True
|
||||||
|
DEFINES["_LARGEFILE64_SOURCE"] = True
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- firefox-102.6.0/build/moz.configure/nss.configure.firefox-nss-version 2022-12-06 19:14:59.439978420 +0100
|
|
||||||
+++ firefox-102.6.0/build/moz.configure/nss.configure 2022-12-06 19:18:23.299471634 +0100
|
|
||||||
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h
|
|
||||||
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
|
||||||
|
|
||||||
nss_pkg = pkg_check_modules(
|
|
||||||
- "NSS", "nss >= 3.79.2", when="--with-system-nss", config=False
|
|
||||||
+ "NSS", "nss >= 3.79", when="--with-system-nss", config=False
|
|
||||||
)
|
|
||||||
|
|
||||||
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,15 +0,0 @@
|
|||||||
diff -up firefox-84.0/security/sandbox/linux/moz.build.1516803 firefox-84.0/security/sandbox/linux/moz.build
|
|
||||||
--- firefox-84.0/security/sandbox/linux/moz.build.1516803 2020-12-10 16:17:55.425139545 +0100
|
|
||||||
+++ firefox-84.0/security/sandbox/linux/moz.build 2020-12-10 16:29:21.945860841 +0100
|
|
||||||
@@ -114,9 +114,8 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc")
|
|
||||||
# gcc lto likes to put the top level asm in syscall.cc in a different partition
|
|
||||||
# from the function using it which breaks the build. Work around that by
|
|
||||||
# forcing there to be only one partition.
|
|
||||||
-for f in CONFIG["OS_CXXFLAGS"]:
|
|
||||||
- if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
|
|
||||||
- LDFLAGS += ["--param lto-partitions=1"]
|
|
||||||
+if CONFIG['CC_TYPE'] != 'clang':
|
|
||||||
+ LDFLAGS += ['--param', 'lto-partitions=1']
|
|
||||||
|
|
||||||
DEFINES["NS_NO_XPCOM"] = True
|
|
||||||
DisableStlWrapping()
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- firefox-81.0.1/build/mach_initialize.py.old 2020-10-06 14:16:06.212974910 +0200
|
|
||||||
+++ firefox-81.0.1/build/mach_initialize.py 2020-10-06 14:19:03.313179557 +0200
|
|
||||||
@@ -507,7 +507,10 @@ class ImportHook(object):
|
|
||||||
# doesn't happen or because it doesn't matter).
|
|
||||||
if not os.path.exists(module.__file__[:-1]):
|
|
||||||
if os.path.exists(module.__file__):
|
|
||||||
- os.remove(module.__file__)
|
|
||||||
+ try:
|
|
||||||
+ os.remove(module.__file__)
|
|
||||||
+ except:
|
|
||||||
+ pass
|
|
||||||
del sys.modules[module.__name__]
|
|
||||||
module = self(name, globals, locals, fromlist, level)
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
|
|
||||||
index 8579f8bb3622..d9ca79d4fcb8 100644
|
|
||||||
--- a/third_party/libwebrtc/moz.build
|
|
||||||
+++ b/third_party/libwebrtc/moz.build
|
|
||||||
@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
|
|
||||||
"/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
|
|
||||||
"/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
|
|
||||||
- "/third_party/libwebrtc/modules/audio_coding/isac_gn"
|
|
||||||
+ "/third_party/libwebrtc/modules/audio_coding/isac_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
|
|
||||||
]
|
|
||||||
|
|
||||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
|
|
||||||
@ -1,632 +0,0 @@
|
|||||||
diff --git a/security/manager/locales/en-US/security/certificates/certManager.ftl b/security/manager/locales/en-US/security/certificates/certManager.ftl
|
|
||||||
--- a/security/manager/locales/en-US/security/certificates/certManager.ftl
|
|
||||||
+++ b/security/manager/locales/en-US/security/certificates/certManager.ftl
|
|
||||||
@@ -51,9 +51,6 @@ certmgr-cert-name =
|
|
||||||
certmgr-cert-server =
|
|
||||||
.label = Server
|
|
||||||
|
|
||||||
-certmgr-override-lifetime =
|
|
||||||
- .label = Lifetime
|
|
||||||
-
|
|
||||||
certmgr-token-name =
|
|
||||||
.label = Security Device
|
|
||||||
|
|
||||||
@@ -69,6 +66,9 @@ certmgr-email =
|
|
||||||
certmgr-serial =
|
|
||||||
.label = Serial Number
|
|
||||||
|
|
||||||
+certmgr-fingerprint-sha-256 =
|
|
||||||
+ .label = SHA-256 Fingerprint
|
|
||||||
+
|
|
||||||
certmgr-view =
|
|
||||||
.label = View…
|
|
||||||
.accesskey = V
|
|
||||||
diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js
|
|
||||||
--- a/security/manager/pki/resources/content/certManager.js
|
|
||||||
+++ b/security/manager/pki/resources/content/certManager.js
|
|
||||||
@@ -64,22 +64,16 @@ var serverRichList = {
|
|
||||||
|
|
||||||
buildRichList() {
|
|
||||||
let overrides = overrideService.getOverrides().map(item => {
|
|
||||||
- let cert = null;
|
|
||||||
- if (item.dbKey !== "") {
|
|
||||||
- cert = certdb.findCertByDBKey(item.dbKey);
|
|
||||||
- }
|
|
||||||
return {
|
|
||||||
hostPort: item.hostPort,
|
|
||||||
- dbKey: item.dbKey,
|
|
||||||
asciiHost: item.asciiHost,
|
|
||||||
port: item.port,
|
|
||||||
originAttributes: item.originAttributes,
|
|
||||||
- isTemporary: item.isTemporary,
|
|
||||||
- displayName: cert !== null ? cert.displayName : "",
|
|
||||||
+ fingerprint: item.fingerprint,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
overrides.sort((a, b) => {
|
|
||||||
- let criteria = ["hostPort", "displayName"];
|
|
||||||
+ let criteria = ["hostPort", "fingerprint"];
|
|
||||||
for (let c of criteria) {
|
|
||||||
let res = a[c].localeCompare(b[c]);
|
|
||||||
if (res !== 0) {
|
|
||||||
@@ -106,10 +100,10 @@ var serverRichList = {
|
|
||||||
_richBoxAddItem(item) {
|
|
||||||
let richlistitem = document.createXULElement("richlistitem");
|
|
||||||
|
|
||||||
- richlistitem.setAttribute("dbKey", item.dbKey);
|
|
||||||
richlistitem.setAttribute("host", item.asciiHost);
|
|
||||||
richlistitem.setAttribute("port", item.port);
|
|
||||||
richlistitem.setAttribute("hostPort", item.hostPort);
|
|
||||||
+ richlistitem.setAttribute("fingerprint", item.fingerprint);
|
|
||||||
richlistitem.setAttribute(
|
|
||||||
"originAttributes",
|
|
||||||
JSON.stringify(item.originAttributes)
|
|
||||||
@@ -120,18 +114,7 @@ var serverRichList = {
|
|
||||||
hbox.setAttribute("equalsize", "always");
|
|
||||||
|
|
||||||
hbox.appendChild(createRichlistItem({ raw: item.hostPort }));
|
|
||||||
- hbox.appendChild(
|
|
||||||
- createRichlistItem(
|
|
||||||
- item.displayName !== ""
|
|
||||||
- ? { raw: item.displayName }
|
|
||||||
- : { l10nid: "no-cert-stored-for-override" }
|
|
||||||
- )
|
|
||||||
- );
|
|
||||||
- hbox.appendChild(
|
|
||||||
- createRichlistItem({
|
|
||||||
- l10nid: item.isTemporary ? "temporary-override" : "permanent-override",
|
|
||||||
- })
|
|
||||||
- );
|
|
||||||
+ hbox.appendChild(createRichlistItem({ raw: item.fingerprint }));
|
|
||||||
|
|
||||||
richlistitem.appendChild(hbox);
|
|
||||||
|
|
||||||
@@ -170,32 +153,6 @@ var serverRichList = {
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
- viewSelectedRichListItem() {
|
|
||||||
- let selectedItem = this.richlist.selectedItem;
|
|
||||||
- if (!selectedItem) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- let dbKey = selectedItem.getAttribute("dbKey");
|
|
||||||
- if (dbKey) {
|
|
||||||
- let cert = certdb.findCertByDBKey(dbKey);
|
|
||||||
- viewCertHelper(window, cert);
|
|
||||||
- }
|
|
||||||
- },
|
|
||||||
-
|
|
||||||
- exportSelectedRichListItem() {
|
|
||||||
- let selectedItem = this.richlist.selectedItem;
|
|
||||||
- if (!selectedItem) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- let dbKey = selectedItem.getAttribute("dbKey");
|
|
||||||
- if (dbKey) {
|
|
||||||
- let cert = certdb.findCertByDBKey(dbKey);
|
|
||||||
- exportToFile(window, cert);
|
|
||||||
- }
|
|
||||||
- },
|
|
||||||
-
|
|
||||||
addException() {
|
|
||||||
let retval = {
|
|
||||||
exceptionAdded: false,
|
|
||||||
@@ -212,16 +169,8 @@ var serverRichList = {
|
|
||||||
},
|
|
||||||
|
|
||||||
_setButtonState() {
|
|
||||||
- let websiteViewButton = document.getElementById("websites_viewButton");
|
|
||||||
- let websiteExportButton = document.getElementById("websites_exportButton");
|
|
||||||
let websiteDeleteButton = document.getElementById("websites_deleteButton");
|
|
||||||
-
|
|
||||||
- let certKey = this.richlist.selectedItem?.getAttribute("dbKey");
|
|
||||||
- let cert = certKey && certdb.findCertByDBKey(certKey);
|
|
||||||
-
|
|
||||||
websiteDeleteButton.disabled = this.richlist.selectedIndex < 0;
|
|
||||||
- websiteExportButton.disabled = !cert;
|
|
||||||
- websiteViewButton.disabled = websiteExportButton.disabled;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
/**
|
|
||||||
diff --git a/security/manager/pki/resources/content/certManager.xhtml b/security/manager/pki/resources/content/certManager.xhtml
|
|
||||||
--- a/security/manager/pki/resources/content/certManager.xhtml
|
|
||||||
+++ b/security/manager/pki/resources/content/certManager.xhtml
|
|
||||||
@@ -157,18 +157,13 @@
|
|
||||||
|
|
||||||
<listheader equalsize="always">
|
|
||||||
<treecol id="sitecol" data-l10n-id="certmgr-cert-server" primary="true" flex="1"/>
|
|
||||||
- <treecol id="certcol" data-l10n-id="certmgr-cert-name" flex="1"/>
|
|
||||||
- <treecol id="lifetimecol" data-l10n-id="certmgr-override-lifetime" flex="1"/>
|
|
||||||
+ <treecol id="sha256col" data-l10n-id="certmgr-fingerprint-sha-256" flex="1"/>
|
|
||||||
</listheader>
|
|
||||||
<richlistbox ondblclick="serverRichList.viewSelectedRichListItem();" class="certManagerRichlistBox" id="serverList" flex="1" selected="false"/>
|
|
||||||
|
|
||||||
<separator class="thin"/>
|
|
||||||
|
|
||||||
<hbox>
|
|
||||||
- <button id="websites_viewButton"
|
|
||||||
- data-l10n-id="certmgr-view" oncommand="serverRichList.viewSelectedRichListItem();"/>
|
|
||||||
- <button id="websites_exportButton"
|
|
||||||
- data-l10n-id="certmgr-export" oncommand="serverRichList.exportSelectedRichListItem();"/>
|
|
||||||
<button id="websites_deleteButton"
|
|
||||||
data-l10n-id="certmgr-delete" oncommand="serverRichList.deleteSelectedRichListItem();"/>
|
|
||||||
<button id="websites_exceptionButton"
|
|
||||||
diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp
|
|
||||||
--- a/security/manager/ssl/nsCertOverrideService.cpp
|
|
||||||
+++ b/security/manager/ssl/nsCertOverrideService.cpp
|
|
||||||
@@ -106,8 +106,8 @@ nsCertOverride::GetAsciiHost(/*out*/ nsA
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
-nsCertOverride::GetDbKey(/*out*/ nsACString& aDBKey) {
|
|
||||||
- aDBKey = mDBKey;
|
|
||||||
+nsCertOverride::GetFingerprint(/*out*/ nsACString& aFingerprint) {
|
|
||||||
+ aFingerprint = mFingerprint;
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -118,12 +118,6 @@ nsCertOverride::GetPort(/*out*/ int32_t*
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
-nsCertOverride::GetIsTemporary(/*out*/ bool* aIsTemporary) {
|
|
||||||
- *aIsTemporary = mIsTemporary;
|
|
||||||
- return NS_OK;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-NS_IMETHODIMP
|
|
||||||
nsCertOverride::GetHostPort(/*out*/ nsACString& aHostPort) {
|
|
||||||
nsCertOverrideService::GetHostWithPort(mAsciiHost, mPort, aHostPort);
|
|
||||||
return NS_OK;
|
|
||||||
@@ -274,7 +268,6 @@ void nsCertOverrideService::RemoveAllTem
|
|
||||||
for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
|
|
||||||
nsCertOverrideEntry* entry = iter.Get();
|
|
||||||
if (entry->mSettings->mIsTemporary) {
|
|
||||||
- entry->mSettings->mCert = nullptr;
|
|
||||||
iter.Remove();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -297,18 +297,11 @@
|
|
||||||
nsAutoCString buffer;
|
|
||||||
bool isMore = true;
|
|
||||||
|
|
||||||
- /* file format is:
|
|
||||||
- *
|
|
||||||
- * host:port:originattributes \t fingerprint-algorithm \t fingerprint \t
|
|
||||||
- * override-mask \t dbKey
|
|
||||||
- *
|
|
||||||
- * where override-mask is a sequence of characters,
|
|
||||||
- * M meaning hostname-Mismatch-override
|
|
||||||
- * U meaning Untrusted-override
|
|
||||||
- * T meaning Time-error-override (expired/not yet valid)
|
|
||||||
- *
|
|
||||||
- * if this format isn't respected we move onto the next line in the file.
|
|
||||||
- */
|
|
||||||
+ // Each line is of the form:
|
|
||||||
+ // host:port:originAttributes \t sSHA256OIDString \t fingerprint \t
|
|
||||||
+ // There may be some "bits" identifiers and "dbKey" after the `fingerprint`
|
|
||||||
+ // field in 'fingerprint \t \t dbKey' format, but these are now ignored.
|
|
||||||
+ // Lines that don't match this form are silently dropped.
|
|
||||||
|
|
||||||
while (isMore && NS_SUCCEEDED(lineInputStream->ReadLine(buffer, &isMore))) {
|
|
||||||
if (buffer.IsEmpty() || buffer.First() == '#') {
|
|
||||||
@@ -350,23 +343,10 @@
|
|
||||||
fingerprint.Length() == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
- nsDependentCSubstring bitsString;
|
|
||||||
- if (!parser.ReadUntil(Tokenizer::Token::Whitespace(), bitsString) ||
|
|
||||||
- bitsString.Length() == 0) {
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
- nsDependentCSubstring dbKey;
|
|
||||||
- if (!parser.ReadUntil(Tokenizer::Token::EndOfFile(), dbKey) ||
|
|
||||||
- dbKey.Length() == 0) {
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
- nsCertOverride::OverrideBits bits;
|
|
||||||
- nsCertOverride::convertStringToBits(bitsString, bits);
|
|
||||||
|
|
||||||
AddEntryToList(host, port, attributes,
|
|
||||||
- nullptr, // don't have the cert
|
|
||||||
- false, // not temporary
|
|
||||||
- fingerprint, bits, dbKey, aProofOfLock);
|
|
||||||
+ false, // not temporary
|
|
||||||
+ fingerprint, aProofOfLock);
|
|
||||||
}
|
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
@@ -412,9 +392,8 @@
|
|
||||||
output.Append(kTab);
|
|
||||||
output.Append(settings->mFingerprint);
|
|
||||||
output.Append(kTab);
|
|
||||||
- output.Append(bitsString);
|
|
||||||
- output.Append(kTab);
|
|
||||||
- output.Append(settings->mDBKey);
|
|
||||||
+ // the "bits" string used to go here, but it no longer exists
|
|
||||||
+ // the "\t dbKey" string used to go here, but it no longer exists
|
|
||||||
output.Append(NS_LINEBREAK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -462,42 +441,16 @@
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- nsAutoCString nickname;
|
|
||||||
- nsresult rv = DefaultServerNicknameForCert(nsscert.get(), nickname);
|
|
||||||
- if (!aTemporary && NS_SUCCEEDED(rv)) {
|
|
||||||
- UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
||||||
- if (!slot) {
|
|
||||||
- return NS_ERROR_FAILURE;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- // This can fail (for example, if we're in read-only mode). Luckily, we
|
|
||||||
- // don't even need it to succeed - we always match on the stored hash of the
|
|
||||||
- // certificate rather than the full certificate. It makes the display a bit
|
|
||||||
- // less informative (since we won't have a certificate to display), but it's
|
|
||||||
- // better than failing the entire operation.
|
|
||||||
- Unused << PK11_ImportCert(slot.get(), nsscert.get(), CK_INVALID_HANDLE,
|
|
||||||
- nickname.get(), false);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
nsAutoCString fpStr;
|
|
||||||
- rv = GetCertSha256Fingerprint(aCert, fpStr);
|
|
||||||
- if (NS_FAILED(rv)) {
|
|
||||||
- return rv;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- nsAutoCString dbkey;
|
|
||||||
- rv = aCert->GetDbKey(dbkey);
|
|
||||||
+ nsresult rv = GetCertSha256Fingerprint(aCert, fpStr);
|
|
||||||
if (NS_FAILED(rv)) {
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
MutexAutoLock lock(mMutex);
|
|
||||||
- AddEntryToList(aHostName, aPort, aOriginAttributes,
|
|
||||||
- aTemporary ? aCert : nullptr,
|
|
||||||
- // keep a reference to the cert for temporary overrides
|
|
||||||
- aTemporary, fpStr,
|
|
||||||
- (nsCertOverride::OverrideBits)aOverrideBits, dbkey, lock);
|
|
||||||
+ AddEntryToList(aHostName, aPort, aOriginAttributes, aTemporary, fpStr,
|
|
||||||
+ lock);
|
|
||||||
if (!aTemporary) {
|
|
||||||
Write(lock);
|
|
||||||
}
|
|
||||||
@@ -532,10 +485,8 @@
|
|
||||||
|
|
||||||
MutexAutoLock lock(mMutex);
|
|
||||||
AddEntryToList(aHostName, aPort, aOriginAttributes,
|
|
||||||
- nullptr, // No cert to keep alive
|
|
||||||
true, // temporary
|
|
||||||
- aCertFingerprint, (nsCertOverride::OverrideBits)aOverrideBits,
|
|
||||||
- ""_ns, // dbkey
|
|
||||||
+ aCertFingerprint,
|
|
||||||
lock);
|
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
@@ -632,10 +583,8 @@
|
|
||||||
|
|
||||||
nsresult nsCertOverrideService::AddEntryToList(
|
|
||||||
const nsACString& aHostName, int32_t aPort,
|
|
||||||
- const OriginAttributes& aOriginAttributes, nsIX509Cert* aCert,
|
|
||||||
- const bool aIsTemporary, const nsACString& fingerprint,
|
|
||||||
- nsCertOverride::OverrideBits ob, const nsACString& dbKey,
|
|
||||||
- const MutexAutoLock& aProofOfLock) {
|
|
||||||
+ const OriginAttributes& aOriginAttributes, const bool aIsTemporary,
|
|
||||||
+ const nsACString& fingerprint, const MutexAutoLock& aProofOfLock) {
|
|
||||||
mMutex.AssertCurrentThreadOwns();
|
|
||||||
nsAutoCString keyString;
|
|
||||||
GetKeyString(aHostName, aPort, aOriginAttributes, keyString);
|
|
||||||
@@ -656,11 +605,6 @@
|
|
||||||
settings->mOriginAttributes = aOriginAttributes;
|
|
||||||
settings->mIsTemporary = aIsTemporary;
|
|
||||||
settings->mFingerprint = fingerprint;
|
|
||||||
- settings->mOverrideBits = ob;
|
|
||||||
- settings->mDBKey = dbKey;
|
|
||||||
- // remove whitespace from stored dbKey for backwards compatibility
|
|
||||||
- settings->mDBKey.StripWhitespace();
|
|
||||||
- settings->mCert = aCert;
|
|
||||||
entry->mSettings = settings;
|
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
diff --git a/security/manager/ssl/nsCertOverrideService.h b/security/manager/ssl/nsCertOverrideService.h
|
|
||||||
--- a/security/manager/ssl/nsCertOverrideService.h
|
|
||||||
+++ b/security/manager/ssl/nsCertOverrideService.h
|
|
||||||
@@ -43,8 +43,6 @@
|
|
||||||
bool mIsTemporary; // true: session only, false: stored on disk
|
|
||||||
nsCString mFingerprint;
|
|
||||||
OverrideBits mOverrideBits;
|
|
||||||
- nsCString mDBKey;
|
|
||||||
- nsCOMPtr<nsIX509Cert> mCert;
|
|
||||||
|
|
||||||
static void convertBitsToString(OverrideBits ob, nsACString& str);
|
|
||||||
static void convertStringToBits(const nsACString& str, OverrideBits& ob);
|
|
||||||
@@ -145,10 +143,8 @@
|
|
||||||
nsresult Write(const mozilla::MutexAutoLock& aProofOfLock);
|
|
||||||
nsresult AddEntryToList(const nsACString& host, int32_t port,
|
|
||||||
const OriginAttributes& aOriginAttributes,
|
|
||||||
- nsIX509Cert* aCert, const bool aIsTemporary,
|
|
||||||
+ const bool aIsTemporary,
|
|
||||||
const nsACString& fingerprint,
|
|
||||||
- nsCertOverride::OverrideBits ob,
|
|
||||||
- const nsACString& dbKey,
|
|
||||||
const mozilla::MutexAutoLock& aProofOfLock);
|
|
||||||
|
|
||||||
// Set in constructor only
|
|
||||||
diff --git a/security/manager/ssl/SSLServerCertVerification.cpp b/security/manager/ssl/SSLServerCertVerification.cpp
|
|
||||||
--- a/security/manager/ssl/SSLServerCertVerification.cpp
|
|
||||||
+++ b/security/manager/ssl/SSLServerCertVerification.cpp
|
|
||||||
@@ -791,8 +791,8 @@
|
|
||||||
aHostName, aPort, aOriginAttributes, aCert, &overrideBits,
|
|
||||||
&isTemporaryOverride, &haveOverride);
|
|
||||||
if (NS_SUCCEEDED(rv) && haveOverride) {
|
|
||||||
- // remove the errors that are already overriden
|
|
||||||
- remainingDisplayErrors &= ~overrideBits;
|
|
||||||
+ // remove all the errors
|
|
||||||
+ remainingDisplayErrors = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/security/manager/ssl/nsICertOverrideService.idl b/security/manager/ssl/nsICertOverrideService.idl
|
|
||||||
--- a/security/manager/ssl/nsICertOverrideService.idl
|
|
||||||
+++ b/security/manager/ssl/nsICertOverrideService.idl
|
|
||||||
@@ -33,17 +33,6 @@ interface nsICertOverride : nsISupports
|
|
||||||
readonly attribute int32_t port;
|
|
||||||
|
|
||||||
/**
|
|
||||||
- * Whether or not the override is only used for this
|
|
||||||
- * session (true) or stored persistently (false)
|
|
||||||
- */
|
|
||||||
- readonly attribute boolean isTemporary;
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
- * The database key for the associated certificate.
|
|
||||||
- */
|
|
||||||
- readonly attribute ACString dbKey;
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
* A combination of hostname and port in the form host:port.
|
|
||||||
* Since the port can be -1 which is equivalent to port 433 we use an
|
|
||||||
* existing function of nsCertOverrideService to create this property.
|
|
||||||
@@ -51,6 +40,11 @@ interface nsICertOverride : nsISupports
|
|
||||||
readonly attribute ACString hostPort;
|
|
||||||
|
|
||||||
/**
|
|
||||||
+ * The fingerprint for the associated certificate.
|
|
||||||
+ */
|
|
||||||
+ readonly attribute ACString fingerprint;
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
* The origin attributes associated with this override.
|
|
||||||
*/
|
|
||||||
[implicit_jscontext]
|
|
||||||
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js b/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
|
|
||||||
--- a/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
|
|
||||||
+++ b/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
|
|
||||||
@@ -27,9 +27,7 @@ async function checkServerCertificates(w
|
|
||||||
|
|
||||||
expectedValues.forEach((item, i) => {
|
|
||||||
let hostPort = labels[i * 3].value;
|
|
||||||
- let certString = labels[i * 3 + 1].value || labels[i * 3 + 1].textContent;
|
|
||||||
- let isTemporaryString =
|
|
||||||
- labels[i * 3 + 2].value || labels[i * 3 + 2].textContent;
|
|
||||||
+ let fingerprint = labels[i * 3 + 1].value || labels[i * 3 + 1].textContent;
|
|
||||||
|
|
||||||
Assert.equal(
|
|
||||||
hostPort,
|
|
||||||
@@ -38,15 +36,9 @@ async function checkServerCertificates(w
|
|
||||||
);
|
|
||||||
|
|
||||||
Assert.equal(
|
|
||||||
- certString,
|
|
||||||
- item.certName,
|
|
||||||
- `Expected override to have field ${item.certName}`
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- Assert.equal(
|
|
||||||
- isTemporaryString,
|
|
||||||
- item.isTemporary ? "Temporary" : "Permanent",
|
|
||||||
- `Expected override to be ${item.isTemporary ? "Temporary" : "Permanent"}`
|
|
||||||
+ fingerprint,
|
|
||||||
+ item.fingerprint,
|
|
||||||
+ `Expected override to have field ${item.fingerprint}`
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -73,41 +73,6 @@
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
-async function testViewButton(win) {
|
|
||||||
- win.document.getElementById("serverList").selectedIndex = 1;
|
|
||||||
-
|
|
||||||
- Assert.ok(
|
|
||||||
- win.document.getElementById("websites_viewButton").disabled,
|
|
||||||
- "View button should be disabled for override without cert"
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- win.document.getElementById("serverList").selectedIndex = 0;
|
|
||||||
-
|
|
||||||
- Assert.ok(
|
|
||||||
- !win.document.getElementById("websites_viewButton").disabled,
|
|
||||||
- "View button should be enabled for override with cert"
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- let loaded = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
|
|
||||||
-
|
|
||||||
- win.document.getElementById("websites_viewButton").click();
|
|
||||||
-
|
|
||||||
- let newTab = await loaded;
|
|
||||||
- let spec = newTab.linkedBrowser.documentURI.spec;
|
|
||||||
-
|
|
||||||
- Assert.ok(
|
|
||||||
- spec.startsWith("about:certificate"),
|
|
||||||
- "about:certificate should habe been opened"
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- let newUrl = new URL(spec);
|
|
||||||
- let certEncoded = newUrl.searchParams.get("cert");
|
|
||||||
- let certDecoded = decodeURIComponent(certEncoded);
|
|
||||||
- Assert.ok(certDecoded, "should have some certificate as cert url param");
|
|
||||||
-
|
|
||||||
- gBrowser.removeCurrentTab();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
add_task(async function test_cert_manager_server_tab() {
|
|
||||||
let win = await openCertManager();
|
|
||||||
|
|
||||||
@@ -134,48 +99,13 @@
|
|
||||||
await checkServerCertificates(win, [
|
|
||||||
{
|
|
||||||
hostPort: "example.com:443",
|
|
||||||
- certName: "md5-ee",
|
|
||||||
- isTemporary: false,
|
|
||||||
- },
|
|
||||||
- ]);
|
|
||||||
-
|
|
||||||
- win.document.getElementById("certmanager").acceptDialog();
|
|
||||||
- await BrowserTestUtils.windowClosed(win);
|
|
||||||
-
|
|
||||||
- certOverrideService.rememberTemporaryValidityOverrideUsingFingerprint(
|
|
||||||
- "example.com",
|
|
||||||
- 9999,
|
|
||||||
- {},
|
|
||||||
- "40:20:3E:57:FB:82:95:0D:3F:62:D7:04:39:F6:32:CC:B2:2F:70:9F:3E:66:C5:35:64:6E:49:2A:F1:02:75:9F",
|
|
||||||
- Ci.nsICertOverrideService.ERROR_UNTRUSTED
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- win = await openCertManager();
|
|
||||||
-
|
|
||||||
- await checkServerCertificates(win, [
|
|
||||||
- {
|
|
||||||
- hostPort: "example.com:443",
|
|
||||||
- certName: "md5-ee",
|
|
||||||
- isTemporary: false,
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- hostPort: "example.com:9999",
|
|
||||||
- certName: "(Not Stored)",
|
|
||||||
- isTemporary: true,
|
|
||||||
+ fingerprint: cert.sha256Fingerprint,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
- await testViewButton(win);
|
|
||||||
-
|
|
||||||
- await deleteOverride(win, 2);
|
|
||||||
+ await deleteOverride(win, 1);
|
|
||||||
|
|
||||||
- await checkServerCertificates(win, [
|
|
||||||
- {
|
|
||||||
- hostPort: "example.com:9999",
|
|
||||||
- certName: "(Not Stored)",
|
|
||||||
- isTemporary: true,
|
|
||||||
- },
|
|
||||||
- ]);
|
|
||||||
+ await checkServerCertificates(win, []);
|
|
||||||
|
|
||||||
win.document.getElementById("certmanager").acceptDialog();
|
|
||||||
await BrowserTestUtils.windowClosed(win);
|
|
||||||
diff --git a/security/manager/ssl/tests/unit/test_cert_override_read.js b/security/manager/ssl/tests/unit/test_cert_override_read.js
|
|
||||||
--- a/security/manager/ssl/tests/unit/test_cert_override_read.js
|
|
||||||
+++ b/security/manager/ssl/tests/unit/test_cert_override_read.js
|
|
||||||
@@ -11,19 +11,16 @@ function run_test() {
|
|
||||||
let cert1 = {
|
|
||||||
sha256Fingerprint:
|
|
||||||
"E9:3A:91:F6:15:11:FB:DD:02:76:DD:45:8C:4B:F4:9B:D1:14:13:91:2E:96:4B:EC:D2:4F:90:D5:F4:BB:29:5C",
|
|
||||||
- dbKey: "This isn't relevant for this test.",
|
|
||||||
};
|
|
||||||
// bad_certs/selfsigned.pem
|
|
||||||
let cert2 = {
|
|
||||||
sha256Fingerprint:
|
|
||||||
"51:BC:41:90:C1:FD:6E:73:18:19:B0:60:08:DD:A3:3D:59:B2:5B:FB:D0:3D:DD:89:19:A5:BB:C6:2B:5A:72:A7",
|
|
||||||
- dbKey: "This isn't relevant for this test.",
|
|
||||||
};
|
|
||||||
// bad_certs/noValidNames.pem
|
|
||||||
let cert3 = {
|
|
||||||
sha256Fingerprint:
|
|
||||||
"C3:A3:61:02:CA:64:CC:EC:45:1D:24:B6:A0:69:DB:DB:F0:D8:58:76:FC:50:36:52:5A:E8:40:4C:55:72:08:F4",
|
|
||||||
- dbKey: "This isn't relevant for this test.",
|
|
||||||
};
|
|
||||||
|
|
||||||
let profileDir = do_get_profile();
|
|
||||||
@@ -35,58 +35,42 @@
|
|
||||||
"# This is a generated file! Do not edit.",
|
|
||||||
"test.example.com:443:^privateBrowsingId=1\tOID.2.16.840.1.101.3.4.2.1\t" +
|
|
||||||
cert1.sha256Fingerprint +
|
|
||||||
- "\tM\t" +
|
|
||||||
- cert1.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"test.example.com:443:^privateBrowsingId=2\tOID.2.16.840.1.101.3.4.2.1\t" +
|
|
||||||
cert1.sha256Fingerprint +
|
|
||||||
+ "\t",
|
|
||||||
+ "test.example.com:443:^privateBrowsingId=3\tOID.2.16.840.1.101.3.4.2.1\t" + // includes bits and dbKey (now obsolete)
|
|
||||||
+ cert1.sha256Fingerprint +
|
|
||||||
"\tM\t" +
|
|
||||||
- cert1.dbKey,
|
|
||||||
+ "AAAAAAAAAAAAAAACAAAAFjA5MBQxEjAQBgNVBAMMCWxvY2FsaG9zdA==",
|
|
||||||
"example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" +
|
|
||||||
cert2.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert2.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"[::1]:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // IPv6
|
|
||||||
cert2.sha256Fingerprint +
|
|
||||||
- "\tM\t" +
|
|
||||||
- cert2.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"old.example.com:443\tOID.2.16.840.1.101.3.4.2.1\t" + // missing attributes (defaulted)
|
|
||||||
cert1.sha256Fingerprint +
|
|
||||||
- "\tM\t" +
|
|
||||||
- cert1.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
":443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing host name
|
|
||||||
cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"example.com::\tOID.2.16.840.1.101.3.4.2.1\t" + // missing port
|
|
||||||
cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
- "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // wrong fingerprint/dbkey
|
|
||||||
+ "\t",
|
|
||||||
+ "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // wrong fingerprint
|
|
||||||
cert2.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"example.com:443:\tOID.0.00.000.0.000.0.0.0.0\t" + // bad OID
|
|
||||||
cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"example.com:443:\t.0.0.0.0\t" + // malformed OID
|
|
||||||
cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
+ "\t",
|
|
||||||
"example.com:443:\t\t" + // missing OID
|
|
||||||
cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
- "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing fingerprint
|
|
||||||
- "\tU\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
- "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing override bits
|
|
||||||
- cert3.sha256Fingerprint +
|
|
||||||
- "\t\t" +
|
|
||||||
- cert3.dbKey,
|
|
||||||
- "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing dbkey
|
|
||||||
- cert3.sha256Fingerprint +
|
|
||||||
- "\tU\t",
|
|
||||||
+ "\t",
|
|
||||||
+ "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t", // missing fingerprint
|
|
||||||
];
|
|
||||||
writeLinesAndClose(lines, outputStream);
|
|
||||||
let overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User Steve Singer <steve@ssinger.info>
|
|
||||||
# Date 1558451540 -7200
|
|
||||||
# Tue May 21 17:12:20 2019 +0200
|
|
||||||
# Node ID 433beec63e6b5f409683af20a0c1ab137cc7bfad
|
|
||||||
# Parent c0fdccc716e80a6d289c94f5d507ae141c62a3bf
|
|
||||||
Bug 1005535 - Get skia GPU building on big endian.
|
|
||||||
|
|
||||||
diff --git a/gfx/skia/skia/src/gpu/GrColor.h b/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
--- a/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
+++ b/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
@@ -59,17 +59,17 @@ static inline GrColor GrColorPackRGBA(un
|
|
||||||
#define GrColorUnpackG(color) (((color) >> GrColor_SHIFT_G) & 0xFF)
|
|
||||||
#define GrColorUnpackB(color) (((color) >> GrColor_SHIFT_B) & 0xFF)
|
|
||||||
#define GrColorUnpackA(color) (((color) >> GrColor_SHIFT_A) & 0xFF)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Since premultiplied means that alpha >= color, we construct a color with
|
|
||||||
* each component==255 and alpha == 0 to be "illegal"
|
|
||||||
*/
|
|
||||||
-#define GrColor_ILLEGAL (~(0xFF << GrColor_SHIFT_A))
|
|
||||||
+#define GrColor_ILLEGAL ((uint32_t)(~(0xFF << GrColor_SHIFT_A)))
|
|
||||||
|
|
||||||
/** Normalizes and coverts an uint8_t to a float. [0, 255] -> [0.0, 1.0] */
|
|
||||||
static inline float GrNormalizeByteToFloat(uint8_t value) {
|
|
||||||
static const float ONE_OVER_255 = 1.f / 255.f;
|
|
||||||
return value * ONE_OVER_255;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Used to pick vertex attribute types. */
|
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
--- a/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
@@ -755,12 +755,15 @@
|
||||||
|
extern FFCodec ff_libaom_av1_encoder;
|
||||||
|
extern const FFCodec ff_libaribb24_decoder;
|
||||||
|
extern const FFCodec ff_libcelt_decoder;
|
||||||
|
extern const FFCodec ff_libcodec2_encoder;
|
||||||
|
extern const FFCodec ff_libcodec2_decoder;
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
extern const FFCodec ff_libdav1d_decoder;
|
||||||
|
extern const FFCodec ff_libdavs2_decoder;
|
||||||
|
+extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
+#endif
|
||||||
|
extern const FFCodec ff_libfdk_aac_encoder;
|
||||||
|
extern const FFCodec ff_libfdk_aac_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_encoder;
|
||||||
|
extern const FFCodec ff_libgsm_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_ms_encoder;
|
||||||
|
@@ -783,11 +786,10 @@
|
||||||
|
extern const FFCodec ff_libspeex_encoder;
|
||||||
|
extern const FFCodec ff_libspeex_decoder;
|
||||||
|
extern const FFCodec ff_libsvtav1_encoder;
|
||||||
|
extern const FFCodec ff_libtheora_encoder;
|
||||||
|
extern const FFCodec ff_libtwolame_encoder;
|
||||||
|
-extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
extern const FFCodec ff_libvo_amrwbenc_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_decoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_encoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_decoder;
|
||||||
|
diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
--- a/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
@@ -9,12 +9,14 @@
|
||||||
|
&ff_flac_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_MP3_DECODER
|
||||||
|
&ff_mp3_decoder,
|
||||||
|
#endif
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
#if CONFIG_LIBDAV1D
|
||||||
|
&ff_libdav1d_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_AV1_DECODER
|
||||||
|
&ff_av1_decoder,
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
NULL };
|
||||||
|
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
|
||||||
|
--- a/media/ffvpx/libavcodec/moz.build
|
||||||
|
+++ b/media/ffvpx/libavcodec/moz.build
|
||||||
|
@@ -84,11 +84,10 @@
|
||||||
|
'cbs.c',
|
||||||
|
'cbs_av1.c',
|
||||||
|
'golomb.c',
|
||||||
|
'h264pred.c',
|
||||||
|
'imgconvert.c',
|
||||||
|
- 'libdav1d.c',
|
||||||
|
'mathtables.c',
|
||||||
|
'qsv_api.c',
|
||||||
|
'raw.c',
|
||||||
|
'videodsp.c',
|
||||||
|
'vp8.c',
|
||||||
|
@@ -107,14 +106,19 @@
|
||||||
|
'vp9mvs.c',
|
||||||
|
'vp9prob.c',
|
||||||
|
'vp9recon.c',
|
||||||
|
'vpx_rac.c',
|
||||||
|
]
|
||||||
|
- USE_LIBS += [
|
||||||
|
- 'dav1d',
|
||||||
|
- 'media_libdav1d_asm',
|
||||||
|
- ]
|
||||||
|
+ if CONFIG['MOZ_AV1']:
|
||||||
|
+ USE_LIBS += [
|
||||||
|
+ 'dav1d',
|
||||||
|
+ 'media_libdav1d_asm',
|
||||||
|
+ ]
|
||||||
|
+ SOURCES += [
|
||||||
|
+ 'libdav1d.c',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WAYLAND']:
|
||||||
|
LOCAL_INCLUDES += ['/media/mozva']
|
||||||
|
SOURCES += [
|
||||||
|
'vaapi_av1.c',
|
||||||
|
'vaapi_decode.c',
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
|
|
||||||
--- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm 2017-03-03 13:53:52.480754536 +0100
|
|
||||||
+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h 2017-03-03 13:56:01.476018102 +0100
|
|
||||||
@@ -203,6 +203,10 @@
|
|
||||||
#define SK_ARM_HAS_CRC32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if defined(__aarch64__)
|
|
||||||
+ #undef SK_ARM_HAS_NEON
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#if !defined(SKIA_IMPLEMENTATION)
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# Parent acf59ea86dd1d878b43920832093f082dcfc61c0
|
|
||||||
|
|
||||||
diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
|
|
||||||
--- a/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Mon Mar 09 08:26:10 2020 +0100
|
|
||||||
+++ b/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Fri Mar 27 13:30:28 2020 +0100
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
|
|
||||||
#include "include/core/SkPaint.h"
|
|
||||||
#include "src/shaders/gradients/Sk4fLinearGradient.h"
|
|
||||||
-
|
|
||||||
+#include "src/core/SkEndian.h"
|
|
||||||
#include <cmath>
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
|
|
||||||
while (n >= 4) {
|
|
||||||
DstTraits<premul>::store4x(c0, c1, c2, c3, dst, bias0, bias1);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ SkEndianSwap32s(dst, 4);
|
|
||||||
+#endif
|
|
||||||
dst += 4;
|
|
||||||
|
|
||||||
c0 = c0 + dc4;
|
|
||||||
@@ -37,12 +40,23 @@
|
|
||||||
n -= 4;
|
|
||||||
}
|
|
||||||
if (n & 2) {
|
|
||||||
- DstTraits<premul>::store(c0, dst++, bias0);
|
|
||||||
- DstTraits<premul>::store(c1, dst++, bias1);
|
|
||||||
+ DstTraits<premul>::store(c0, dst, bias0);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
+ ++dst;
|
|
||||||
+ DstTraits<premul>::store(c1, dst, bias1);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
+ ++dst;
|
|
||||||
c0 = c0 + dc2;
|
|
||||||
}
|
|
||||||
if (n & 1) {
|
|
||||||
DstTraits<premul>::store(c0, dst, bias0);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
|
|
||||||
--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/moz.configure/lto-pgo.configure 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -247,8 +247,8 @@ def lto(
|
|
||||||
cflags.append("-flto")
|
|
||||||
ldflags.append("-flto")
|
|
||||||
else:
|
|
||||||
- cflags.append("-flto=thin")
|
|
||||||
- ldflags.append("-flto=thin")
|
|
||||||
+ cflags.append("-flto")
|
|
||||||
+ ldflags.append("-flto")
|
|
||||||
|
|
||||||
if target.os == "Android" and value == "cross":
|
|
||||||
# Work around https://github.com/rust-lang/rust/issues/90088
|
|
||||||
@@ -264,7 +264,7 @@ def lto(
|
|
||||||
if value == "full":
|
|
||||||
cflags.append("-flto")
|
|
||||||
else:
|
|
||||||
- cflags.append("-flto=thin")
|
|
||||||
+ cflags.append("-flto")
|
|
||||||
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
|
|
||||||
# AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
|
|
||||||
cflags.append("-fuse-ld=lld")
|
|
||||||
diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
|
|
||||||
--- firefox-99.0/build/pgo/profileserver.py.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/pgo/profileserver.py 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -11,7 +11,7 @@ import glob
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
import mozcrash
|
|
||||||
-from mozbuild.base import MozbuildObject, BinaryNotFoundException
|
|
||||||
+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
|
|
||||||
from mozfile import TemporaryDirectory
|
|
||||||
from mozhttpd import MozHttpd
|
|
||||||
from mozprofile import FirefoxProfile, Preferences
|
|
||||||
@@ -87,9 +87,22 @@ if __name__ == "__main__":
|
|
||||||
locations = ServerLocations()
|
|
||||||
locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
|
|
||||||
|
|
||||||
- old_profraw_files = glob.glob("*.profraw")
|
|
||||||
- for f in old_profraw_files:
|
|
||||||
- os.remove(f)
|
|
||||||
+ using_gcc = False
|
|
||||||
+ try:
|
|
||||||
+ if build.config_environment.substs.get('CC_TYPE') == 'gcc':
|
|
||||||
+ using_gcc = True
|
|
||||||
+ except BuildEnvironmentNotFoundException:
|
|
||||||
+ pass
|
|
||||||
+
|
|
||||||
+ if using_gcc:
|
|
||||||
+ for dirpath, _, filenames in os.walk('.'):
|
|
||||||
+ for f in filenames:
|
|
||||||
+ if f.endswith('.gcda'):
|
|
||||||
+ os.remove(os.path.join(dirpath, f))
|
|
||||||
+ else:
|
|
||||||
+ old_profraw_files = glob.glob('*.profraw')
|
|
||||||
+ for f in old_profraw_files:
|
|
||||||
+ os.remove(f)
|
|
||||||
|
|
||||||
with TemporaryDirectory() as profilePath:
|
|
||||||
# TODO: refactor this into mozprofile
|
|
||||||
@@ -212,6 +225,10 @@ if __name__ == "__main__":
|
|
||||||
print("Firefox exited successfully, but produced a crashreport")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
+ print('Copying profile data....')
|
|
||||||
+ os.system('pwd');
|
|
||||||
+ os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
|
|
||||||
+
|
|
||||||
llvm_profdata = env.get("LLVM_PROFDATA")
|
|
||||||
if llvm_profdata:
|
|
||||||
profraw_files = glob.glob("*.profraw")
|
|
||||||
diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
|
|
||||||
--- firefox-99.0/build/unix/mozconfig.unix.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/unix/mozconfig.unix 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
|
|
||||||
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
|
|
||||||
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
|
|
||||||
|
|
||||||
+ if [ -n "$MOZ_PGO" ]; then
|
|
||||||
+ if [ -z "$USE_ARTIFACT" ]; then
|
|
||||||
+ ac_add_options --enable-lto
|
|
||||||
+ fi
|
|
||||||
+ export AR="$topsrcdir/gcc/bin/gcc-ar"
|
|
||||||
+ export NM="$topsrcdir/gcc/bin/gcc-nm"
|
|
||||||
+ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
# We want to make sure we use binutils and other binaries in the tooltool
|
|
||||||
# package.
|
|
||||||
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
|
|
||||||
diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
|
|
||||||
--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo 2022-03-31 01:24:50.000000000 +0200
|
|
||||||
+++ firefox-99.0/extensions/spellcheck/src/moz.build 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
|
|
||||||
"mozInlineSpellChecker.h",
|
|
||||||
"mozSpellChecker.h",
|
|
||||||
]
|
|
||||||
+
|
|
||||||
+CXXFLAGS += ['-fno-devirtualize']
|
|
||||||
diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
|
|
||||||
--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
+++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp 2022-04-04 10:19:07.022239556 +0200
|
|
||||||
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ // Disable watchdog for PGO train builds - writting profile information at
|
|
||||||
+ // exit may take time and it is better to make build hang rather than
|
|
||||||
+ // silently produce poorly performing binary.
|
|
||||||
+ crashAfterMS = INT32_MAX;
|
|
||||||
+
|
|
||||||
UniquePtr<Options> options(new Options());
|
|
||||||
// crashAfterTicks is guaranteed to be > 0 as
|
|
||||||
// crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Print reftest failures and compose them to html
|
|
||||||
|
|
||||||
TEST_DIR="$1"
|
|
||||||
TEST_FLAVOUR="$2"
|
|
||||||
OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
|
|
||||||
|
|
||||||
grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
|
|
||||||
sed -i '/REFTEST IMAGE 1/a ">' $OUTPUT_FILE
|
|
||||||
sed -i '/REFTEST IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
|
|
||||||
sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
|
|
||||||
sed -i -e 's/^REFTEST IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
|
|
||||||
sed -i -e 's/^REFTEST IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Print failed tests
|
|
||||||
|
|
||||||
TEST_DIR=$1
|
|
||||||
TEST_FLAVOUR=$2
|
|
||||||
|
|
||||||
grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt
|
|
||||||
grep --text -e " FAIL " -e " TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt
|
|
||||||
grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Analyze and print test failures
|
|
||||||
|
|
||||||
export TEST_DIR="test_results"
|
|
||||||
|
|
||||||
#./print-errors $TEST_DIR ""
|
|
||||||
./print-errors $TEST_DIR "-wr"
|
|
||||||
#./print-error-reftest $TEST_DIR ""
|
|
||||||
./print-error-reftest $TEST_DIR "-wr"
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Analyze and print general test results
|
|
||||||
|
|
||||||
export TEST_DIR="test_results"
|
|
||||||
|
|
||||||
echo "Test results"
|
|
||||||
#echo "Basic compositor"
|
|
||||||
#./psummary $TEST_DIR ""
|
|
||||||
echo "WebRender"
|
|
||||||
./psummary $TEST_DIR "-wr"
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Analyze and print specialized (basic/webrender) test results
|
|
||||||
|
|
||||||
TEST_DIR=$1
|
|
||||||
TEST_FLAVOUR=$2
|
|
||||||
|
|
||||||
MPASS=`grep "TEST_END: Test OK" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
|
||||||
MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
|
||||||
MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
|
||||||
echo "Mochitest PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
|
|
||||||
|
|
||||||
XPCPASS=`grep --text "Expected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
|
|
||||||
XPCFAIL=`grep --text "Unexpected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
|
|
||||||
echo "XPCShell: PASSED: $XPCPASS FAILED: $XPCFAIL"
|
|
||||||
|
|
||||||
CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
|
||||||
CRFAIL=`grep "^REFTEST INFO | Unexpected:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
|
||||||
echo "Crashtest: PASSED: $CRPASS FAILED: $CRFAIL"
|
|
||||||
|
|
||||||
RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
|
||||||
RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
|
||||||
RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
|
|
||||||
echo "Reftest: PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
|
|
||||||
--- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 2017-07-31 18:20:48.000000000 +0200
|
|
||||||
+++ firefox-55.0/js/src/old-configure.in 2017-08-02 14:31:32.190243669 +0200
|
|
||||||
@@ -541,7 +541,7 @@ case "$host" in
|
|
||||||
|
|
||||||
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
|
||||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
|
||||||
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
|
||||||
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
@@ -617,8 +617,8 @@ case "$target" in
|
|
||||||
|
|
||||||
*-*linux*)
|
|
||||||
if test "$GNU_CC" -o "$GNU_CXX"; then
|
|
||||||
- MOZ_PGO_OPTIMIZE_FLAGS="-O3"
|
|
||||||
- MOZ_OPTIMIZE_FLAGS="-O3"
|
|
||||||
+ MOZ_PGO_OPTIMIZE_FLAGS="-O1"
|
|
||||||
+ MOZ_OPTIMIZE_FLAGS="-O1"
|
|
||||||
if test -z "$CLANG_CC"; then
|
|
||||||
MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
|
|
||||||
fi
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# usage: run-tests-wayland [test flavour]
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
RUN_XPCSHELL_TEST=1
|
|
||||||
RUN_REFTEST=1
|
|
||||||
RUN_MOCHITEST=1
|
|
||||||
RUN_CRASHTEST=1
|
|
||||||
|
|
||||||
while (( "$#" )); do
|
|
||||||
SELECTED_TEST=$1
|
|
||||||
if [ "$SELECTED_TEST" = "xpcshell" ] ; then
|
|
||||||
RUN_XPCSHELL_TEST=1
|
|
||||||
elif [ "$SELECTED_TEST" = "reftest" ] ; then
|
|
||||||
RUN_REFTEST=1
|
|
||||||
elif [ "$SELECTED_TEST" = "mochitest" ] ; then
|
|
||||||
RUN_MOCHITEST=1
|
|
||||||
elif [ "$SELECTED_TEST" = "crashtest" ] ; then
|
|
||||||
RUN_CRASHTEST=1
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
export MACH_USE_SYSTEM_PYTHON=1
|
|
||||||
export MOZ_NODE_PATH=/usr/bin/node
|
|
||||||
|
|
||||||
MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
|
|
||||||
TEST_DIR="test_results"
|
|
||||||
mkdir $TEST_DIR
|
|
||||||
|
|
||||||
env | grep "DISPLAY"
|
|
||||||
|
|
||||||
# Fix for system nss
|
|
||||||
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
|
||||||
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
|
||||||
|
|
||||||
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
|
||||||
|
|
||||||
export MOZ_ENABLE_WAYLAND=1
|
|
||||||
|
|
||||||
if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
|
|
||||||
# ./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell
|
|
||||||
./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
|
|
||||||
sleep 60
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Basic render testing
|
|
||||||
export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true"
|
|
||||||
#export TEST_FLAVOUR=""
|
|
||||||
#if [ $RUN_REFTEST -ne 0 ] ; then
|
|
||||||
# ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
|
||||||
#fi
|
|
||||||
#if [ $RUN_CRASHTEST -ne 0 ] ; then
|
|
||||||
# ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
|
||||||
#fi
|
|
||||||
#if [ $RUN_MOCHITEST -ne 0 ] ; then
|
|
||||||
# ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
|
||||||
#fi
|
|
||||||
|
|
||||||
# WebRender testing
|
|
||||||
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
|
||||||
export TEST_FLAVOUR="-wr"
|
|
||||||
# Use dom/base/test or dom/base/test/chrome for short version
|
|
||||||
export MOCHITEST_DIR='dom'
|
|
||||||
if [ $RUN_REFTEST -ne 0 ] ; then
|
|
||||||
./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
|
||||||
sleep 60
|
|
||||||
fi
|
|
||||||
if [ $RUN_CRASHTEST -ne 0 ] ; then
|
|
||||||
./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
|
||||||
sleep 60
|
|
||||||
fi
|
|
||||||
if [ $RUN_MOCHITEST -ne 0 ] ; then
|
|
||||||
./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
|
||||||
sleep 60
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f objdir/dist/bin/certutil
|
|
||||||
rm -f objdir/dist/bin/pk12util
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
set -x
|
|
||||||
|
|
||||||
export MACH_USE_SYSTEM_PYTHON=1
|
|
||||||
export MOZ_NODE_PATH=/usr/bin/node
|
|
||||||
export X_PARAMS="-screen 0 1600x1200x24"
|
|
||||||
export MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
|
|
||||||
export TEST_DIR="test_results"
|
|
||||||
|
|
||||||
# Fix for system nss
|
|
||||||
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
|
||||||
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
|
||||||
|
|
||||||
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
|
||||||
|
|
||||||
# Basic render testing
|
|
||||||
export TEST_PARAMS=""
|
|
||||||
export TEST_FLAVOUR=""
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
|
||||||
|
|
||||||
# WebRender testing
|
|
||||||
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
|
||||||
export TEST_FLAVOUR="-wr"
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
|
|
||||||
#sleep 60
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
|
||||||
#sleep 60
|
|
||||||
#xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
|
||||||
#sleep 60
|
|
||||||
#export DISPLAY=:0
|
|
||||||
#./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
|
||||||
export DISPLAY=:98
|
|
||||||
xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
|
||||||
|
|
||||||
rm -f objdir/dist/bin/certutil
|
|
||||||
rm -f objdir/dist/bin/pk12util
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
# Run wayland compositor and set WAYLAND_DISPLAY env variable
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
|
|
||||||
echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
|
|
||||||
echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
|
|
||||||
|
|
||||||
# Turn off the screen saver and screen locking
|
|
||||||
gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
|
|
||||||
gsettings set org.gnome.desktop.screensaver lock-enabled false
|
|
||||||
gsettings set org.gnome.desktop.screensaver lock-delay 3600
|
|
||||||
|
|
||||||
# Disable the screen saver
|
|
||||||
# This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
|
|
||||||
# store secrets. Firefox uses libsecret to store a key that protects sensitive information like
|
|
||||||
# credit card numbers.
|
|
||||||
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
|
|
||||||
# if not found, launch a new one
|
|
||||||
eval `dbus-launch --sh-syntax`
|
|
||||||
fi
|
|
||||||
eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
|
|
||||||
|
|
||||||
if [ -z "$XDG_RUNTIME_DIR" ]; then
|
|
||||||
export XDG_RUNTIME_DIR=$HOME
|
|
||||||
fi
|
|
||||||
|
|
||||||
. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
|
|
||||||
export DISPLAY=:80
|
|
||||||
|
|
||||||
if [ -z "$WAYLAND_DISPLAY" ] ; then
|
|
||||||
export WAYLAND_DISPLAY=wayland-0
|
|
||||||
else
|
|
||||||
export WAYLAND_DISPLAY=wayland-1
|
|
||||||
fi
|
|
||||||
sleep 10
|
|
||||||
retry_count=0
|
|
||||||
max_retries=5
|
|
||||||
until [ $retry_count -gt $max_retries ]; do
|
|
||||||
if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
|
|
||||||
retry_count=$(($max_retries + 1))
|
|
||||||
else
|
|
||||||
retry_count=$(($retry_count + 1))
|
|
||||||
echo "Waiting for Mutter, retry: $retry_count"
|
|
||||||
sleep 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
env | grep "DISPLAY"
|
|
||||||
@ -0,0 +1,260 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
function run_tests_wayland {
|
||||||
|
# usage: run-tests-wayland [test flavour]
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
RUN_XPCSHELL_TEST=1
|
||||||
|
RUN_REFTEST=1
|
||||||
|
RUN_MOCHITEST=1
|
||||||
|
RUN_CRASHTEST=1
|
||||||
|
|
||||||
|
while (( "$#" )); do
|
||||||
|
SELECTED_TEST=$1
|
||||||
|
if [ "$SELECTED_TEST" = "xpcshell" ] ; then
|
||||||
|
RUN_XPCSHELL_TEST=1
|
||||||
|
elif [ "$SELECTED_TEST" = "reftest" ] ; then
|
||||||
|
RUN_REFTEST=1
|
||||||
|
elif [ "$SELECTED_TEST" = "mochitest" ] ; then
|
||||||
|
RUN_MOCHITEST=1
|
||||||
|
elif [ "$SELECTED_TEST" = "crashtest" ] ; then
|
||||||
|
RUN_CRASHTEST=1
|
||||||
|
fi
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
export MACH_USE_SYSTEM_PYTHON=1
|
||||||
|
export MOZ_NODE_PATH=/usr/bin/node
|
||||||
|
|
||||||
|
MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
|
||||||
|
TEST_DIR="test_results"
|
||||||
|
mkdir $TEST_DIR
|
||||||
|
|
||||||
|
env | grep "DISPLAY"
|
||||||
|
|
||||||
|
# Fix for system nss
|
||||||
|
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
||||||
|
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
||||||
|
|
||||||
|
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
||||||
|
|
||||||
|
export MOZ_ENABLE_WAYLAND=1
|
||||||
|
|
||||||
|
if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
|
||||||
|
# ./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell
|
||||||
|
./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
|
||||||
|
sleep 60
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Basic render testing
|
||||||
|
export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true"
|
||||||
|
#export TEST_FLAVOUR=""
|
||||||
|
#if [ $RUN_REFTEST -ne 0 ] ; then
|
||||||
|
# ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
||||||
|
#fi
|
||||||
|
#if [ $RUN_CRASHTEST -ne 0 ] ; then
|
||||||
|
# ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||||
|
#fi
|
||||||
|
#if [ $RUN_MOCHITEST -ne 0 ] ; then
|
||||||
|
# ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||||
|
#fi
|
||||||
|
|
||||||
|
# WebRender testing
|
||||||
|
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
||||||
|
export TEST_FLAVOUR="-wr"
|
||||||
|
# Use dom/base/test or dom/base/test/chrome for short version
|
||||||
|
export MOCHITEST_DIR='dom'
|
||||||
|
if [ $RUN_REFTEST -ne 0 ] ; then
|
||||||
|
./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
||||||
|
sleep 60
|
||||||
|
fi
|
||||||
|
if [ $RUN_CRASHTEST -ne 0 ] ; then
|
||||||
|
./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||||
|
sleep 60
|
||||||
|
fi
|
||||||
|
if [ $RUN_MOCHITEST -ne 0 ] ; then
|
||||||
|
./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||||
|
sleep 60
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f objdir/dist/bin/certutil
|
||||||
|
rm -f objdir/dist/bin/pk12util
|
||||||
|
}
|
||||||
|
|
||||||
|
function run_tests_x11() {
|
||||||
|
set -x
|
||||||
|
|
||||||
|
export MACH_USE_SYSTEM_PYTHON=1
|
||||||
|
export MOZ_NODE_PATH=/usr/bin/node
|
||||||
|
export X_PARAMS="-screen 0 1600x1200x24"
|
||||||
|
export MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
|
||||||
|
export TEST_DIR="test_results"
|
||||||
|
|
||||||
|
# Fix for system nss
|
||||||
|
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
||||||
|
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
||||||
|
|
||||||
|
NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
||||||
|
|
||||||
|
# Basic render testing
|
||||||
|
export TEST_PARAMS=""
|
||||||
|
export TEST_FLAVOUR=""
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||||
|
|
||||||
|
# WebRender testing
|
||||||
|
export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
|
||||||
|
export TEST_FLAVOUR="-wr"
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
|
||||||
|
#sleep 60
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
|
||||||
|
#sleep 60
|
||||||
|
#xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
|
||||||
|
#sleep 60
|
||||||
|
#export DISPLAY=:0
|
||||||
|
#./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||||
|
export DISPLAY=:98
|
||||||
|
xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
|
||||||
|
|
||||||
|
rm -f objdir/dist/bin/certutil
|
||||||
|
rm -f objdir/dist/bin/pk12util
|
||||||
|
}
|
||||||
|
|
||||||
|
function run_wayland_compositor() {
|
||||||
|
# Run wayland compositor and set WAYLAND_DISPLAY env variable
|
||||||
|
set -x
|
||||||
|
|
||||||
|
echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
|
||||||
|
echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
|
||||||
|
echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
|
||||||
|
|
||||||
|
# Turn off the screen saver and screen locking
|
||||||
|
gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
|
||||||
|
gsettings set org.gnome.desktop.screensaver lock-enabled false
|
||||||
|
gsettings set org.gnome.desktop.screensaver lock-delay 3600
|
||||||
|
|
||||||
|
# Disable the screen saver
|
||||||
|
# This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
|
||||||
|
# store secrets. Firefox uses libsecret to store a key that protects sensitive information like
|
||||||
|
# credit card numbers.
|
||||||
|
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
|
||||||
|
# if not found, launch a new one
|
||||||
|
eval `dbus-launch --sh-syntax`
|
||||||
|
fi
|
||||||
|
eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
|
||||||
|
|
||||||
|
if [ -z "$XDG_RUNTIME_DIR" ]; then
|
||||||
|
export XDG_RUNTIME_DIR=$HOME
|
||||||
|
fi
|
||||||
|
|
||||||
|
. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
|
||||||
|
export DISPLAY=:80
|
||||||
|
|
||||||
|
if [ -z "$WAYLAND_DISPLAY" ] ; then
|
||||||
|
export WAYLAND_DISPLAY=wayland-0
|
||||||
|
else
|
||||||
|
export WAYLAND_DISPLAY=wayland-1
|
||||||
|
fi
|
||||||
|
sleep 10
|
||||||
|
retry_count=0
|
||||||
|
max_retries=5
|
||||||
|
until [ $retry_count -gt $max_retries ]; do
|
||||||
|
if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
|
||||||
|
retry_count=$(($max_retries + 1))
|
||||||
|
else
|
||||||
|
retry_count=$(($retry_count + 1))
|
||||||
|
echo "Waiting for Mutter, retry: $retry_count"
|
||||||
|
sleep 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
env | grep "DISPLAY"
|
||||||
|
}
|
||||||
|
|
||||||
|
function print_error_reftest() {
|
||||||
|
# Print reftest failures and compose them to html
|
||||||
|
|
||||||
|
TEST_DIR="$1"
|
||||||
|
TEST_FLAVOUR="$2"
|
||||||
|
OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
|
||||||
|
|
||||||
|
grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
|
||||||
|
sed -i '/REFTEST IMAGE 1/a ">' $OUTPUT_FILE
|
||||||
|
sed -i '/REFTEST IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
|
||||||
|
sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
|
||||||
|
sed -i -e 's/^REFTEST IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
|
||||||
|
sed -i -e 's/^REFTEST IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE
|
||||||
|
}
|
||||||
|
|
||||||
|
function print_errors() {
|
||||||
|
#!/usr/bin/bash
|
||||||
|
# Print failed tests
|
||||||
|
|
||||||
|
TEST_DIR=$1
|
||||||
|
TEST_FLAVOUR=$2
|
||||||
|
|
||||||
|
grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt
|
||||||
|
grep --text -e " FAIL " -e " TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt
|
||||||
|
grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
function print_failures() {
|
||||||
|
#!/usr/bin/bash
|
||||||
|
# Analyze and print test failures
|
||||||
|
|
||||||
|
export TEST_DIR="test_results"
|
||||||
|
|
||||||
|
#./print-errors $TEST_DIR ""
|
||||||
|
print_errors $TEST_DIR "-wr"
|
||||||
|
#./print-error-reftest $TEST_DIR ""
|
||||||
|
print_error_reftest $TEST_DIR "-wr"
|
||||||
|
}
|
||||||
|
|
||||||
|
function psummary() {
|
||||||
|
#!/usr/bin/bash
|
||||||
|
# Analyze and print specialized (basic/webrender) test results
|
||||||
|
|
||||||
|
TEST_DIR=$1
|
||||||
|
TEST_FLAVOUR=$2
|
||||||
|
|
||||||
|
MPASS=`grep "TEST_END: Test OK" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
||||||
|
MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
||||||
|
MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
|
||||||
|
echo "Mochitest PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
|
||||||
|
|
||||||
|
XPCPASS=`grep --text "Expected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
|
||||||
|
XPCFAIL=`grep --text "Unexpected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
|
||||||
|
echo "XPCShell: PASSED: $XPCPASS FAILED: $XPCFAIL"
|
||||||
|
|
||||||
|
CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||||
|
CRFAIL=`grep "^REFTEST INFO | Unexpected:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||||
|
echo "Crashtest: PASSED: $CRPASS FAILED: $CRFAIL"
|
||||||
|
|
||||||
|
RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||||
|
RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
|
||||||
|
RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
|
||||||
|
echo "Reftest: PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"
|
||||||
|
}
|
||||||
|
|
||||||
|
function print_results() {
|
||||||
|
#!/usr/bin/bash
|
||||||
|
# Analyze and print general test results
|
||||||
|
|
||||||
|
export TEST_DIR="test_results"
|
||||||
|
|
||||||
|
echo "Test results"
|
||||||
|
#echo "Basic compositor"
|
||||||
|
#./psummary $TEST_DIR ""
|
||||||
|
echo "WebRender"
|
||||||
|
psummary $TEST_DIR "-wr"
|
||||||
|
}
|
||||||
|
|
||||||
|
set -x
|
||||||
|
first=$1
|
||||||
|
shift
|
||||||
|
$first $*
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue