diff --git a/backport-emacs-glibc-2.34.patch b/backport-emacs-glibc-2.34.patch deleted file mode 100644 index f6ad28633a4ec29d6020df01d71bc6802a17a888..0000000000000000000000000000000000000000 --- a/backport-emacs-glibc-2.34.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 9 Mar 2021 11:22:59 -0800 -Subject: [PATCH] Port alternate signal stack to upcoming glibc 2.34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align -it to max_align_t. This copies from Gnulib’s c-stack.c, and works -around a portability bug in draft glibc 2.34, which no longer -defines SIGSTKSZ when _GNU_SOURCE is defined. ---- - src/sysdep.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/sysdep.c b/src/sysdep.c -index 941b4e2fa2..24d8832b2f 100644 ---- a/src/sysdep.c -+++ b/src/sysdep.c -@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig) - - /* Alternate stack used by SIGSEGV handler below. */ - --static unsigned char sigsegv_stack[SIGSTKSZ]; -+/* Storage for the alternate signal stack. -+ 64 KiB is not too large for Emacs, and is large enough -+ for all known platforms. Smaller sizes may run into trouble. -+ For example, libsigsegv 2.6 through 2.8 have a bug where some -+ architectures use more than the Linux default of an 8 KiB alternate -+ stack when deciding if a fault was caused by stack overflow. */ -+static max_align_t sigsegv_stack[(64 * 1024 -+ + sizeof (max_align_t) - 1) -+ / sizeof (max_align_t)]; - - - /* Return true if SIGINFO indicates a stack overflow. */ --- -2.29.2 \ No newline at end of file diff --git a/emacs-27.2.tar.xz b/emacs-28.2.tar.xz similarity index 76% rename from emacs-27.2.tar.xz rename to emacs-28.2.tar.xz index 0618c17e1640bdcd9ed15abb928e57236f1f8900..2e0d4082808bf42718cc39156602a2f1674b4d82 100644 Binary files a/emacs-27.2.tar.xz and b/emacs-28.2.tar.xz differ diff --git a/emacs-spellchecker.patch b/emacs-spellchecker.patch index 48c2b57eff730ab9ad31414c9ea0ce3d1b1aeff9..0e7cbc667ec900a1220d0787c01e70a197cafcc0 100644 --- a/emacs-spellchecker.patch +++ b/emacs-spellchecker.patch @@ -1,16 +1,23 @@ diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el -index 1d28de7..1daec44 100644 +index 0a3a49d868..b6c0975857 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el -@@ -200,9 +200,9 @@ - ;; cause an error; and one of the other spelling engines below is - ;; almost certainly installed in any case, for enchant to use. +@@ -191,12 +191,12 @@ Must be greater than 1." + :type 'integer) + (defcustom ispell-program-name - (or (executable-find "aspell") -+ (or (executable-find "hunspell") +- (executable-find "ispell") ++ ;; Enchant is commonly installed as `enchant-2', so use this ++ ;; name and avoid old versions of `enchant'. ++ (or (executable-find "enchant-2") + (executable-find "hunspell") +- ;; Enchant is commonly installed as `enchant-2', so use this +- ;; name and avoid old versions of `enchant'. +- (executable-find "enchant-2") + (executable-find "aspell") - (executable-find "ispell") -- (executable-find "hunspell") ++ (executable-find "ispell") "ispell") "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string + diff --git a/emacs.appdata.xml b/emacs.appdata.xml deleted file mode 100644 index 94ba9854e1ffee279ce17aebd19288616c51aa65..0000000000000000000000000000000000000000 --- a/emacs.appdata.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - emacs.desktop - CC0-1.0 - GPL-3.0+ - GNU Emacs - Edit text files, view pictures and binary files - -

- Emacs is a powerful, customizable, self-documenting, modeless - editor. It is used primarely to edit text, including text - documents, source code of programs, web pages and XML documents, - but can also be used to display and edit binary files. -

-

- Emacs allows efficient editing of text with shortcuts which - allow operating on letters, words, sentences, and paragraphs as - single units. This includes both moving around and operations - like copying, deleting, transposing, and pasting. Macros can be - conveniently defined to repeat sequences of commands. In - addition, Emacs is (partially) built in a scripting language - (elisp) which can also be used to define further functions - extending existing capabilities. -

-

- Emacs has extensive support for editing source code, including - programmable syntax highlighting, automatic indentation, source - code indexing, overview modes, and navigation based on language - specific units like functions and blocks. It is also possible to - invoke the compiler from within Emacs and easily move between - compiler output and corresponding positions in the source. -

-

- Emacs has multiple modules which provide further functionality. - This provides the capability to read mail, news, browse - pictures, read man and info pages, browse the web, execute - arbitrary programs, and more, without leaving the editor. -

- - - - http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png - - - http://www.gnu.org/software/emacs/ - https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html - https://my.fsf.org/donate/ - https://www.gnu.org/software/emacs/manual/ - zbyszek@in.waw.pl - - diff --git a/emacs.spec b/emacs.spec index 0bc910919a7f937354fb4be7a20fc41eca7e5739..1f6802e723b40ca63f96e49767fab445141e865c 100644 --- a/emacs.spec +++ b/emacs.spec @@ -7,8 +7,8 @@ Name: emacs Epoch: 1 -Version: 27.2 -Release: 8 +Version: 28.2 +Release: 1 Summary: An extensible GNU text editor License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs @@ -20,12 +20,14 @@ Source4: emacs-terminal.sh Source5: emacs.service Source6: emacs.desktop Source7: emacs-terminal.desktop -Source8: %{name}.appdata.xml +#patch from fedora +#https://src.fedoraproject.org/rpms/emacs/blob/rawhide/f/emacs-spellchecker.patch Patch6001: emacs-spellchecker.patch +#https://src.fedoraproject.org/rpms/emacs/blob/rawhide/f/emacs-system-crypto-policies.patch Patch6002: emacs-system-crypto-policies.patch -Patch6003: backport-emacs-glibc-2.34.patch -Patch6004: backport-CVE-2022-45939.patch + +Patch6003: backport-CVE-2022-45939.patch Patch9000: emacs-deal-taboo-words.patch BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel @@ -269,10 +271,6 @@ install -d %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d install -d %{buildroot}/%{_datadir}/pkgconfig install -p -m 0644 emacs.pc %{buildroot}/%{_datadir}/pkgconfig -mkdir -p %{buildroot}/%{_datadir}/appdata -cp -a %SOURCE8 %{buildroot}/%{_datadir}/appdata -rm %{buildroot}/%{_datadir}/metainfo/emacs.appdata.xml - install -d %{buildroot}%{_rpmconfigdir}/macros.d install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/ @@ -292,6 +290,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ %SOURCE7 +# We don't ship the client variants yet +rm %{buildroot}%{_datadir}/applications/emacsclient.desktop +rm %{buildroot}%{_datadir}/applications/emacsclient-mail.desktop + rm -f *-filelist {common,el}-*-files ( TOPDIR=${PWD} @@ -352,9 +354,10 @@ fi %license etc/COPYING %attr(0755,-,-) %ghost %{_bindir}/emacs %{_bindir}/emacs-%{version} -%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/* %{_datadir}/applications/emacs.desktop +%{_datadir}/applications/emacs-mail.desktop +%{_metainfodir}/%{name}.metainfo.xml %files devel %{_includedir}/emacs-module.h @@ -408,6 +411,9 @@ fi %{_mandir}/*/* %changelog +* Thu Feb 02 2023 zhouwenpei - 1:28.2-1 +- update to 28.2 + * Thu Dec 01 2022 wangkerong - 1:27.2-8 - fix CVE-2022-45939