Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/files/, www-client/firefox/
Date: Fri, 28 Sep 2018 12:00:24
Message-Id: 1538136009.1a9acbce822f8f8459f2cc8dfe187fd036cf116b.whissi@gentoo
1 commit: 1a9acbce822f8f8459f2cc8dfe187fd036cf116b
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 28 11:59:39 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 28 12:00:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9acbce
7
8 www-client/firefox: add missing "errno.h" include in SandboxOpenedFiles.cpp
9
10 In addition, patch "firefox-60.0-rust-1.29-comp.patch" was dropped from
11 firefox-62.x wchi was added in previous commit b1e7185593b8d3f4c46481d4
12 because patch is already present.
13
14 Closes: https://bugs.gentoo.org/667096
15 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
16 Package-Manager: Portage-2.3.50, Repoman-2.3.11
17
18 ...missing-errno_h-in-SandboxOpenedFiles_cpp.patch | 27 ++++++++++++++++++++++
19 www-client/firefox/firefox-60.2.1-r1.ebuild | 1 +
20 www-client/firefox/firefox-62.0.2.ebuild | 2 +-
21 3 files changed, 29 insertions(+), 1 deletion(-)
22
23 diff --git a/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch b/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
24 new file mode 100644
25 index 00000000000..c746c73940e
26 --- /dev/null
27 +++ b/www-client/firefox/files/firefox-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
28 @@ -0,0 +1,27 @@
29 +https://bugs.gentoo.org/667096
30 +
31 +https://bugzilla.mozilla.org/show_bug.cgi?id=1480554
32 +--- a/security/sandbox/linux/SandboxOpenedFiles.cpp
33 ++++ b/security/sandbox/linux/SandboxOpenedFiles.cpp
34 +@@ -4,16 +4,17 @@
35 + * License, v. 2.0. If a copy of the MPL was not distributed with this file,
36 + * You can obtain one at http://mozilla.org/MPL/2.0/. */
37 +
38 + #include "SandboxOpenedFiles.h"
39 +
40 + #include "mozilla/Move.h"
41 + #include "SandboxLogging.h"
42 +
43 ++#include <errno.h>
44 + #include <fcntl.h>
45 + #include <unistd.h>
46 +
47 + namespace mozilla {
48 +
49 + // The default move constructor almost works, but Atomic isn't
50 + // move-constructable and the fd needs some special handling.
51 + SandboxOpenedFile::SandboxOpenedFile(SandboxOpenedFile&& aMoved)
52 +
53 +
54 +
55 +
56
57 diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild b/www-client/firefox/firefox-60.2.1-r1.ebuild
58 index 89ad061bccf..36964cc42d0 100644
59 --- a/www-client/firefox/firefox-60.2.1-r1.ebuild
60 +++ b/www-client/firefox/firefox-60.2.1-r1.ebuild
61 @@ -127,6 +127,7 @@ src_prepare() {
62 eapply "${FILESDIR}"/bug_1461221.patch
63 eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
64 eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
65 + eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
66
67 # Enable gnomebreakpad
68 if use debug ; then
69
70 diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
71 index 82a6728b4ee..bee2af62419 100644
72 --- a/www-client/firefox/firefox-62.0.2.ebuild
73 +++ b/www-client/firefox/firefox-62.0.2.ebuild
74 @@ -187,7 +187,7 @@ src_prepare() {
75 eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
76 eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch
77 eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580
78 - eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
79 + eapply "${FILESDIR}"/${PN}-60.0-missing-errno_h-in-SandboxOpenedFiles_cpp.patch
80
81 # Enable gnomebreakpad
82 if use debug ; then