diff --git a/0001-Fix-man.el-shell-injection-vulnerability.patch b/0001-Fix-man.el-shell-injection-vulnerability.patch deleted file mode 100644 index de964002155097fe3a39f2245ae89860d66b443b..0000000000000000000000000000000000000000 --- a/0001-Fix-man.el-shell-injection-vulnerability.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 820f0793f0b46448928905552726c1f1b999062f Mon Sep 17 00:00:00 2001 -From: Xi Lu -Date: Tue, 10 Oct 2023 22:20:05 +0800 -Subject: [PATCH] Fix man.el shell injection vulnerability - -* lisp/man.el (Man-translate-references): Fix shell injection -vulnerability. (Bug#66390) -* test/lisp/man-tests.el (man-tests-Man-translate-references): New -test. ---- - lisp/man.el | 6 +++++- - test/lisp/man-tests.el | 12 ++++++++++++ - 2 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/lisp/man.el b/lisp/man.el -index 55cb9383bec..d96396483d3 100644 ---- a/lisp/man.el -+++ b/lisp/man.el -@@ -761,7 +761,11 @@ and the `Man-section-translations-alist' variables)." - (setq name (match-string 2 ref) - section (match-string 1 ref)))) - (if (string= name "") -- ref ; Return the reference as is -+ ;; see Bug#66390 -+ (mapconcat 'identity -+ (mapcar #'shell-quote-argument -+ (split-string ref "\\s-+")) -+ " ") ; Return the reference as is - (if Man-downcase-section-letters-flag - (setq section (downcase section))) - (while slist -diff --git a/test/lisp/man-tests.el b/test/lisp/man-tests.el -index 140482ee622..11f5f805e43 100644 ---- a/test/lisp/man-tests.el -+++ b/test/lisp/man-tests.el -@@ -161,6 +161,18 @@ DESCRIPTION - (let ((button (button-at (match-beginning 0)))) - (should (and button (eq 'Man-xref-header-file (button-type button)))))))))) - -+(ert-deftest man-tests-Man-translate-references () -+ (should (equal (Man-translate-references "basename") -+ "basename")) -+ (should (equal (Man-translate-references "basename(3)") -+ "3 basename")) -+ (should (equal (Man-translate-references "basename(3v)") -+ "3v basename")) -+ (should (equal (Man-translate-references ";id") -+ "\\;id")) -+ (should (equal (Man-translate-references "-k basename") -+ "-k basename"))) -+ - (provide 'man-tests) - - ;;; man-tests.el ends here --- -2.39.3 - diff --git a/emacs-29.4.tar.xz b/emacs-30.1.tar.xz similarity index 78% rename from emacs-29.4.tar.xz rename to emacs-30.1.tar.xz index 80f6e6ed88e68fafd466df11ed0785d883abf9dc..4ffc4f0d9838f2f67338cf1cdd88dcffdc9167f6 100644 Binary files a/emacs-29.4.tar.xz and b/emacs-30.1.tar.xz differ diff --git a/emacs-system-crypto-policies.patch b/emacs-system-crypto-policies.patch deleted file mode 100644 index 2f2435c03370e432c48eb5861c98834a7a2b1a04..0000000000000000000000000000000000000000 --- a/emacs-system-crypto-policies.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/gnutls.c 2016-01-24 10:29:58.000000000 +0100 -+++ b/src/gnutls.c 2016-02-02 09:32:28.477274274 +0100 -@@ -1557,7 +1557,7 @@ - gnutls_certificate_credentials_t x509_cred = NULL; - gnutls_anon_client_credentials_t anon_cred = NULL; - Lisp_Object global_init; -- char const *priority_string_ptr = "NORMAL"; /* default priority string. */ -+ char const *priority_string_ptr = "@SYSTEM"; /* default priority string. */ - char *c_hostname; - - /* Placeholders for the property list elements. */ diff --git a/emacs.spec b/emacs.spec index 4782e97f2fad4a0e3b32585fa4dd5adfa2a10b88..cd8aa607dc6239ee157c027d0a03c5adf24c48ae 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,11 +1,11 @@ -%define anolis_release 2 +%define anolis_release 1 %global _hardened_build 1 # This file is encoded in UTF-8. -*- coding: utf-8 -*- Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 29.4 +Version: 30.1 Release: %{anolis_release}%{?dist} License: GPL-3.0-or-later AND CC0-1.0 URL: http://www.gnu.org/software/emacs/ @@ -16,9 +16,7 @@ Source4: default.el Source5: emacs-terminal.desktop Source6: emacs-terminal.sh Patch1: emacs-spellchecker.patch -Patch2: emacs-system-crypto-policies.patch -Patch3: emacs-libdir-vs-systemd.patch -Patch4: 0001-Fix-man.el-shell-injection-vulnerability.patch +Patch2: emacs-libdir-vs-systemd.patch BuildRequires: gcc BuildRequires: atk-devel @@ -512,6 +510,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_includedir}/emacs-module.h %changelog +* Fri May 09 2025 Cheng Yang - 1:30.1-1 +- Update to 30.1 to fix CVE-2024-53920 + * Wed Mar 05 2025 yangjinlin01 - 1:29.4-2 - fix the CVE-2025-1244