diff --git a/dist b/dist index 635820538d487259e6dce4499a172e3066902da5..1f9f8c9bbdfdaf483d0bfdf0bf3c48d3cad6b1b9 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9_5 +an9_6 diff --git a/emacs-CVE-2024-53920.patch b/emacs-CVE-2024-53920.patch index 920f93a3e757caaa7f8f2f4cb357c0bbc2cfe614..ed68901eb93b6e6c919cc05473d198077f6db82d 100644 --- a/emacs-CVE-2024-53920.patch +++ b/emacs-CVE-2024-53920.patch @@ -126,14 +126,10 @@ "Pseudo function used internally by macroexp to delay warnings. --- emacs-27.2/lisp/files.el +++ emacs-27.2/lisp/files.el 2025-03-03 09:20:04.078645249 +0000 -@@ -591,10 +596,57 @@ buffer contents as untrusted. - (other :tag "Query" other)) - :group 'find-file) +@@ -591,6 +596,57 @@ buffer contents as untrusted. + Some modes may wish to set this to nil to prevent directory-local + settings being applied, but still respect file-local ones.") --(defvar enable-dir-local-variables t -- "Non-nil means enable use of directory-local variables. --Some modes may wish to set this to nil to prevent directory-local --settings being applied, but still respect file-local ones.") +(defcustom trusted-content nil + "List of files and directories whose content we trust. +Be extra careful here since trusting means that Emacs might execute the @@ -185,9 +181,9 @@ + (string-prefix-p tf file))) + (setq trusted t))) + trusted)))))))) - ;; This is an odd variable IMO. ;; You might wonder why it is needed, when we could just do: + ;; (set (make-local-variable 'enable-local-variables) nil) --- emacs-27.2/lisp/ielm.el +++ emacs-27.2/lisp/ielm.el 2025-03-03 09:18:41.372169725 +0000 @@ -616,7 +616,8 @@ See `inferior-emacs-lisp-mode' for detai diff --git a/emacs.spec b/emacs.spec index 2aa055f76140a8e3d5bef99b2812fd8ff394548e..9fc07ef38f85f70d7fe5a8575935e12b6bd573d2 100644 --- a/emacs.spec +++ b/emacs.spec @@ -6,7 +6,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 27.2 -Release: 11%{anolis_release}%{?dist}.2 +Release: 14%{anolis_release}%{?dist}.2 License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz @@ -530,17 +530,25 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %doc doc/NEWS BUGS README %changelog -* Tue May 13 2025 Xiaoping Liu - 1:27.2-11.0.1.2 +* Wed Jun 25 2025 Xiaoping Liu - 1:27.2-14.0.1.2 - Add doc sub package - update config.sub and config.guess for loongarch64 (Jingyun Hua) - cherry-pick `add sw patch #349896d0a48b80b530cfa5cc2bd1fc4ceff68e42`. (nijie@wxiat.com) -* Mon May 05 2025 Jacek Migacz - 1:27.2-11.el9_5.2 -- Fix arbitrary code execution via Lisp macro expansion (RHEL-69395) +* Wed May 21 2025 Jacek Migacz - 1:27.2-14.el9_6.2 +- Restore definition of variable "enable-dir-local-variables" (RHEL-92653) -* Mon Feb 24 2025 Jacek Migacz - 1:27.2-11.el9_5.1 -- Fix man.el shell injection vulnerability (RHEL-79021) -- Eliminate use of obsolete patch syntax (RHEL-80450) +* Tue May 06 2025 Jacek Migacz - 1:27.2-14.el9_6.1 +- Bump Z-stream release + +* Mon Apr 28 2025 Jacek Migacz - 1:27.2-14 +- Fix arbitrary code execution via Lisp macro expansion (RHEL-69399) + +* Mon Feb 24 2025 Jacek Migacz - 1:27.2-13 +- Bump release + +* Mon Feb 24 2025 Jacek Migacz - 1:27.2-12 +- Eliminate use of obsolete patch syntax (RHEL-80443) * Wed Feb 19 2025 Jacek Migacz - 1:27.2-11 - Fix man.el shell injection vulnerability (RHEL-79025)