--- a/MozillaFirefox/MozillaFirefox.changes Fri Mar 16 18:31:19 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Tue Mar 27 08:29:31 2018 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Mar 21 17:14:24 UTC 2018 - cgrobertson@suse.com
+
+- Added patches:
+ * mozilla-i586-DecoderDoctorLogger.patch - bmo#1447070
+ fixes non-unified build error
+ * mozilla-i586-domPrefs.patch - DOMPrefs.h
+ fixes 32bit build error
+
+-------------------------------------------------------------------
Fri Mar 16 06:40:11 UTC 2018 - wr@rosenauer.org
- update to Firefox 59.0.1 (bsc#1085671)
@@ -7,6 +16,7 @@
Vorbis audio processing out of bounds write
* CVE-2018-5147 (bmo#1446365)
Out of bounds memory write in libtremor
+ (mozilla-bmo1446062.patch)
-------------------------------------------------------------------
Wed Mar 14 19:27:07 UTC 2018 - cgrobertson@suse.com
--- a/MozillaFirefox/MozillaFirefox.spec Fri Mar 16 18:31:19 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Tue Mar 27 08:29:31 2018 +0200
@@ -151,6 +151,9 @@
Patch7: mozilla-aarch64-startup-crash.patch
Patch8: mozilla-bmo256180.patch
Patch9: mozilla-bmo1005535.patch
+Patch10: mozilla-bmo1446062.patch
+Patch11: mozilla-i586-DecoderDoctorLogger.patch
+Patch12: mozilla-i586-domPrefs.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@@ -262,6 +265,11 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
+%ifarch %ix86
+%patch11 -p1
+%patch12 -p1
+%endif
# Firefox
%patch101 -p1
%patch102 -p1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-bmo1446062.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,1 @@
+../mozilla-bmo1446062.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-i586-DecoderDoctorLogger.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,1 @@
+../mozilla-i586-DecoderDoctorLogger.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-i586-domPrefs.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,1 @@
+../mozilla-i586-domPrefs.patch
\ No newline at end of file
--- a/mozilla-bmo1005535.patch Fri Mar 16 18:31:19 2018 +0100
+++ b/mozilla-bmo1005535.patch Tue Mar 27 08:29:31 2018 +0200
@@ -1,7 +1,7 @@
# HG changeset patch
# Parent 376f185a0a757fe128be665adbb705f4a56461bc
# User Steve Singer <steve@ssinger.info>
-# Parent 23e95bbe4d5553a2ba9dda2a4a96a2029253597c
+# Parent 371f01835b6fe4cb6b7095a6c29f7bb54f6d6257
Bug 1005535 - Get skia GPU building on big endian.
diff --git a/gfx/skia/skia/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-bmo1446062.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,116 @@
+
+# HG changeset patch
+# User Thomas Daede <daede003@umn.edu>
+# Date 1521175629 25200
+# Node ID 5cd5586a2f48424a9031a3fa4c782954a9df9a52
+# Parent 494e5d5278ba6f5fdda9a2bb9ac7ca772653ee4a
+Bug 1446062: libtremor Vorbis fix. r=jmspeex a=dveditz
+
+diff --git a/media/libtremor/lib/tremor_codebook.c b/media/libtremor/lib/tremor_codebook.c
+--- a/media/libtremor/lib/tremor_codebook.c
++++ b/media/libtremor/lib/tremor_codebook.c
+@@ -253,26 +253,26 @@ long vorbis_book_decodevs_add(codebook *
+
+ if(shift>=0){
+ for (i = 0; i < step; i++) {
+ entry[i]=decode_packed_entry_number(book,b);
+ if(entry[i]==-1)return(-1);
+ t[i] = book->valuelist+entry[i]*book->dim;
+ }
+ for(i=0,o=0;i<book->dim;i++,o+=step)
+- for (j=0;j<step;j++)
++ for (j=0;o+j<n && j<step;j++)
+ a[o+j]+=t[j][i]>>shift;
+ }else{
+ for (i = 0; i < step; i++) {
+ entry[i]=decode_packed_entry_number(book,b);
+ if(entry[i]==-1)return(-1);
+ t[i] = book->valuelist+entry[i]*book->dim;
+ }
+ for(i=0,o=0;i<book->dim;i++,o+=step)
+- for (j=0;j<step;j++)
++ for (j=0;o+j<n && j<step;j++)
+ a[o+j]+=t[j][i]<<-shift;
+ }
+ }
+ return(0);
+ }
+
+ /* decode vector / dim granularity gaurding is done in the upper layer */
+ long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a,
+@@ -282,25 +282,25 @@ long vorbis_book_decodev_add(codebook *b
+ ogg_int32_t *t;
+ int shift=point-book->binarypoint;
+
+ if(shift>=0){
+ for(i=0;i<n;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ t = book->valuelist+entry*book->dim;
+- for (j=0;j<book->dim;)
++ for (j=0;i<n && j<book->dim;)
+ a[i++]+=t[j++]>>shift;
+ }
+ }else{
+ for(i=0;i<n;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ t = book->valuelist+entry*book->dim;
+- for (j=0;j<book->dim;)
++ for (j=0;i<n && j<book->dim;)
+ a[i++]+=t[j++]<<-shift;
+ }
+ }
+ }
+ return(0);
+ }
+
+ /* unlike the others, we guard against n not being an integer number
+@@ -347,41 +347,41 @@ long vorbis_book_decodev_set(codebook *b
+ /* decode vector / dim granularity gaurding is done in the upper layer */
+ long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\
+ long offset,int ch,
+ oggpack_buffer *b,int n,int point){
+ if(book->used_entries>0){
+ long i,j,entry;
+ int chptr=0;
+ int shift=point-book->binarypoint;
+-
++ int m=offset+n;
+ if(shift>=0){
+
+- for(i=offset;i<offset+n;){
++ for(i=offset;i<m;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ {
+ const ogg_int32_t *t = book->valuelist+entry*book->dim;
+- for (j=0;j<book->dim;j++){
++ for (j=0;i<m && j<book->dim;j++){
+ a[chptr++][i]+=t[j]>>shift;
+ if(chptr==ch){
+ chptr=0;
+ i++;
+ }
+ }
+ }
+ }
+ }else{
+
+- for(i=offset;i<offset+n;){
++ for(i=offset;i<m;){
+ entry = decode_packed_entry_number(book,b);
+ if(entry==-1)return(-1);
+ {
+ const ogg_int32_t *t = book->valuelist+entry*book->dim;
+- for (j=0;j<book->dim;j++){
++ for (j=0;i<m && j<book->dim;j++){
+ a[chptr++][i]+=t[j]<<-shift;
+ if(chptr==ch){
+ chptr=0;
+ i++;
+ }
+ }
+ }
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-i586-DecoderDoctorLogger.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent f3fe334a20e8a63266eb06c5d298ad793cefc015
+Mozilla Bug#1447070 - DecoderDoctorLogger.h must be included in MediaKeySession.h
+ to fix non-unified build error for i586 target.
+
+diff --git a/dom/media/eme/MediaKeySession.h b/dom/media/eme/MediaKeySession.h
+--- a/dom/media/eme/MediaKeySession.h
++++ b/dom/media/eme/MediaKeySession.h
+@@ -2,16 +2,17 @@
+ /* vim: set ts=8 sts=2 et sw=2 tw=80: */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #ifndef mozilla_dom_MediaKeySession_h
+ #define mozilla_dom_MediaKeySession_h
+
++#include "DecoderDoctorLogger.h"
+ #include "mozilla/Attributes.h"
+ #include "mozilla/ErrorResult.h"
+ #include "nsCycleCollectionParticipant.h"
+ #include "mozilla/DOMEventTargetHelper.h"
+ #include "nsCOMPtr.h"
+ #include "mozilla/dom/TypedArray.h"
+ #include "mozilla/Mutex.h"
+ #include "mozilla/dom/Date.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-i586-domPrefs.patch Tue Mar 27 08:29:31 2018 +0200
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Andrea Marchesini <amarchesini@mozilla.com>
+# Parent bb4eb640e7303ea68be982d824aa100caacce240
+Mozilla Bug#1447409 - DOMPrefs.h must be included in WorkerScope, r=qdot
+ To fix 32bit build error for i586 target.
+
+diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h
+--- a/dom/workers/WorkerScope.h
++++ b/dom/workers/WorkerScope.h
+@@ -4,16 +4,17 @@
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #ifndef mozilla_dom_workerscope_h__
+ #define mozilla_dom_workerscope_h__
+
+ #include "Workers.h"
+ #include "mozilla/DOMEventTargetHelper.h"
++#include "mozilla/dom/DOMPrefs.h"
+ #include "mozilla/dom/Headers.h"
+ #include "mozilla/dom/RequestBinding.h"
+ #include "nsWeakReference.h"
+ #include "mozilla/dom/ImageBitmapSource.h"
+
+ namespace mozilla {
+ namespace dom {
+
--- a/series Fri Mar 16 18:31:19 2018 +0100
+++ b/series Tue Mar 27 08:29:31 2018 +0200
@@ -8,6 +8,9 @@
mozilla-aarch64-startup-crash.patch
mozilla-bmo256180.patch
mozilla-bmo1005535.patch
+mozilla-bmo1446062.patch
+mozilla-i586-DecoderDoctorLogger.patch
+mozilla-i586-domPrefs.patch
# Firefox patches
firefox-kde.patch