stransky pushed to xulrunner (master). "Update to new version - 37.0.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 12:07:41 UTC 2015
>From cf90f2c273f8f1994ae24b07aefb584c48b62729 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky at redhat.com>
Date: Wed, 15 Apr 2015 14:07:31 +0200
Subject: Update to new version - 37.0.1
diff --git a/mozilla-1042889.patch b/mozilla-1042889.patch
deleted file mode 100644
index 6061b9b..0000000
--- a/mozilla-1042889.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js
---- a/dom/browser-element/BrowserElementChildPreload.js
-+++ b/dom/browser-element/BrowserElementChildPreload.js
-@@ -90,16 +90,17 @@ function getErrorClass(errorCode) {
- switch (NSPRCode) {
- case SEC_ERROR_UNKNOWN_ISSUER:
- case SEC_ERROR_UNTRUSTED_ISSUER:
- case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
- case SEC_ERROR_UNTRUSTED_CERT:
- case SSL_ERROR_BAD_CERT_DOMAIN:
- case SEC_ERROR_EXPIRED_CERTIFICATE:
- case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-+ case SEC_ERROR_CA_CERT_INVALID:
- case MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY:
- return Ci.nsINSSErrorsService.ERROR_CLASS_BAD_CERT;
- default:
- return Ci.nsINSSErrorsService.ERROR_CLASS_SSL_PROTOCOL;
- }
-
- return null;
- }
-diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp
---- a/security/manager/ssl/src/NSSErrorsService.cpp
-+++ b/security/manager/ssl/src/NSSErrorsService.cpp
-@@ -136,16 +136,17 @@ NSSErrorsService::GetErrorClass(nsresult
- // Overridable errors.
- case SEC_ERROR_UNKNOWN_ISSUER:
- case SEC_ERROR_UNTRUSTED_ISSUER:
- case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
- case SEC_ERROR_UNTRUSTED_CERT:
- case SSL_ERROR_BAD_CERT_DOMAIN:
- case SEC_ERROR_EXPIRED_CERTIFICATE:
- case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-+ case SEC_ERROR_CA_CERT_INVALID:
- case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY:
- *aErrorClass = ERROR_CLASS_BAD_CERT;
- break;
- // Non-overridable errors.
- default:
- *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
- break;
- }
-diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp
---- a/security/manager/ssl/src/SSLServerCertVerification.cpp
-+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
-@@ -287,16 +287,17 @@ private:
-
- // A probe value of 1 means "no error".
- uint32_t
- MapCertErrorToProbeValue(PRErrorCode errorCode)
- {
- switch (errorCode)
- {
- case SEC_ERROR_UNKNOWN_ISSUER: return 2;
-+ case SEC_ERROR_CA_CERT_INVALID: return 3;
- case SEC_ERROR_UNTRUSTED_ISSUER: return 4;
- case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: return 5;
- case SEC_ERROR_UNTRUSTED_CERT: return 6;
- case SEC_ERROR_INADEQUATE_KEY_USAGE: return 7;
- case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: return 8;
- case SSL_ERROR_BAD_CERT_DOMAIN: return 9;
- case SEC_ERROR_EXPIRED_CERTIFICATE: return 10;
- case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: return 11;
-@@ -321,16 +322,17 @@ DetermineCertOverrideErrors(CERTCertific
- MOZ_ASSERT(errorCodeMismatch == 0);
- MOZ_ASSERT(errorCodeExpired == 0);
-
- // Assumes the error prioritization described in mozilla::pkix's
- // BuildForward function. Also assumes that CERT_VerifyCertName was only
- // called if CertVerifier::VerifyCert succeeded.
- switch (defaultErrorCodeToReport) {
- case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
-+ case SEC_ERROR_CA_CERT_INVALID:
- case SEC_ERROR_UNKNOWN_ISSUER:
- case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY:
- {
- collectedErrors = nsICertOverrideService::ERROR_UNTRUSTED;
- errorCodeTrust = defaultErrorCodeToReport;
-
- SECCertTimeValidity validity = CERT_CheckCertValidTimes(cert, now, false);
- if (validity == secCertTimeUndetermined) {
diff --git a/xulrunner-33.0-libvpx-modern.patch b/xulrunner-33.0-libvpx-modern.patch
deleted file mode 100644
index 52d1839..0000000
--- a/xulrunner-33.0-libvpx-modern.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
---- xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 15:12:34.710923016 -0400
-+++ xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 15:12:48.278838658 -0400
-@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid
- // Creating a wrapper to the image - setting image data to NULL. Actual
- // pointer will be set in encode. Setting align to 1, as it is meaningless
- // (actual memory is not allocated).
-- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
-+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
- 1, NULL);
- // populate encoder configuration with default values
- if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
diff --git a/xulrunner.spec b/xulrunner.spec
index b7475e3..8449943 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -102,10 +102,8 @@ Patch200: mozilla-193-pkgconfig.patch
# Unable to install addons from https pages
Patch204: rhbz-966424.patch
Patch207: firefox-baseline-disable.patch
-Patch208: xulrunner-33.0-libvpx-modern.patch
# Upstream patches
-Patch300: mozilla-1042889.patch
# ---------------------------------------------------
@@ -246,10 +244,8 @@ cd %{tarballdir}
%ifarch %{ix86}
%patch207 -p2 -b .baseline
%endif
-%patch208 -p2 -b .modern
# Upstream patches
-%patch300 -p1 -b .1042889
%{__rm} -f .mozconfig
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xulrunner.git/commit/?h=master&id=cf90f2c273f8f1994ae24b07aefb584c48b62729
More information about the scm-commits
mailing list