[rpms/emacs] rawhide: Update to version 31.1, release candidate 1.

[rpms/emacs] rawhide: Update to version 31.1, release candidate 1.

[Peter Oliver]

A new commit has been pushed.

Repo   : rpms/emacs
Branch : rawhide
Commit : 38941525f2591ad1381ce210d15e543582d7d633
Author : Peter Oliver <git@mavit.org.uk>
Date   : 2026-08-18T00:50:41+01:00
Stats  : +12/-65 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/emacs/c/38941525f2591ad1381ce210d15e543582d7d633?branch=rawhide

Log:
Update to version 31.1, release candidate 1.

---
diff --git a/.gitignore b/.gitignore
index bf49952..9be75a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,5 @@
 /emacs-31.0.90.tar.xz.sig
 /emacs-31.0.91.tar.xz
 /emacs-31.0.91.tar.xz.sig
+/emacs-31.1-rc1.tar.xz
+/emacs-31.1-rc1.tar.xz.sig

diff --git a/0001-Mitigate-arbitrary-code-execution-vulnerability.patch b/0001-Mitigate-arbitrary-code-execution-vulnerability.patch
deleted file mode 100644
index 65af2f8..0000000
--- a/0001-Mitigate-arbitrary-code-execution-vulnerability.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8466eb44991707d128110bdc549fad14c8e1d61e Mon Sep 17 00:00:00 2001
-From: Eshel Yaron <me@eshelyaron.com>
-Date: Wed, 5 Aug 2026 19:58:32 +0200
-Subject: [PATCH] Mitigate arbitrary code execution vulnerability
-
-This mitigates a vulnerability that allowed a specially
-crafted file to trigger execution of attacker-controlled
-arbitrary Emacs Lisp code immediately when the file is
-visited in Emacs (before the file's malicious contents are
-even displayed).  See demonstration in bug#80574.
-
-* lisp/progmodes/cc-fonts.el (c-compose-keywords-list):
-* lisp/vc/vc-hooks.el (vc-find-backend-function):
-Nullify 'read-symbol-shorthands' around risky 'intern' calls.
-Do not merge to master.
----
- lisp/progmodes/cc-fonts.el | 10 +++++++---
- lisp/vc/vc-hooks.el        |  5 ++++-
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
-index 9103787df7a..49346f81dfb 100644
---- a/lisp/progmodes/cc-fonts.el
-+++ b/lisp/progmodes/cc-fonts.el
-@@ -2585,9 +2585,13 @@ c-compose-keywords-list
-   (let* ((doc-keywords (c-get-doc-comment-style))
- 	 (list (nconc (c--mapcan
- 		       (lambda (doc-style)
--			 (let ((sym (intern
--				     (concat (symbol-name doc-style)
--					     "-font-lock-keywords"))))
-+			 (let ((sym
-+				;; Guard `intern' from potentially
-+				;; malicious shorthands.
-+				(let (read-symbol-shorthands)
-+				  (intern
-+				   (concat (symbol-name doc-style)
-+					   "-font-lock-keywords")))))
- 			   (cond ((fboundp sym)
- 				  (funcall sym))
- 				 ((boundp sym)
-diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
-index 132b9211f88..5775983fd91 100644
---- a/lisp/vc/vc-hooks.el
-+++ b/lisp/vc/vc-hooks.el
-@@ -299,7 +299,10 @@ vc-find-backend-function
-   "Return BACKEND-specific implementation of FUN.
- If there is no such implementation, return the default implementation;
- if that doesn't exist either, return nil."
--  (let ((f (vc-make-backend-sym backend fun)))
-+  ;; Nullify `read-symbol-shorthands' to guard the `intern' calls below
-+  ;; and in `vc-make-backend-sym' from potentially malicious shorthands.
-+  (let* ((read-symbol-shorthands nil)
-+         (f (vc-make-backend-sym backend fun)))
-     (if (fboundp f) f
-       ;; Load vc-BACKEND.el if needed.
-       (require (intern (concat "vc-" (downcase (symbol-name backend)))))
--- 
-2.55.0
-

diff --git a/emacs.spec b/emacs.spec
index a6426be..bb78d3f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -8,11 +8,16 @@
 Summary:       GNU Emacs text editor
 Name:          emacs
 Epoch:         1
-Version:       31.0.91
-Release:       %autorelease
+Version:       31.1
+Release:       0.rc1.%autorelease
 License:       GPL-3.0-or-later AND CC0-1.0
 URL:           https://www.gnu.org/software/emacs/
-%if %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.%d+%.(%d+)')) or 0)} >= 90
+
+%global rc %{lua: print(select(3, string.find(rpm.expand('%release'), '.(rc%d+).')))}
+%if "%{rc}" != ""
+Source0:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}-%{rc}.tar.xz
+Source1:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}-%{rc}.tar.xz.sig
+%elif %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.%d+%.(%d+)')) or 0)} >= 90
 Source0:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz
 Source1:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz.sig
 %else

diff --git a/sources b/sources
index 70b5a15..4327055 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-31.0.91.tar.xz) = 77431c852942b56623b939f5b68e9877d30099312bf0d4f95406add57771928e5ad22adeca067292491ac05660339e7f3236ad8ded727b60abf6b98305265ba8
-SHA512 (emacs-31.0.91.tar.xz.sig) = 148c13b01959409d40bcbe898bb82d143e8c32365d12b1912bd2b247ae7e3c67988262de8c2d4e678fe86edf4f6a887d54e50ca9a3514869da43e0fbabaad9d6
+SHA512 (emacs-31.1-rc1.tar.xz) = 4e5954582480de3b6907b56ba13e37eb0e65513ac2a96daf4c0e9e60feeda47c43326108b96f5c0ae369917a688204f6ad77c1eabcdb074c5049542e6f9aa4b2
+SHA512 (emacs-31.1-rc1.tar.xz.sig) = 4ff9199db262657d9ce18b02a67663c9161fe790edddb0ba42172f130c7a675051db00e993dca8460c3a4c500ab9ac4c7363c70cfc506c55b8a7860bfc769854