Accepting request 615288 from home:iznogood

- Update to version 3.28.3.1:
  + Fix missing symbol in 3.28.3 (glgo#GNOME/epiphany#33).
- Changes from version 3.28.3:
  + Fix CVE-2018-11396/CVE-2018-12016 (bgo#795740).
  + Allow Ctrl+T in app mode again due to unintended consequences
    (bgo#796204).
  + Don't remember passwords when the setting is disabled
    (bgo#796219).
  + Fix password manager crash on chase.com
    (glgo#GNOME/epiphany#11).
- Drop epiphany-fix-crash-CVE-2018-11396.patch: Fixed upstream.
- Drop epiphany-bring-back-tabs-webapp.patch: Upstream reverted the
  change too, so patch no longer needed.

OBS-URL: https://build.opensuse.org/request/show/615288
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=292
This commit is contained in:
Dominique Leuenberger 2018-06-08 21:24:47 +00:00 committed by Git OBS Bridge
parent e5c982f906
commit e2d253ff7c
6 changed files with 22 additions and 102 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:baa4e9f0ac0b1e95fa2027af796859114f448f0f274976c30c9b8db734c6402d
size 4470360

3
epiphany-3.28.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7
size 4475124

View File

@ -1,56 +0,0 @@
From c56294dd46db69c94f8238dd47f568ca57bc51c0 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Thu, 5 Apr 2018 11:52:24 -0500
Subject: Again disallow new tab action in app mode
Tabs still work, but only when opening a link
https://bugzilla.gnome.org/show_bug.cgi?id=795007
---
src/ephy-notebook.c | 7 +++++--
src/ephy-window.c | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 3833862..4a05b93 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -344,10 +344,12 @@ static void
update_tabs_visibility (EphyNotebook *nb,
gboolean before_inserting)
{
+ EphyEmbedShellMode mode;
gboolean show_tabs = FALSE;
guint num;
EphyPrefsUITabsBarVisibilityPolicy policy;
+ mode = ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (ephy_shell_get_default ()));
num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb));
if (before_inserting)
@@ -356,8 +358,9 @@ update_tabs_visibility (EphyNotebook *nb,
policy = g_settings_get_enum (EPHY_SETTINGS_UI,
EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY);
- if (((policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_MORE_THAN_ONE && num > 1) ||
- policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_ALWAYS))
+ if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION &&
+ ((policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_MORE_THAN_ONE && num > 1) ||
+ policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_ALWAYS))
show_tabs = TRUE;
/* Only show the tabs when the "tabs-allowed" property is TRUE. */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index e7aa10f..2bdf442 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2997,6 +2997,7 @@ static const char *disabled_actions_for_app_mode[] = { "open",
"save-as-application",
"encoding",
"bookmark-page",
+ "new-tab",
"home" };
static void
--
cgit v0.12

View File

@ -1,34 +0,0 @@
From 8c434004c0c5937c948cec6cccd95f547a0c14df Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Tue, 22 May 2018 21:06:32 -0500
Subject: [PATCH] session: Fix crash when JS opens an invalid URI
https://bugzilla.gnome.org/show_bug.cgi?id=795740
---
src/ephy-session.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 8a86cea..532930e 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -828,8 +828,15 @@ session_seems_sane (GList *windows)
SoupURI *uri;
gboolean sane = FALSE;
+ /* NULL URLs are possible when an invalid URL is opened by JS.
+ * E.g. <script>win = window.open("blah", "WIN");</script>
+ */
+ if (url == NULL)
+ continue;
+
/* Blank URLs can occur in some situations. Just ignore these, as they
- * are harmless and not an indicator of a corrupted session. */
+ * are harmless and not an indicator of a corrupted session.
+ */
if (strcmp (url, "") == 0)
continue;
--
libgit2 0.27.0

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jun 8 16:55:05 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.28.3.1:
+ Fix missing symbol in 3.28.3 (glgo#GNOME/epiphany#33).
- Changes from version 3.28.3:
+ Fix CVE-2018-11396/CVE-2018-12016 (bgo#795740).
+ Allow Ctrl+T in app mode again due to unintended consequences
(bgo#796204).
+ Don't remember passwords when the setting is disabled
(bgo#796219).
+ Fix password manager crash on chase.com
(glgo#GNOME/epiphany#11).
- Drop epiphany-fix-crash-CVE-2018-11396.patch: Fixed upstream.
- Drop epiphany-bring-back-tabs-webapp.patch: Upstream reverted the
change too, so patch no longer needed.
-------------------------------------------------------------------
Tue May 22 16:22:16 UTC 2018 - bjorn.lie@gmail.com

View File

@ -17,7 +17,7 @@
Name: epiphany
Version: 3.28.2.1
Version: 3.28.3.1
Release: 0
Summary: GNOME Web Browser
License: GPL-3.0-or-later
@ -25,11 +25,6 @@ Group: Productivity/Networking/Web/Browsers
URL: https://wiki.gnome.org/Apps/Web
Source0: http://download.gnome.org/sources/epiphany/3.28/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM epiphany-bring-back-tabs-webapp.patch -- Revert the revert for tabs in webapps.
# FIXME Drop epiphany-bring-back-tabs-webapp.patch on versionbump to 3.29, fixed differently on master.
Patch0: epiphany-bring-back-tabs-webapp.patch
# PATCH-FIX-UPSTREAM epiphany-fix-crash-CVE-2018-11396.patch CVE-2018-11396 bgo#795740 boo#1094464 -- session: Fix crash when JS opens an invalid URI
Patch1: epiphany-fix-crash-CVE-2018-11396.patch
BuildRequires: fdupes
BuildRequires: meson
@ -99,9 +94,7 @@ search results from Web (epiphany)
%lang_package
%prep
%autosetup -N
%patch0 -p1 -R
%patch1 -p1
%autosetup
translation-update-upstream
%build