rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Accepting request 1038881 from editors

Browse Source 
- Update to GNU Emacs version 28.2
  * This is a bug-fix release with no new features.
- Add upstream commit as patch d48bb487.patch (bsc#1205822, CVE-2022-45939)
  * shell command injection via source code files when using ctags
- Correct offsets of the patches
  * emacs-24.3-iconic.patch
  * emacs-24.4-ps-bdf.patch
  * emacs-25.2-ImageMagick7.patch
  * emacs-27.1-Xauthority4server.patch
  * emacs-27.1-pdftex.patch
  * emacs-28.1.dif

OBS-URL: https://build.opensuse.org/request/show/1038881
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2022-11-30 15:07:42 +00:00 committed by Git OBS Bridge
commit 8cc745e5b9
16 changed files with 9330 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9274
d48bb487.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
emacs-24.3-iconic.patch
View File

@ -4,7 +4,7 @@
--- lisp/startup.el
+++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000
@@ -2470,6 +2470,9 @@ nil default-directory" name)
@@ -2481,6 +2481,9 @@ nil default-directory" name)
((equal argi "-no-splash")
(setq inhibit-startup-screen t))

2
emacs-24.4-ps-bdf.patch
View File

@ -5,7 +5,7 @@
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2018-05-29 12:23:32.824206557 +0000
@@ -26758,9 +26758,9 @@ With prefix argument ARG, restart the Pr
@@ -26785,9 +26785,9 @@ With prefix argument ARG, restart the Pr
;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (0 0 0 0))
;;; Generated autoloads from ps-bdf.el

2
emacs-25.2-ImageMagick7.patch
View File

@ -7,7 +7,7 @@ Index: emacs-25.2/configure.ac
--- emacs-27.1/configure.ac
+++ emacs-27.1/configure.ac 2020-08-11 09:59:04.349950601 +0000
@@ -2605,7 +2605,7 @@ if test "${HAVE_X11}" = "yes" || test "$
@@ -2603,7 +2603,7 @@ if test "${HAVE_X11}" = "yes" || test "$
else
## 6.3.5 is the earliest version known to work; see Bug#17339.
## 6.8.2 makes Emacs crash; see Bug#13867.

14
emacs-27.1-Xauthority4server.patch
View File

@ -21,7 +21,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
# Emacs will exit with status 15 after having received SIGTERM, which
--- lisp/server.el
+++ lisp/server.el 2021-10-08 09:40:13.683712534 +0000
@@ -286,6 +286,11 @@ If nil, no instructions are displayed."
@@ -287,6 +287,11 @@ If nil, no instructions are displayed."
"The directory in which to place the server socket.
If local sockets are not supported, this is nil.")
@ -33,7 +33,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
(defun server-clients-with (property value)
"Return a list of clients with PROPERTY set to VALUE."
(let (result)
@@ -642,7 +647,8 @@ the `server-process' variable."
@@ -643,7 +648,8 @@ the `server-process' variable."
(t (yes-or-no-p
"The current server still has clients; delete them? "))))
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
@ -43,7 +43,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
(when server-process
;; kill it dead!
(ignore-errors (delete-process server-process)))
@@ -726,6 +732,14 @@ server or call `\\[server-force-delete]'
@@ -727,6 +733,14 @@ server or call `\\[server-force-delete]'
:plist '(:authenticated t)))))
(unless server-process (error "Could not start server process"))
(process-put server-process :server-file server-file)
@ -58,7 +58,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
(when server-use-tcp
(let ((auth-key (server-get-auth-key)))
(process-put server-process :auth-key auth-key)
@@ -854,7 +868,7 @@ This handles splitting the command if it
@@ -855,7 +869,7 @@ This handles splitting the command if it
(let ((frame
(server-with-environment
(process-get proc 'env)
@ -67,7 +67,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
;; For tgetent(3); list according to ncurses(3).
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
@@ -1122,6 +1136,8 @@ The following commands are accepted by t
@@ -1123,6 +1137,8 @@ The following commands are accepted by t
nowait ; t if emacsclient does not want to wait for us.
frame ; Frame opened for the client (if any).
display ; Open frame on this display.
@ -76,7 +76,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
parent-id ; Window ID for XEmbed
dontkill ; t if client should not be killed.
commands
@@ -1262,6 +1278,16 @@ The following commands are accepted by t
@@ -1263,6 +1279,16 @@ The following commands are accepted by t
;; -env NAME=VALUE: An environment variable.
("-env"
(let ((var (pop args-left)))
@ -93,7 +93,7 @@ even if the Xauthority file is not the default expected by XCloseDisplay()
;; XXX Variables should be encoded as in getenv/setenv.
(process-put proc 'env
(cons var (process-get proc 'env)))))
@@ -1277,6 +1303,16 @@ The following commands are accepted by t
@@ -1278,6 +1304,16 @@ The following commands are accepted by t
;; Unknown command.
(arg (error "Unknown command: %s" arg))))

11
emacs-27.1-pdftex.patch
View File

@ -19,14 +19,15 @@
- $(ENVADD) pdftex -output-format=pdf pl-refcard.tex
+ $(ENVADD) pdfmex -output-format=pdf pl-refcard.tex
pl-refcard.dvi: $(pl_refcard_deps)
if ! kpsewhich -format=fmt mex > /dev/null; then \
echo "No mex format found."; false; \
if kpsewhich -format=fmt mex > /dev/null; then \
- $(ENVADD) tex pl-refcard.tex; \
- else \
$(ENVADD) mex pl-refcard.tex; \
+ else \
+ $(ENVADD) tex pl-refcard.tex; \
fi
- $(ENVADD) tex pl-refcard.tex
+ $(ENVADD) mex pl-refcard.tex
pl-refcard.ps: pl-refcard.dvi
dvips -t a4 -o $@ pl-refcard.dvi
--- etc/refcards/cs-dired-ref.tex
+++ etc/refcards/cs-dired-ref.tex 2021-03-25 15:07:14.519265674 +0000
@@ -108,7 +108,8 @@ see the Emacs distribution, or {\tt http

3
emacs-28.1-pdf.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d983bab3ca6a2c6cdbb050c16d52bcb8c7e3f581ffc6fd9b5fd4b24c2686ae83
size 2004804

6
emacs-28.1.dif
View File

@ -138,7 +138,7 @@
.TP
.B \-\-declarations
In C and derived languages, create tags for function declarations,
@@ -181,7 +181,7 @@ the previous ones. The regexps are of o
@@ -183,7 +183,7 @@ the previous ones. The regexps are of o
where \fItagregexp\fP is used to match the tag. It should not match
useless characters. If the match is such that more characters than
needed are unavoidably matched by \fItagregexp\fP, it may be useful to
@ -147,7 +147,7 @@
ignores regexps without a \fInameregexp\fP. The syntax of regexps is
the same as in emacs. The following character escape sequences are
supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
@@ -260,15 +260,15 @@ tag entries for other files in place. C
@@ -262,15 +262,15 @@ tag entries for other files in place. C
by deleting the existing entries for the given files and then
rewriting the new entries at the end of the tags file. It is often
faster to simply rebuild the entire tag file than to use this.
@ -177,7 +177,7 @@
ebrowse${EXEEXT}
# Things that Emacs runs internally, or during the build process,
@@ -379,7 +381,7 @@ etags${EXEEXT}: ${etags_deps}
@@ -382,7 +382,7 @@ etags${EXEEXT}: ${etags_deps}
## etags.o files on top of each other.
## FIXME?
## Can't we use a wrapper that calls 'etags --ctags'?

3
emacs-28.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
size 47699512

16
emacs-28.1.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmJK2PAACgkQ542uDzEV
4GuLAxAAuUO0wrWOs8bIyoFDspz0oBgJsZD6gScqRf9jVpITqegYQA6UYhPtBg24
CZGvJYX3TUpw6B+9dzOaRcFghzmgJTOvQemo8WK7o4aumUtp4BUjl1vLsAMgsA7e
age+IY9z6Uo7GsUttpDvdZJYh+YV+p/GPu0Po441ztPAyxWzrSyRVqXXZXb0/tg6
98MyzcffZbYr/D4Aox/V0Y2PXbO+0S097jFLtKRX/UioEHeGLKdeVbVa7eB5kfJu
IUS7Kg015loBY8UxObnMAU0WGUaPbPk/+Zk4QqRnAf08F8F+ajZxv6nRyPIzv82T
ULgmSdn0SXh870+Q7RWo8Wq+s+9CdYCUVT5DKV9G3aoBGqZnUNe9Wv295GKbZYqE
9TRTFr6000FNIMocc22rVmRVq2cxUUe9uNyZM7jw4Juhczw0/vGA0nSWfqlPSTsH
88AJCyjzL/HqrU9zqS5wwx+DIkVlUW+94/0jo0AUls/2z1oFfrxsv0GEXhtQWR6N
iMdfdY1tLwoS3xx3r9+mEDivn7EW9ySJO41rQ79FTiq5UgZzw+Y+szT7CWpiK/99
DRPS4yTZsVXfAlLcjSsL+KimBhdWrgrwDIViW1WkJMngwjhRjcRuFpDjZbUYhYaH
a55ePutqf/+R5a0mlgCV3RPmqf+lGp30JohtWL5VZsK90jtdATQ=
=maOw
-----END PGP SIGNATURE-----

BIN
emacs-28.2-pdf.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
emacs-28.2.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

11
emacs-28.2.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQFLBAABCgA1FiEEuwLkB66eqofJ5yodLU4f6VlXE10FAmMe8kQXHHN0ZWZhbmth
bmdhc0BnbWFpbC5jb20ACgkQLU4f6VlXE11V5Qf+PJusxzv/5obVQfXChnuJ0gv6
0PeBQtN3BFINjUpxaGqNBEKVeXCsqyvFa/Z6TIMmYPfPoKp6CrocnaXX2i3s1QPa
zZ5yYgz76Fs2wBdkv6S/yRmtFwJbOP54XGVhhvVzb1cvYEeIbQHtSvBkIEAi3S/O
45ro4sA5oEuWA+RGzMsHguxcCTzn0+YAM4Ch4HoZo+LWiGgCvhi/W8HUSCrA48/5
F2S9gpd7cS94UJs20CdV1rgs1eqgLdqIQgzHdxft+JrGfO2FdHdrnnLTg/NSJGn+
FEIqaSv29movaO61mVUYcCDmp9oyxRLw9/cWNI6eDADU7mq28CLkEEwbMB8Aaw==
=OaWq
-----END PGP SIGNATURE-----

15
emacs.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Nov 29 10:41:15 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Update to GNU Emacs version 28.2
* This is a bug-fix release with no new features.
- Add upstream commit as patch d48bb487.patch (bsc#1205822, CVE-2022-45939)
* shell command injection via source code files when using ctags
- Correct offsets of the patches
* emacs-24.3-iconic.patch
* emacs-24.4-ps-bdf.patch
* emacs-25.2-ImageMagick7.patch
* emacs-27.1-Xauthority4server.patch
* emacs-27.1-pdftex.patch
* emacs-28.1.dif
-------------------------------------------------------------------
Thu Nov 10 13:48:45 UTC 2022 - Dr. Werner Fink <werner@suse.de>

BIN
emacs.keyring
View File

Binary file not shown.

6
emacs.spec
View File

@ -138,7 +138,7 @@ BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xxf86vm)
URL: http://www.gnu.org/software/emacs/
Version: 28.1
Version: 28.2
Release: 0
Summary: GNU Emacs Base Package
License: GPL-3.0-or-later
@ -187,6 +187,7 @@ Patch24: emacs-25.2-ImageMagick7.patch
Patch25: emacs-26.1-xft4x11.patch
Patch26: emacs-27.1-pdftex.patch
Patch29: emacs-27.1-Xauthority4server.patch
Patch30: d48bb487.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
@ -333,6 +334,7 @@ and most assembler-like syntaxes.
%patch25 -p0 -b .xft
%patch26 -p0 -b .fmt
%patch29 -p0 -b .xauth
%patch30 -p0 -b .cve202245939
%patch -p0 -b .0
%if %{without tex4pdf}
pushd etc/refcards/
@ -3165,6 +3167,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/term/bobcat.elc
%{_datadir}/emacs/%{version}/lisp/term/common-win.elc
%{_datadir}/emacs/%{version}/lisp/term/cygwin.elc
%{_datadir}/emacs/%{version}/lisp/term/fbterm.elc
%{_datadir}/emacs/%{version}/lisp/term/internal.elc
%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.elc
%{_datadir}/emacs/%{version}/lisp/term/konsole.elc
@ -4735,6 +4738,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/term/bobcat.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/common-win.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/cygwin.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/fbterm.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/internal.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el%{ext_el}
%{_datadir}/emacs/%{version}/lisp/term/konsole.el%{ext_el}