rpms/emacs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

spawn native-compilation processes with -Q rhbz#2155824 (petersen)

Browse Source
This commit is contained in:
Jens Petersen 2022-12-23 18:19:23 +08:00 committed by Dan Čermák
parent 69e6751434
commit 45bfcb855d
No known key found for this signature in database
GPG Key ID: 8F8C178E966641D3
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs.spec
View File

@ -30,6 +30,9 @@ Patch5: emacs-configure-c99-1.patch
Patch6: emacs-configure-c99-2.patch Patch6: emacs-configure-c99-2.patch
# CVE-2022-45939 # CVE-2022-45939
Patch7: https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51#./fixed-ctags-local-command-execute-vulnerability.patch Patch7: https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51#./fixed-ctags-local-command-execute-vulnerability.patch
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60208
# backport of https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=e59216d3be86918b995bd63273c851ebc6176a83
Patch8: native-compile-with_-Q.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: atk-devel BuildRequires: atk-devel
@ -216,6 +219,7 @@ cp -p %{SOURCE3} lib/
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 -b .ctags-local-execution-cve %patch7 -p1 -b .ctags-local-execution-cve
%patch8 -p1 -b .native-compile-Q
autoconf autoconf
grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \ grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
@ -530,6 +534,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
* Tue Nov 1 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 1:28.2-1 * Tue Nov 1 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 1:28.2-1
- New upstream release 28.2, fixes rhbz#2126048 - New upstream release 28.2, fixes rhbz#2126048
- Add patch to fix CVE-2022-45939, fixes rhbz#2149381 - Add patch to fix CVE-2022-45939, fixes rhbz#2149381
- spawn native-compilation processes with -Q rhbz#2155824 (petersen)
* Fri Dec 23 2022 Florian Weimer <fweimer@redhat.com> - 1:28.1-4 * Fri Dec 23 2022 Florian Weimer <fweimer@redhat.com> - 1:28.1-4
- C99 compatibility fixes for the configure script - C99 compatibility fixes for the configure script

22
native-compile-with_-Q.patch Normal file
View File

@ -0,0 +1,22 @@
--- emacs-28.2/lisp/emacs-lisp/comp.el~ 2022-09-07 05:31:53.000000000 +0800
+++ emacs-28.2/lisp/emacs-lisp/comp.el 2022-12-23 15:02:25.446994014 +0800
@@ -3706,7 +3706,7 @@
(if (zerop
(call-process (expand-file-name invocation-name
invocation-directory)
- nil t t "--batch" "-l" temp-file))
+ nil t t "-Q" "--batch" "-l" temp-file))
(progn
(delete-file temp-file)
output)
@@ -3976,7 +3976,7 @@
:command (list
(expand-file-name invocation-name
invocation-directory)
- "--batch" "-l" temp-file)
+ "-Q" "--batch" "-l" temp-file)
:sentinel
(lambda (process _event)
(run-hook-with-args
Diff finished. Fri Dec 23 15:02:42 2022