From e2e09b49de32292a88a657b0e69c7ae0f1c925cf Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 22 2020 04:09:39 +0000 Subject: import thunderbird-78.3.0-1.el8 --- diff --git a/.gitignore b/.gitignore index f22940f..ebb6a59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ SOURCES/Python-2.7.13.tar.xz SOURCES/cbindgen-vendor-0.14.3.tar.xz -SOURCES/cbindgen-vendor.tar.xz SOURCES/gtk3-private-3.22.26-1.el6.src.rpm SOURCES/libffi-3.0.13-18.el7_3.src.rpm SOURCES/nodejs-10.21.0-4.fc32.src.rpm SOURCES/nspr-4.25.0-1.el8_0.src.rpm SOURCES/nss-3.53.1-3.fc32.src.rpm SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -SOURCES/thunderbird-78.2.1.source.tar.xz -SOURCES/thunderbird-langpacks-78.2.1-20200908.tar.xz +SOURCES/thunderbird-78.3.0.source.tar.xz +SOURCES/thunderbird-langpacks-78.3.0-20200919.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index baa22d6..929324d 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,12 +1,11 @@ 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz -e86c38c48960b95353503b78e1de9ddca1ed34d7 SOURCES/cbindgen-vendor.tar.xz 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm 5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-4.fc32.src.rpm 07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm 223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -a08e673de7c008e4725b4157f25b44482e0be54e SOURCES/thunderbird-78.2.1.source.tar.xz -8405170c497a835ecb0daa496cb064f6d3f7b4ad SOURCES/thunderbird-langpacks-78.2.1-20200908.tar.xz +6f7d458199f44627b38a8b5f841f6f9b39c6303a SOURCES/thunderbird-78.3.0.source.tar.xz +d9888ce2477f6a9ff10b0411bd4b372d01563a31 SOURCES/thunderbird-langpacks-78.3.0-20200919.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch deleted file mode 100644 index 6dfe2ad..0000000 --- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h ---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200 -+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200 -@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo - void* aContext) { - asm volatile("nop; nop; nop; nop" : : : "memory"); - -- asm volatile("b %0" : : "X"(H) : "memory"); -+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory"); - } - - # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch deleted file mode 100644 index 3f84f95..0000000 --- a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Sat, 1 Jun 2019 09:06:01 +0900 -Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and - user_vfp_exc. - ---- - js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 636537f8478..383c380f04c 100644 ---- a/js/src/wasm/WasmSignalHandlers.cpp -+++ b/js/src/wasm/WasmSignalHandlers.cpp -@@ -248,7 +248,16 @@ using mozilla::DebugOnly; - #endif - - #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS --# include -+struct user_vfp { -+ unsigned long long fpregs[32]; -+ unsigned long fpscr; -+}; -+ -+struct user_vfp_exc { -+ unsigned long fpexc; -+ unsigned long fpinst; -+ unsigned long fpinst2; -+}; - #endif - - #if defined(ANDROID) --- -2.20.1 - diff --git a/SOURCES/rhel6-abiv2-mozbz1642174.patch b/SOURCES/rhel6-abiv2-mozbz1642174.patch new file mode 100644 index 0000000..57d217c --- /dev/null +++ b/SOURCES/rhel6-abiv2-mozbz1642174.patch @@ -0,0 +1,29 @@ +diff -up firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/freebl.gyp +--- firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174 2020-09-12 08:29:08.527410514 +0200 ++++ firefox-78.2.0/security/nss/lib/freebl/freebl.gyp 2020-09-12 08:42:26.279064334 +0200 +@@ -259,7 +259,7 @@ + 'type': 'static_library', + 'sources': [ + 'gcm-ppc.c', +- 'sha512-p8.s', ++ #'sha512-p8.s', + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports' +diff -up firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/Makefile +--- firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174 2020-08-17 20:34:06.000000000 +0200 ++++ firefox-78.2.0/security/nss/lib/freebl/Makefile 2020-09-12 08:28:08.089142990 +0200 +@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) + endif + ifeq ($(CPU_ARCH),ppc) + EXTRA_SRCS += gcm-ppc.c +- ASFILES += sha512-p8.s + ifdef USE_64 + DEFINES += -DNSS_NO_INIT_SUPPORT ++ #PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') ++ # ifeq ($(PPC_ABI),2) ++ # ASFILES += sha512-p8.s ++ # endif + endif # USE_64 + endif # ppc + endif # Linux diff --git a/SOURCES/rhel6-auxvh.patch b/SOURCES/rhel6-auxvh.patch new file mode 100644 index 0000000..3234196 --- /dev/null +++ b/SOURCES/rhel6-auxvh.patch @@ -0,0 +1,39 @@ +diff -up firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx firefox-78.2.0/mozglue/build/ppc.cpp +--- firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx 2020-09-11 07:07:05.850864720 +0200 ++++ firefox-78.2.0/mozglue/build/ppc.cpp 2020-09-11 07:08:48.884202679 +0200 +@@ -14,10 +14,6 @@ + #if defined(XP_LINUX) + // Use the getauxval() function if available. + // ARCH_3_00 wasn't defined until glibc 2.23, so include just in case. +-# include +-# ifndef PPC_FEATURE2_ARCH_3_00 +-# define PPC_FEATURE2_ARCH_3_00 0x00800000 +-# endif + #endif + + const unsigned PPC_FLAG_VMX = 1; +@@ -33,24 +29,8 @@ static signed get_ppc_cpu_flags(void) { + } + cpu_flags = 0; + +-#if defined(XP_LINUX) +- // Try getauxval(). +- unsigned long int cap = getauxval(AT_HWCAP); +- unsigned long int cap2 = getauxval(AT_HWCAP2); +- +- if (cap & PPC_FEATURE_HAS_ALTIVEC) { +- cpu_flags |= PPC_FLAG_VMX; +- } +- if (cap & PPC_FEATURE_HAS_VSX) { +- cpu_flags |= PPC_FLAG_VSX; +- } +- if (cap2 & PPC_FEATURE2_ARCH_3_00) { +- cpu_flags |= PPC_FLAG_VSX3; +- } +-#else + // Non-Linux detection here. Currently, on systems other than Linux, + // no CPU SIMD features will be detected. +-#endif + + return cpu_flags; + } diff --git a/SOURCES/rhel6-dbusver.patch b/SOURCES/rhel6-dbusver.patch new file mode 100644 index 0000000..d07224b --- /dev/null +++ b/SOURCES/rhel6-dbusver.patch @@ -0,0 +1,41 @@ +diff -up firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/build.rs +--- firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver 2020-08-17 20:34:46.000000000 +0200 ++++ firefox-78.2.0/third_party/rust/libdbus-sys/build.rs 2020-09-09 21:06:34.932374254 +0200 +@@ -3,5 +3,5 @@ extern crate pkg_config; + fn main() { + // See https://github.com/joshtriplett/metadeps/issues/9 for why we don't use + // metadeps here, but instead keep this manually in sync with Cargo.toml. +- pkg_config::Config::new().atleast_version("1.6").probe("dbus-1").unwrap(); ++ pkg_config::Config::new().atleast_version("1.2").probe("dbus-1").unwrap(); + } +diff -up firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json +--- firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver 2020-08-17 20:35:05.000000000 +0200 ++++ firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json 2020-09-09 21:11:37.045287830 +0200 +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"9fbc218277d76a570c01c5795a7c8008f5458317cc036d7c88b1dc1a4af22fb7","src/lib.rs":"c8a0d43a3b7e9c8828d4946437379f1985492bd6b04fdd5e967bbcace2197c3d"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"} +\ No newline at end of file ++{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"41d24ea34bd37eb7a47253ac0681da2dde73e52caf04bbcecf795965e5d36466","src/lib.rs":"31e939a4a7f537265a84c91ba940ac31ac0f66c53a49971f1b21bbd2e4a7b5e9"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"} +diff -up firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs +--- firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver 2020-08-17 20:34:38.000000000 +0200 ++++ firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs 2020-09-09 21:06:34.933374260 +0200 +@@ -252,13 +252,14 @@ extern "C" { + pub fn dbus_signature_validate_single(signature: *const c_char, error: *mut DBusError) -> u32; + + pub fn dbus_threads_init_default() -> c_int; ++} ++ pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32 {return 1;} ++ pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32 {return 1;} ++ pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32 {return 1;} ++ pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32 {return 1;} ++ pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32 {return 1;} + +- pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32; +- pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32; +- pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32; +- pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32; +- pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32; +- ++extern "C" { + pub fn dbus_watch_get_enabled(watch: *mut DBusWatch) -> u32; + pub fn dbus_watch_get_flags(watch: *mut DBusWatch) -> c_uint; + pub fn dbus_watch_get_unix_fd(watch: *mut DBusWatch) -> c_int; diff --git a/SOURCES/rhel6-kernel.patch b/SOURCES/rhel6-kernel.patch new file mode 100644 index 0000000..4981285 --- /dev/null +++ b/SOURCES/rhel6-kernel.patch @@ -0,0 +1,16 @@ +diff -up firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc +--- firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel 2020-09-09 19:56:13.159597467 +0200 ++++ firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc 2020-09-09 19:56:31.457712629 +0200 +@@ -385,11 +385,7 @@ bool DeviceInfoLinux::IsDeviceNameMatche + + bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap) + { +- if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) { +- return cap->device_caps & V4L2_CAP_VIDEO_CAPTURE; +- } else { +- return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE; +- } ++ return false; + } + + int32_t DeviceInfoLinux::FillCapabilities(int fd) { diff --git a/SOURCES/rhel6-mach-fail.patch b/SOURCES/rhel6-mach-fail.patch new file mode 100644 index 0000000..286be5e --- /dev/null +++ b/SOURCES/rhel6-mach-fail.patch @@ -0,0 +1,12 @@ +diff -up firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py +--- firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail 2020-09-09 19:25:18.552930506 +0200 ++++ firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py 2020-09-09 19:25:31.081010223 +0200 +@@ -591,7 +591,7 @@ class TerminalLoggingHandler(logging.Han + if self.footer: + self.footer.clear() + +- self.fh.write(msg.encode("utf-8")) ++ self.fh.write(msg) + self.fh.write('\n') + + if self.footer: diff --git a/SOURCES/rhel6-zconst.patch b/SOURCES/rhel6-zconst.patch new file mode 100644 index 0000000..fedd335 --- /dev/null +++ b/SOURCES/rhel6-zconst.patch @@ -0,0 +1,12 @@ +diff -up firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp +--- firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst 2020-09-09 20:29:17.489123431 +0200 ++++ firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp 2020-09-09 20:30:09.544457350 +0200 +@@ -523,7 +523,7 @@ nsProfiler::GetProfileDataAsGzippedArray + stream.opaque = nullptr; + stream.next_out = (Bytef*)outBuff.Elements(); + stream.avail_out = outBuff.Length(); +- stream.next_in = (z_const Bytef*)aResult.Data(); ++ stream.next_in = (Bytef*)aResult.Data(); + stream.avail_in = aResult.Length(); + + // A windowBits of 31 is the default (15) plus 16 for emitting a diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el6 b/SOURCES/thunderbird-centos-default-prefs.js.el6 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el6 +++ /dev/null @@ -1,30 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -# Allow users to set custom colors -# pref("browser.display.use_system_colors", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7 deleted file mode 100644 index 75de82e..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js.el7 +++ /dev/null @@ -1,30 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -# Allow users to set custom colors -# pref("browser.display.use_system_colors", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1"); -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-mozconfig b/SOURCES/thunderbird-mozconfig index 27091df..77b397a 100644 --- a/SOURCES/thunderbird-mozconfig +++ b/SOURCES/thunderbird-mozconfig @@ -19,6 +19,7 @@ ac_add_options --with-google-location-service-api-keyfile=../google-api-key ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key ac_add_options --disable-av1 ac_add_options --disable-crashreporter +ac_add_options --disable-openpgp export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 @@ -0,0 +1,30 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1"); +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +/* Use OS settings for UI language */ +pref("intl.locale.requested", ""); diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 new file mode 100644 index 0000000..c412cb5 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 @@ -0,0 +1,30 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1"); +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +/* Use OS settings for UI language */ +pref("intl.locale.requested", ""); diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 57c9ad0..02be7ab 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -1,7 +1,3 @@ -%ifarch %{arm} -%undefine _debugsource_packages -%endif - # Set for local builds only %global disable_toolsets 0 @@ -208,7 +204,7 @@ %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.2.1 +Version: 78.3.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -224,12 +220,11 @@ ExclusiveArch: i686 x86_64 ppc64 s390x # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20200908.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20200919.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz Source3: get-calendar-langpacks.sh -Source4: cbindgen-vendor.tar.xz Source10: thunderbird-mozconfig Source20: thunderbird.desktop @@ -249,8 +244,8 @@ Source301: yasm-1.2.0-3.el5.src.rpm Source303: libffi-3.0.13-18.el7_3.src.rpm Source304: nodejs-10.21.0-4.fc32.src.rpm Source305: openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -Source601: thunderbird-centos-default-prefs.js.el6 -Source701: thunderbird-centos-default-prefs.js.el7 +Source601: thunderbird-redhat-default-prefs.js.rhel6 +Source701: thunderbird-redhat-default-prefs.js.rhel7 ## Firefox patches @@ -312,6 +307,14 @@ Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch10001: Bug-1526653---fix_user_vfp_armv7.patch %endif +# RHEL6 patches +Patch600: rhel6-dbusver.patch +Patch601: rhel6-kernel.patch +Patch602: rhel6-mach-fail.patch +Patch603: rhel6-zconst.patch +Patch604: rhel6-auxvh.patch +Patch605: rhel6-abiv2-mozbz1642174.patch + %if %{?system_nss} %if !0%{?bundle_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -607,6 +610,15 @@ echo "use_bundled_yasm %{?use_bundled_yasm}" %patch1001 -p1 -b .ppc64le-inline %patch1004 -p1 -b .icu-make +%if 0%{?rhel} == 6 +%patch600 -p1 -b .rhel6-dbusver +%patch601 -p1 -b .rhel6-kernel +%patch602 -p1 -b .rhel6-mach-fail +%patch603 -p1 -b .rhel6-zconst +%patch604 -p1 -b .rhel6-auxvh +%patch605 -p1 -b .rhel6-abiv2-mozbz1642174 +%endif + # CentOS patches %if 0%{?centos} %patch10000 -p1 -b .mozilla-1238661 @@ -663,7 +675,7 @@ echo "ac_add_options --enable-system-hunspell" >> .mozconfig %endif %ifarch armv7hl # ARMv7 need that (rhbz#1426850) -%global optimize_flags "-g0 -O2 -fno-schedule-insns -fno-lto" +%global optimize_flags "-g -O2 -fno-schedule-insns" %endif %ifarch ppc64le aarch64 %global optimize_flags "-g -O2" @@ -906,7 +918,7 @@ function build_bundled_package() { # If needed build the bundled python 2.7 and 3.6 and put it in the PATH %if 0%{?use_bundled_python_3} pushd %{_builddir}/python3/Python-%{bundled_python_version_3} - ./configure --prefix="%{_buildrootdir}" --exec-prefix="%{_buildrootdir}" --libdir="%{_buildrootdir}/lib" --with-pydebug + ./configure --prefix="%{_buildrootdir}" --exec-prefix="%{_buildrootdir}" --libdir="%{_buildrootdir}/lib" make %{?_smp_mflags} install V=1 -j1 cp Tools/scripts/pathfix.py %{_buildrootdir}/bin popd @@ -1054,10 +1066,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif -%ifarch %{arm} -MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/') -export MOZ_DEBUG_FLAGS=" " -%endif # We don't wantfirefox to use CK_GCM_PARAMS_V3 in nss MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT" @@ -1136,6 +1144,11 @@ env ls %{_buildrootdir} +%if 0%{?rhel} == 6 +export POLICY_FILE="rhel6.config" +export POLICT_PATH="/etc/pki/nss-legacy" +%endif + %if 0%{?use_llvmts} scl enable llvm-toolset-%{llvm_version} './mach build -v' %else @@ -1421,6 +1434,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Sat Sep 19 2020 Jan Horak - 78.3.0-1 +- Update to 78.3.0 build1 + * Tue Sep 08 2020 Jan Horak - 78.2.1-1 - Update to 78.2.1 build1