开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:emacs.spec Changed

@@ -7,8 +7,8 @@
 
 Name: emacs
 Epoch: 1
-Version: 27.2
-Release: 8
+Version: 28.2
+Release: 2
 Summary: An extensible GNU text editor
 License: GPLv3+ and CC0-1.0
 URL: http://www.gnu.org/software/emacs
@@ -20,12 +20,17 @@
 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
+Patch6004: backport-CVE-2022-48337.patch
+Patch6005: backport-CVE-2022-48338.patch
+Patch6006: backport-CVE-2022-48339.patch
 Patch9000: emacs-deal-taboo-words.patch
 
 BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel
@@ -269,10 +274,6 @@
 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 +293,10 @@
 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 +357,10 @@
 %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 +414,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 22 2023 zhangpan <zhangpan103@h-partners.com> - 1:28.2-2
+- fix CVE-2022-48337 CVE-2022-48338 CVE-2022-48339
+
+* Thu Feb 02 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1:28.2-1
+- update to 28.2
+
 * Thu Dec 01 2022 wangkerong <wangkerong@h-partners.com> - 1:27.2-8
 - fix CVE-2022-45939

_service:tar_scm:backport-CVE-2022-48337.patch Added

@@ -0,0 +1,107 @@
+From 01a4035c869b91c153af9a9132c87adb7669ea1c Mon Sep 17 00:00:00 2001
+From: lu4nx <lx@shellcodes.org>
+Date: Tue, 6 Dec 2022 15:42:40 +0800
+Subject: Fix etags local command injection vulnerability
+
+* lib-src/etags.c: (escape_shell_arg_string): New function.
+(process_file_name): Use it to quote file names passed to the
+shell. (Bug#59817)
+
+Reference:https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=01a4035c869b91c153af9a9132c87adb7669ea1c
+Conflict:NA
+---
+ lib-src/etags.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 58 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/etags.c b/lib-src/etags.c
+index d1d2085..ba0092c 100644
+--- a/lib-src/etags.c
++++ b/lib-src/etags.c
+@@ -401,6 +401,7 @@ static void invalidate_nodes (fdesc *, node **);
+ static void put_entries (node *);
+ static void clean_matched_file_tag (char const * const, char const * const);
+ 
++static char *escape_shell_arg_string (char *);
+ static void do_move_file (const char *, const char *);
+ static char *concat (const char *, const char *, const char *);
+ static char *skip_spaces (char *);
+@@ -1713,13 +1714,16 @@ process_file_name (char *file, language *lang)
+ else
+ 	{
+ #if MSDOS || defined (DOS_NT)
+-	 char *cmd1 = concat (compr->command, " \"", real_name);
+-	 char *cmd = concat (cmd1, "\" > ", tmp_name);
++ int buf_len = strlen (compr->command) + strlen (" \"\" > \"\"") + strlen (real_name) + strlen (tmp_name) + 1;
++ char *cmd = xmalloc (buf_len);
++ snprintf (cmd, buf_len, "%s \"%s\" > \"%s\"", compr->command, real_name, tmp_name);
+ #else
+-	 char *cmd1 = concat (compr->command, " '", real_name);
+-	 char *cmd = concat (cmd1, "' > ", tmp_name);
++ char *new_real_name = escape_shell_arg_string (real_name);
++ char *new_tmp_name = escape_shell_arg_string (tmp_name);
++ int buf_len = strlen (compr->command) + strlen (" > ") + strlen (new_real_name) + strlen (new_tmp_name) + 1;
++ char *cmd = xmalloc (buf_len);
++ snprintf (cmd, buf_len, "%s %s > %s", compr->command, new_real_name, new_tmp_name);
+ #endif
+-	 free (cmd1);
+ 	 inf = (system (cmd) == -1
+ 		 ? NULL
+ 		 : fopen (tmp_name, "r" FOPEN_BINARY));
+@@ -7707,6 +7711,55 @@ etags_mktmp (void)
+ return templt;
+ }
+ 
++/*
++ * Adds single quotes around a string, if found single quotes, escaped it.
++ * Return a newly-allocated string.
++ *
++ * For example:
++ * escape_shell_arg_string("test.txt") => 'test.txt'
++ * escape_shell_arg_string("'test.txt") => ''\''test.txt'
++ */
++static char *
++escape_shell_arg_string (char *str)
++{
++ char *p = str;
++ int need_space = 2; /* ' at begin and end */
++
++ while (*p != '\0')
++ {
++ if (*p == '\'')
++ need_space += 4; /* ' to '\'', length is 4 */
++ else
++ need_space++;
++
++ p++;
++ }
++
++ char *new_str = xnew (need_space + 1, char);
++ new_str0 = '\'';
++ new_strneed_space-1 = '\'';
++
++ int i = 1; /* skip first byte */
++ p = str;
++ while (*p != '\0')
++ {
++ new_stri = *p;
++ if (*p == '\'')
++ {
++ new_stri+1 = '\\';
++ new_stri+2 = '\'';
++ new_stri+3 = '\'';
++ i += 3;
++ }
++
++ i++;
++ p++;
++ }
++
++ new_strneed_space = '\0';
++ return new_str;
++}
++
+ static void
+ do_move_file(const char *src_file, const char *dst_file)
+ {
+-- 
+cgit v1.1

_service:tar_scm:backport-CVE-2022-48338.patch Added

@@ -0,0 +1,29 @@
+From 9a3b08061feea14d6f37685ca1ab8801758bfd1c Mon Sep 17 00:00:00 2001
+From: Xi Lu <lx@shellcodes.org>
+Date: Fri, 23 Dec 2022 12:52:48 +0800
+Subject: Fix ruby-mode.el local command injection vulnerability (bug#60268)
+
+* lisp/progmodes/ruby-mode.el
+(ruby-find-library-file): Fix local command injection vulnerability.
+
+Reference:https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9a3b08061feea14d6f37685ca1ab8801758bfd1c
+Conflict:NA
+---
+ lisp/progmodes/ruby-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
+index 1f3e9b6..a4aa619 100644
+--- a/lisp/progmodes/ruby-mode.el
++++ b/lisp/progmodes/ruby-mode.el
+@@ -1899,7 +1899,7 @@ or `gem' statement around point."
+ (setq feature-name (read-string "Feature name: " init))))
+ (let ((out
+ (substring
+- (shell-command-to-string (concat "gem which " feature-name))
++ (shell-command-to-string (concat "gem which " (shell-quote-argument feature-name)))
+ 0 -1)))
+ (if (string-match-p "\\`ERROR" out)
+ (user-error "%s" out)
+-- 
+cgit v1.1

_service:tar_scm:backport-CVE-2022-48339.patch Added

@@ -0,0 +1,29 @@
+From 1b4dc4691c1f87fc970fbe568b43869a15ad0d4c Mon Sep 17 00:00:00 2001
+From: Xi Lu <lx@shellcodes.org>
+Date: Sat, 24 Dec 2022 16:28:54 +0800
+Subject: Fix htmlfontify.el command injection vulnerability.
+
+* lisp/htmlfontify.el (hfy-text-p): Fix command injection
+vulnerability. (Bug#60295)
+
+Reference:https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=1b4dc4691c1f87fc970fbe568b43869a15ad0d4c
+Conflict:NA
+---
+ lisp/htmlfontify.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
+index df4c6ab..389b929 100644
+--- a/lisp/htmlfontify.el
++++ b/lisp/htmlfontify.el
+@@ -1850,7 +1850,7 @@ Hardly bombproof, but good enough in the context in which it is being used."
+ 
+ (defun hfy-text-p (srcdir file)
+ "Is SRCDIR/FILE text? Use `hfy-istext-command' to determine this."
+- (let* ((cmd (format hfy-istext-command (expand-file-name file srcdir)))
++ (let* ((cmd (format hfy-istext-command (shell-quote-argument (expand-file-name file srcdir))))
+ (rsp (shell-command-to-string cmd)))
+ (string-match "text" rsp)))
+ 
+-- 
+cgit v1.1

_service:tar_scm:backport-emacs-glibc-2.34.patch Deleted

@@ -1,39 +0,0 @@
-From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-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_stackSIGSTKSZ;
-+/* 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

_service:tar_scm:emacs-spellchecker.patch Changed

@@ -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
+

_service:tar_scm:emacs-27.2.tar.xz -> _service:tar_scm:emacs-28.2.tar.xz Changed

_service:tar_scm:emacs.appdata.xml Deleted

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop">
- <id>emacs.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0+</project_license>
- <name>GNU Emacs</name>
- <summary>Edit text files, view pictures and binary files</summary>
- <description>
- 
- 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.
- 
- </description>
- <screenshots>
- <screenshot type="default" height="888" width="1595">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png</image>
- </screenshot>
- <screenshot height="667" width="1199">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png</image>
- </screenshot>
- <screenshot height="572" width="1019">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png</image>
- </screenshot>
- <screenshot height="667" width="1199">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png</image>
- </screenshot>
- <screenshot height="439" width="794">
- <image>http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png</image>
- </screenshot>
- </screenshots>
- <url type="homepage">http://www.gnu.org/software/emacs/</url>
- <url type="bugtracker">https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html</url>
- <url type="donation">https://my.fsf.org/donate/</url>
- <url type="help">https://www.gnu.org/software/emacs/manual/</url>
- <update_contact>zbyszek@in.waw.pl</update_contact>
- <translation/>
-</component>