From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 11 Aug 2023 15:11:29 +0000 (+0100)
Subject: Merge version 2.40.3-2~deb12u2+rpi1 and 2.40.5-1~deb12u1 to produce 2.40.5-1~deb12u1... 
X-Git-Tag: archive/raspbian/2.40.5-1_deb12u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba52982d19bfd6cd4a111fd73150384af0c7817d;p=webkit2gtk.git

Merge version 2.40.3-2~deb12u2+rpi1 and 2.40.5-1~deb12u1 to produce 2.40.5-1~deb12u1+rpi1
---

ba52982d19bfd6cd4a111fd73150384af0c7817d
diff --cc debian/changelog
index 2bf2264d86,afce684324..db1b7f4beb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,31 +1,42 @@@
- webkit2gtk (2.40.3-2~deb12u2+rpi1) bookworm-staging; urgency=medium
++webkit2gtk (2.40.5-1~deb12u1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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)
 +
 +  [changes introuced in 2.40.0-3+rpi1 by Peter Michael Green]
 +  * Disable webgl on armhf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 28 Jul 2023 21:05:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Aug 2023 15:11:28 +0000
 +
- webkit2gtk (2.40.3-2~deb12u2) bookworm-security; urgency=medium
+ webkit2gtk (2.40.5-1~deb12u1) bookworm-security; urgency=medium
  
-   * debian/patches/fix-CVE-2023-37450.patch:
-     - Cherry pick fix for CVE-2023-37450.
+   * Rebuild for bookworm-security.
+   * The WebKitGTK security advisory WSA-2023-0007 lists the following
+     security fixes in the latest versions of WebKitGTK:
+     - CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594,
+       CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600,
+       CVE-2023-38611 (fixed in 2.40.5)
  
-  -- Alberto Garcia <berto@igalia.com>  Fri, 21 Jul 2023 11:24:47 +0200
+  -- Alberto Garcia <berto@igalia.com>  Sat, 05 Aug 2023 03:13:42 +0300
  
- webkit2gtk (2.40.3-2~deb12u1) bookworm-security; urgency=medium
+ webkit2gtk (2.40.5-1) unstable; urgency=high
  
-   * Rebuild for bookworm-security.
-     - Fixes CVE-2023-32439.
+   * New upstream release.
+   * debian/rules:
+     - Use -O1 instead of -Os in sh4 (thanks, John Paul Adrian Glaubitz)
+       (Closes: #1042519).
+   * Drop debian/patches/fix-jsc-timestamp.patch.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 02 Aug 2023 00:01:52 +0300
+ 
+ webkit2gtk (2.40.4-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * debian/rules:
+     - Set Build-Depends-Indep to jdupes when USE_PREBUILT_DOCS is set.
  
-  -- Alberto Garcia <berto@igalia.com>  Thu, 06 Jul 2023 15:22:42 +0200
+  -- Alberto Garcia <berto@igalia.com>  Fri, 21 Jul 2023 11:01:47 +0200
  
  webkit2gtk (2.40.3-2) unstable; urgency=high
  
diff --cc debian/rules
index e739b537c5,50ab4be836..71d353de7d
--- a/debian/rules
+++ b/debian/rules
@@@ -70,13 -70,8 +70,13 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),arm64
  	EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF
  endif
  
 +# https://bugs.webkit.org/show_bug.cgi?id=188862
 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
 +	EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
 +endif
 +
  # Lower memory requirements on architectures with only 2 GB address space
- ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel sh4))
+ ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel))
  	CFLAGS := $(CFLAGS:-g1=-g0)
  	CFLAGS := $(CFLAGS:-O2=-Os)
  	CPPFLAGS += --param ggc-min-expand=10