diff --git a/CVE-2022-29536.patch b/CVE-2022-29536.patch deleted file mode 100644 index 85d7b0c..0000000 --- a/CVE-2022-29536.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 486da133569ebfc436c959a7419565ab102e8525 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 15 Apr 2022 18:09:46 -0500 -Subject: [PATCH] Fix memory corruption in ephy_string_shorten() - -This fixes a regression that I introduced in 232c613472b38ff0d0d97338f366024ddb9cd228. - -I got my browser stuck in a crash loop today while visiting a website -with a page title greater than ephy-embed.c's MAX_TITLE_LENGTH, the only -condition in which ephy_string_shorten() is ever used. Turns out this -commit is wrong: an ellipses is a multibyte character (three bytes in -UTF-8) and so we're writing past the end of the buffer when calling -strcat() here. Ooops. - -Shame it took nearly four years to notice and correct this. - -Part-of: ---- - lib/ephy-string.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/lib/ephy-string.c b/lib/ephy-string.c -index 35a148ab3..8e524d52c 100644 ---- a/lib/ephy-string.c -+++ b/lib/ephy-string.c -@@ -114,11 +114,10 @@ ephy_string_shorten (char *str, - /* create string */ - bytes = GPOINTER_TO_UINT (g_utf8_offset_to_pointer (str, target_length - 1) - str); - -- /* +1 for ellipsis, +1 for trailing NUL */ -- new_str = g_new (gchar, bytes + 1 + 1); -+ new_str = g_new (gchar, bytes + strlen ("…") + 1); - - strncpy (new_str, str, bytes); -- strcat (new_str, "…"); -+ strncpy (new_str + bytes, "…", strlen ("…") + 1); - - g_free (str); - --- -GitLab - diff --git a/epiphany-40.6.tar.xz b/epiphany-40.6.tar.xz deleted file mode 100644 index 69dd8d3..0000000 Binary files a/epiphany-40.6.tar.xz and /dev/null differ diff --git a/epiphany-42.2.tar.xz b/epiphany-42.2.tar.xz new file mode 100644 index 0000000..fa768a2 Binary files /dev/null and b/epiphany-42.2.tar.xz differ diff --git a/epiphany-default-bookmarks-openeuler.patch b/epiphany-default-bookmarks-openeuler.patch index a3827f5..e622c5a 100644 --- a/epiphany-default-bookmarks-openeuler.patch +++ b/epiphany-default-bookmarks-openeuler.patch @@ -1,6 +1,5 @@ -diff -up epiphany-3.38.5/data/default-bookmarks.rdf.in.orig epiphany-3.38.5/data/default-bookmarks.rdf.in ---- epiphany-3.38.5/data/default-bookmarks.rdf.in.orig 2021-06-04 22:38:08.004123000 +0800 -+++ epiphany-3.38.5/data/default-bookmarks.rdf.in 2021-06-24 17:15:02.167045701 +0800 +--- epiphany-42.0/data/default-bookmarks.rdf.in.orig 2022-04-01 11:09:19.574579040 +0800 ++++ epiphany-42.0/data/default-bookmarks.rdf.in 2022-04-01 11:10:04.676640672 +0800 @@ -6,6 +6,7 @@ diff --git a/epiphany.spec b/epiphany.spec index 376aa1b..6b9f78d 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,17 +1,16 @@ %global glib2_version 2.64.0 %global gtk3_version 3.24.0 %global webkit2gtk3_version 2.31.1 + Name: epiphany Epoch: 1 -Version: 40.6 +Version: 42.2 Release: 1 Summary: Web browser for GNOME -License: GPL-3.0+ and LGPL-2.1 and MIT and GPL+ and ISC +License: GPLv3+ URL: https://wiki.gnome.org/Apps/Web -Source0: https://download.gnome.org/sources/epiphany/40/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/epiphany/42/%{name}-%{version}.tar.xz Patch0: epiphany-default-bookmarks-openeuler.patch -# https://gitlab.gnome.org/GNOME/epiphany/-/issues/1766 -Patch1: CVE-2022-29536.patch BuildRequires: desktop-file-utils gcc gettext-devel iso-codes-devel itstool BuildRequires: libappstream-glib-devel meson pkgconfig(cairo) pkgconfig(evince-document-3.0) @@ -22,12 +21,24 @@ BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{glib2_version} BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gtk+-unix-print-3.0) >= %{gtk3_version} pkgconfig(hogweed) BuildRequires: pkgconfig(icu-uc) pkgconfig(json-glib-1.0) pkgconfig(libdazzle-1.0) -BuildRequires: pkgconfig(libhandy-1) pkgconfig(libnotify) pkgconfig(libportal) pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libhandy-1) pkgconfig(libnotify) pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libportal-gtk3) >= 0.5 BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(libxml-2.0) pkgconfig(libxslt) BuildRequires: pkgconfig(nettle) pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk3_version} BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk3_version} chrpath + Requires: %{name}-runtime%{?_isa} = %{epoch}:%{version}-%{release} +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: webkit2gtk3%{?_isa} >= %{webkit2gtk3_version} +Requires: gsettings-desktop-schemas +Requires: iso-codes + +Provides: bundled(gvdb) +Provides: bundled(highlightjs) +Provides: bundled(pdfjs) +Provides: bundled(readabilityjs) + %description Epiphany is the web browser for the GNOME desktop. Its goal is to be simple and easy to use. Epiphany ties together many GNOME components @@ -38,6 +49,7 @@ application. Summary: Epiphany runtime suitable for web applications Requires: gsettings-desktop-schemas gtk3%{?_isa} >= %{gtk3_version} iso-codes Requires: webkit2gtk3%{?_isa} >= %{webkit2gtk3_version} + %description runtime This package provides a runtime for web applications without actually installing the epiphany application itself. @@ -95,11 +107,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %config(noreplace)%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %changelog -* Thu May 5 2022 yaoxin - 40.6-1 -- Update to 40.6 for fix CVE-2021-45085-to-CVE-2021-45088 and add patch for CVE-2022-29536 - -* Mon Apr 11 2022 dillon chen - 3.38.6-1 -- update to 3.38.6 +* Mon Mar 28 2022 lin zhang 1:42.2-1 +- Update to 42.2 * Fri Sep 10 2021 lingsheng - 3.38.5-2 - Delete rpath setting diff --git a/epiphany.yaml b/epiphany.yaml index 4aa5fb7..e35dce8 100644 --- a/epiphany.yaml +++ b/epiphany.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: epiphany tag_prefix: "" -seperator: "." +separator: "."