Added fix for rhbz#1414535

This commit is contained in:
Martin Stransky 2017-02-27 10:47:29 +01:00
parent 16a08c459e
commit 31c2c8ce42
2 changed files with 43 additions and 1 deletions

View File

@ -98,7 +98,7 @@ ExcludeArch: armv7hl
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 51.0.1 Version: 51.0.1
Release: 6%{?pre_tag}%{?dist} Release: 7%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -136,6 +136,7 @@ Patch224: mozilla-1170092.patch
Patch225: mozilla-1005640-accept-lang.patch Patch225: mozilla-1005640-accept-lang.patch
#ARM run-time patch #ARM run-time patch
Patch226: rhbz-1354671.patch Patch226: rhbz-1354671.patch
Patch227: rhbz-1414535.patch
# Upstream patches # Upstream patches
Patch304: mozilla-1253216.patch Patch304: mozilla-1253216.patch
@ -287,6 +288,7 @@ cd %{tarballdir}
%ifarch aarch64 %ifarch aarch64
%patch226 -p1 -b .1354671 %patch226 -p1 -b .1354671
%endif %endif
%patch227 -p1 -b .rh1414535
%patch304 -p1 -b .1253216 %patch304 -p1 -b .1253216
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
@ -790,6 +792,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Feb 27 2017 Martin Stransky <stransky@redhat.com> - 51.0.1-7
- Added fix for rhbz#1414535
* Thu Feb 23 2017 Martin Stransky <stransky@redhat.com> - 51.0.1-6 * Thu Feb 23 2017 Martin Stransky <stransky@redhat.com> - 51.0.1-6
- Added fix for mozbz#1321579 - Added fix for mozbz#1321579

37
rhbz-1414535.patch Normal file
View File

@ -0,0 +1,37 @@
diff -up ./CertVerifier.cpp.ignoreBuiltinStatus ./CertVerifier.cpp
--- ./security/certverifier/CertVerifier.cpp.ignoreBuiltinStatus 2016-10-31 21:15:28.000000000 +0100
+++ ./security/certverifier/CertVerifier.cpp 2016-12-16 21:35:32.155105623 +0100
@@ -65,6 +65,9 @@ InitCertVerifierLog()
Result
IsCertChainRootBuiltInRoot(const UniqueCERTCertList& chain, bool& result)
{
+ result = false;
+ return Success;
+#if 0
if (!chain || CERT_LIST_EMPTY(chain)) {
return Result::FATAL_ERROR_LIBRARY_FAILURE;
}
@@ -77,12 +80,15 @@ IsCertChainRootBuiltInRoot(const UniqueC
return Result::FATAL_ERROR_LIBRARY_FAILURE;
}
return IsCertBuiltInRoot(root, result);
+#endif
}
Result
IsCertBuiltInRoot(CERTCertificate* cert, bool& result)
{
result = false;
+ return Success;
+#if 0
#ifdef DEBUG
nsCOMPtr<nsINSSComponent> component(do_GetService(PSM_COMPONENT_CONTRACTID));
if (!component) {
@@ -114,6 +120,7 @@ IsCertBuiltInRoot(CERTCertificate* cert,
}
}
return Success;
+#endif
}
static Result