Bug#939019: buster-pu: package epiphany-browser/3.32.1.2-3~deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debian-gtk-gnome@lists.debian.org
epiphany-browser in buster has a bundled copy of libdazzle, because the
system copy is too old. Unfortunately one of the other private libraries
doesn't have the necessary RUNPATH to load the private copy of libdazzle,
resulting in the "web extension" dlopened by the WebKit sandbox process
to provide some of Epiphany's functionality either failing to load (if
there is no system libdazzle) or loading a version older than intended
(if there is a system copy pulled in by some other package).
For now I've done a minimal fix rather than backporting upstream's entire
gnome-3-32 branch - hopefully some who knows this package better than me
can do a bigger update later.
smcv
diffstat for epiphany-browser-3.32.1.2 epiphany-browser-3.32.1.2
changelog | 21 ++++++
gbp.conf | 4 -
patches/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch | 31 ++++++++++
patches/series | 1
4 files changed, 55 insertions(+), 2 deletions(-)
diff -Nru epiphany-browser-3.32.1.2/debian/changelog epiphany-browser-3.32.1.2/debian/changelog
--- epiphany-browser-3.32.1.2/debian/changelog 2019-04-27 22:21:57.000000000 +0100
+++ epiphany-browser-3.32.1.2/debian/changelog 2019-08-30 22:39:13.000000000 +0100
@@ -1,3 +1,24 @@
+epiphany-browser (3.32.1.2-3~deb10u1) buster; urgency=medium
+
+ * Team upload
+ * Rebuild for Debian 10
+ - d/gbp.conf: Set packaging branch to debian/buster
+
+ -- Simon McVittie <smcv@debian.org> Fri, 30 Aug 2019 22:39:13 +0100
+
+epiphany-browser (3.32.1.2-3) unstable; urgency=medium
+
+ * Team upload
+ * d/gbp.conf: Set packaging branch to debian/unstable and upstream
+ branch to upstream/3.32.x
+ * d/p/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch:
+ Ensure that the web extension loads our bundled copy of libdazzle,
+ even though it only depends on libdazzle transitively via
+ libephymisc. Thanks to Carlos Alberto Lopez Perez for clarifying
+ precisely which component was failing to load. (Closes: #927731)
+
+ -- Simon McVittie <smcv@debian.org> Fri, 30 Aug 2019 18:45:23 +0100
+
epiphany-browser (3.32.1.2-2) unstable; urgency=medium
* Team upload
diff -Nru epiphany-browser-3.32.1.2/debian/gbp.conf epiphany-browser-3.32.1.2/debian/gbp.conf
--- epiphany-browser-3.32.1.2/debian/gbp.conf 2019-04-27 22:21:57.000000000 +0100
+++ epiphany-browser-3.32.1.2/debian/gbp.conf 2019-08-30 22:39:13.000000000 +0100
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/buster
+upstream-branch = upstream/3.32.x
upstream-vcs-tag = %(version)s
[buildpackage]
diff -Nru epiphany-browser-3.32.1.2/debian/patches/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch epiphany-browser-3.32.1.2/debian/patches/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch
--- epiphany-browser-3.32.1.2/debian/patches/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch 1970-01-01 01:00:00.000000000 +0100
+++ epiphany-browser-3.32.1.2/debian/patches/lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch 2019-08-30 22:39:13.000000000 +0100
@@ -0,0 +1,31 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 30 Aug 2019 18:05:40 +0100
+Subject: lib: Give libephymisc a RUNPATH pointing to our private libraries
+
+The shared libephymisc depends on libdazzle, and gets loaded by the web
+extension. libdazzle might be a private library from the subproject, and
+setting a RUNPATH on libephywebextension (which does not itself depend
+on libdazzle) is not sufficient to get the private libdazzle loaded,
+at least when building with -Wl,--as-needed.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Bug-Debian: https://bugs.debian.org/927731
+Forwarded: https://gitlab.gnome.org/GNOME/epiphany/merge_requests/413
+---
+ lib/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index be5af33..0eb4757 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -87,7 +87,8 @@ libephymisc = shared_library('ephymisc',
+ dependencies: libephymisc_deps,
+ include_directories: libephymisc_includes,
+ install: true,
+- install_dir: pkglibdir
++ install_dir: pkglibdir,
++ install_rpath: pkglibdir
+ )
+
+ ephymisc_dep = declare_dependency(
diff -Nru epiphany-browser-3.32.1.2/debian/patches/series epiphany-browser-3.32.1.2/debian/patches/series
--- epiphany-browser-3.32.1.2/debian/patches/series 2019-04-27 22:21:57.000000000 +0100
+++ epiphany-browser-3.32.1.2/debian/patches/series 2019-08-30 22:39:13.000000000 +0100
@@ -12,6 +12,7 @@
web-extension-Don-t-prompt-to-remember-passwords-when-dis.patch
Fix-too-many-actions-disabled-in-incognito-automation-mod.patch
gsb-service-ref-self-for-lifetime-of-update-thread.patch
+lib-Give-libephymisc-a-RUNPATH-pointing-for-our-private-l.patch
00_epiphany-browser.patch
07_bookmarks.patch
dont-make-compulsory.patch
Reply to: