From: Peter Michael Green Date: Thu, 26 Oct 2017 17:39:52 +0000 (+0000) Subject: Manual merge of version 2.16.6-1+rpi1 and 2.18.1-1 to produce 2.18.1-1+rpi1 X-Git-Tag: archive/raspbian/2.18.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb8c292461396e8a9eb8b72f4dfbce59781f66f9;p=webkit2gtk.git Manual merge of version 2.16.6-1+rpi1 and 2.18.1-1 to produce 2.18.1-1+rpi1 --- bb8c292461396e8a9eb8b72f4dfbce59781f66f9 diff --cc debian/changelog index 90787f7af0,8b4fe88570..d04acc06d7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,122 +1,130 @@@ - webkit2gtk (2.16.6-1+rpi1) buster-staging; urgency=medium ++webkit2gtk (2.18.1-1+rpi1) buster-staging; urgency=medium + - -- Raspbian forward porter Sat, 29 Jul 2017 11:13:57 +0000 ++ [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green at Sun, 25 Jan 2015 02:14:50 +0000] ++ * Disable javascript JIT as it doesn't appear to be armv6 compatible ++ (at least I assume that is the cause of the assembler errors) + - webkit2gtk (2.16.6-1) unstable; urgency=high ++ -- Peter Michael Green Thu, 26 Oct 2017 15:08:25 +0000 ++ + webkit2gtk (2.18.1-1) unstable; urgency=medium * New upstream release. - * The WebKitGTK+ security advisory WSA-2017-0006 lists the following + * The WebKitGTK+ security advisory WSA-2017-0008 lists the following security fixes in the latest versions of WebKitGTK+: - + CVE-2017-7020 (fixed in 2.16.1). - + CVE-2017-7006, CVE-2017-7012, CVE-2017-7019, CVE-2017-7038, - CVE-2017-7041, CVE-2017-7042, CVE-2017-7043, CVE-2017-7049 - (fixed in 2.16.2). - + CVE-2017-7011, CVE-2017-7040, CVE-2017-7059 (fixed in 2.16.3). - + CVE-2017-7052 (fixed in 2.16.4). - + CVE-2017-7018, CVE-2017-7030, CVE-2017-7034, CVE-2017-7037, - CVE-2017-7039, CVE-2017-7046, CVE-2017-7048, CVE-2017-7055, - CVE-2017-7056, CVE-2017-7061, CVE-2017-7064 (fixed in 2.16.6). + + CVE-2017-7081 and CVE-2017-7142 (fixed in 2.16.1). + + CVE-2017-7094 (fixed in 2.16.3). + + CVE-2017-7099 (fixed in 2.16.4). + + CVE-2017-7087, CVE-2017-7089, CVE-2017-7090, CVE-2017-7091, + CVE-2017-7092, CVE-2017-7093, CVE-2017-7095, CVE-2017-7096, + CVE-2017-7098, CVE-2017-7100, CVE-2017-7102, CVE-2017-7104, + CVE-2017-7107, CVE-2017-7109, CVE-2017-7111, CVE-2017-7117, + CVE-2017-7120 (fixed in 2.18.0). + * debian/control: + + Recommend the Pulseaudio or ALSA GStreamer plugins, since they're + needed for audio playback (Closes: #877281). + * debian/patches/fix-ftbfs-alpha.patch: + + This patch is no longer needed, drop it. + * Refresh all other patches. + * debian/control: + + Remove 'Priority: extra' fields, all packages have optional priority + now (the 'extra' priority has been deprecated). + * debian/copyright: + + Use https for the Format URL. + + -- Alberto Garcia Wed, 18 Oct 2017 14:36:55 +0300 + + webkit2gtk (2.18.0-2) unstable; urgency=medium + + * Upload to unstable. + * debian/gbp.conf: + + Update upstream branch name. + * The WebKitGTK+ security advisory WSA-2017-0007 lists the following + security fixes in WebKitGTK+ 2.16.3: + + CVE-2017-1000121. + + CVE-2017-1000122. + + -- Alberto Garcia Thu, 14 Sep 2017 10:44:32 +0300 + + webkit2gtk (2.18.0-1) experimental; urgency=medium + + * New upstream release. + + -- Alberto Garcia Mon, 11 Sep 2017 11:05:27 +0300 + + webkit2gtk (2.17.92-1) experimental; urgency=medium + + * New upstream development release. + * Disable GStreamerGL in the Hurd: + + Pass -DUSE_GSTREAMER_GL=OFF in debian/rules. + + Remove build dependency on libgstreamer-plugins-bad1.0-dev from + debian/control. + * debian/control: + + Recommmend libgl1-mesa-dri (Closes: #873084). + * debian/patches/fix-ftbfs-m68k.patch: + + Refresh. + + -- Alberto Garcia Mon, 04 Sep 2017 17:02:41 +0300 + + webkit2gtk (2.17.91-1) experimental; urgency=medium + + * New upstream development release. + * Refresh all patches and remove no-whole-archive.patch. + * debian/patches/fix-ftbfs-hurd.patch: + + Work around missing PATH_MAX definition in ConfigFile.h + * Disable GStreamerGL in kFreeBSD and sparc64: + + Pass -DUSE_GSTREAMER_GL=OFF in debian/rules. + + Remove build dependency on libgstreamer-plugins-bad1.0-dev from + debian/control. + + -- Alberto Garcia Fri, 18 Aug 2017 14:32:00 +0300 + + webkit2gtk (2.17.90-1) experimental; urgency=medium + + * New upstream development release. + * Refresh all patches. + * debian/control: + + Add build dependency on libtasn1-6-dev (for Web Crypto). + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. + * Disable GStreamerGL in armel and armhf, the usage of two different GL + implementations causes a build failure (see WebKit but #175127). + + debian/control: Don't install libgstreamer-plugins-bad1.0-dev in + those architectures. + + debian/rules: Pass -DUSE_GSTREAMER_GL=OFF. + * debian/patches/no-whole-archive.patch: + + Don't use --whole-archive for the WebKit2 target libraries. + + -- Alberto Garcia Thu, 10 Aug 2017 12:45:07 +0300 + + webkit2gtk (2.17.5-2) experimental; urgency=medium + + * debian/rules: + + Don't pass -DENABLE_DISASSEMBLER=0, this is no longer necessary. + + Don't disable JIT in arm64. + + Don't disable the gold linker in any architecture. + * debian/control: + + Add build dependency on mesa-common-dev (GStreamerGL needs GL/gl.h), + this is automatically pulled in some architectures by + libgl1-mesa-dev, but without it the build fails in all others. + * Refresh debian/patches/fix-ftbfs-m68k.patch. + + -- Alberto Garcia Fri, 04 Aug 2017 15:23:53 +0300 + + webkit2gtk (2.17.5-1) experimental; urgency=medium + + * New upstream development release. + * Refresh all patches. + * debian/source/lintian-overrides: + + Update source-is-missing overrides. * debian/patches/fix-ftbfs-m68k.patch: - + Fix FTBFS in m68k (Closes: #868126). + + Fix FTBFS in m68k. + * debian/control: + + Add build dependency on libgstreamer-plugins-bad1.0-dev for + GStreamerGL and bump all GStreamer dependencies to >= 1.2.3. + + Add build dependency on libgles2-mesa-dev for all + architectures (GStreamerGL needs GLES3/gl3.h). + * debian/libwebkit2gtk-4.0-37.symbols: + + Update symbols. * Override typelib-package-name-does-not-match and gir-missing-typelib-dependency lintian warnings in gir1.2-javascriptcoregtk-4.0, gir1.2-webkit2-4.0, diff --cc debian/rules index 3ab7bab334,c35ff8bfcf..e8c6716ab8 --- a/debian/rules +++ b/debian/rules @@@ -35,10 -31,13 +31,13 @@@ ifeq (,$(filter $(DEB_BUILD_ARCH),amd6 CFLAGS := $(CFLAGS:-g=-g1) endif - # See https://bugs.webkit.org/show_bug.cgi?id=113638 - ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64)) -ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 armhf arm64)) ++ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF - CPPFLAGS += -DENABLE_ASSEMBLER=0 + endif + + # https://bugs.webkit.org/show_bug.cgi?id=175127 + ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf sparc64 hurd-i386 kfreebsd-i386 kfreebsd-amd64)) + EXTRA_CMAKE_ARGUMENTS += -DUSE_GSTREAMER_GL=OFF endif ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))