From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 5 Sep 2026 15:42:27 +0000 (+0100)
Subject: Merge version 1:30.1+1-6+rpi1 and 1:30.1+1-6+deb13u1 to produce 1:30.1+1-6+rpi1+deb13u1
X-Git-Tag: archive/raspbian/1%30.1+1-6+rpi1+deb13u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56dfc1b61ac28c228796f844e1003bf230faa8fc;p=emacs.git

Merge version 1:30.1+1-6+rpi1 and 1:30.1+1-6+deb13u1 to produce 1:30.1+1-6+rpi1+deb13u1
---

56dfc1b61ac28c228796f844e1003bf230faa8fc
diff --cc debian/changelog
index 222047fd7fc,435b00cbd90..f986a6d8853
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,36 +1,44 @@@
- emacs (1:30.1+1-6+rpi1) trixie-staging; urgency=medium
++emacs (1:30.1+1-6+rpi1+deb13u1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:29.4+1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 23:24:37 +0000]
 +  * Switch to gcc 14.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 17:33:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2026 15:42:27 +0000
++
+ emacs (1:30.1+1-6+deb13u1) trixie-security; urgency=high
+ 
+   * Mark esh-proc-test/kill-pipeline as unstable for now.  Skip it since
+     it fails sporadically on at least s390x.  Add
+     0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch to
+     address the issue.
+ 
+   * Fix an SVG-related vulnerability (CVE-2026-6861).  Add
+     0025-src-image.c-svg_load_image-Fix-off-by-one-mistake-bu.patch which
+     includes the upstream patch to fix the problem.  Thanks to Salvatore
+     Bonaccorso for reporting the issue. (Closes: 1134692)
+ 
+   * Don't run bytecomp-tests--dest-mountpoint where bwrap doesn't work.
+     Add 0026-bytecomp-tests-dest-mountpoint-only-run-test-if-bwra.patch to
+     address the issue.  Thanks to Santiago Vila for reporting the
+     issue. (Closes: 1129189)
+ 
+   * Skip two more proced-tests in debian that are skipped on darwin to
+     avoid hanging during the tests.  Add
+     0025-Skip-some-proced-tests-that-appear-to-be-hanging.patch to address
+     the issue.
+ 
+   * Mitigate a risk of executing arbitrary code when opening a file.  The
+     vulnerability that has been mitigated could allow a specially crafted
+     file to trigger execution of arbitrary Emacs Lisp code immediately
+     upon visiting it in Emacs.  The broader issue is described here:
+     https://debbugs.gnu.org/80574
+ 
+     Add 0030-Mitigate-arbitrary-code-execution-vulnerability.patch to
+     include the upstream patch addressing the problem.  Thanks to Nicholas
+     D Steeves for reporting the issue.
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Fri, 21 Aug 2026 12:24:00 -0500
  
  emacs (1:30.1+1-6) unstable; urgency=medium