diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index 449ff4c..d2a3b38 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -5,7 +5,7 @@ --- lisp/ldefs-boot.el +++ lisp/ldefs-boot.el 2023-08-01 06:47:17.809528438 +0000 -@@ -25499,9 +25499,9 @@ With prefix argument ARG, restart the Pr +@@ -25512,9 +25512,9 @@ With prefix argument ARG, restart the Pr ;;; Generated autoloads from ps-bdf.el diff --git a/emacs-29.2-pdf.tar.xz b/emacs-29.2-pdf.tar.xz deleted file mode 100644 index 8c7667b..0000000 --- a/emacs-29.2-pdf.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b53573c575ed26819e426e282311abeeb6623d1c100d8f5e19aa2a5037ed5c00 -size 2032896 diff --git a/emacs-29.2.tar.xz b/emacs-29.2.tar.xz deleted file mode 100644 index 91f83eb..0000000 --- a/emacs-29.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d3d2448988720bf4bf57ad77a5a08bf22df26160f90507a841ba986be2670dc -size 52162080 diff --git a/emacs-29.2.tar.xz.sig b/emacs-29.2.tar.xz.sig deleted file mode 100644 index dccaeb3..0000000 --- a/emacs-29.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmWpA70ACgkQ542uDzEV -4Gu8pw//ZNW3GMl7w2YLsxyDFom4Kf7JObr3v5S82LHRoJEm8fWlLtxOAFE4NVkU -d1UuCx9HO9DGLLvdSsssPhhyG3LrUaYoJHzf0hBbII0ERCWMv+zHFNKksyN0tIYT -BY7GtrcHtEmeNdP1+A8AtZQoKaC5v1SxsxX/HPWG+OF6iqY8ephAy8iZgOQ3foDp -iKOJ2Ebv8fqtNX0iSDNUtIs1DgFLktqKu4DlJeJr9h6bbcTpIYTT9qe85qlaNje0 -FX/ErBpZCHTMA/IatkOFFC8VnVQypqn9iCpn8xgaCUI/o3t6LLQycLr7oGGLaz0m -hzfsMpkYP5g9BnUXMO+8bclXA2rSqHKDrl+fPOJpa2TSZIt1GxW0H9QdTuUb5uK4 -VUuUIWcSSLOWpmJ1i/iv4swXJp4BxzGysKz4GpJntyhims59ZSLK6BNPrY/cDu1O -O74KX3NSdG0N6Z76+9kOV68RSSFTd+ijTzhf4ZnnFCR7tATgnMGS6S26aJ7d+ufk -XbKellcUmjeTU7KmUXAybPtMYbP1UiMW0PKsE//jas7u45MC4fc0OzFGC9ffnU3o -uNz0sLGoBY2+T8nlxtylIenBJDlX5i9VNkNii0rqAW1mj2qMcEetMGfCSf6N9jeP -eh5pCTQ1Sut+K0OhXELbpUYjF/s6UXlNUjTvstN3wB5NPoprz68= -=6wNg ------END PGP SIGNATURE----- diff --git a/emacs-29.3-pdf.tar.xz b/emacs-29.3-pdf.tar.xz new file mode 100644 index 0000000..cebb615 --- /dev/null +++ b/emacs-29.3-pdf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c5e602b1aefd935e2c634f6007ae1a9478bb8443ad21eeca4ed96b1ae62b44f +size 2032896 diff --git a/emacs-29.3.tar.xz b/emacs-29.3.tar.xz new file mode 100644 index 0000000..d7162d7 --- /dev/null +++ b/emacs-29.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c34c05d3ace666ed9c7f7a0faf070fea3217ff1910d004499bd5453233d742a0 +size 52203168 diff --git a/emacs-29.3.tar.xz.sig b/emacs-29.3.tar.xz.sig new file mode 100644 index 0000000..21a69e3 --- /dev/null +++ b/emacs-29.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEF+kNUhZywEYxsRg+542uDzEV4GsFAmYAMm4ACgkQ542uDzEV +4Gvp3BAAsGFxrXqqcqUZSaHyHWPxENM36V6+RZF5D4IIVoe+ubbQKnaCnrIbzYZI +KNYOkK7Rgm16S4hJ5K8VQm8laOgqTSQhSc5zlGziiRBu2qWzjE+9U8JAnZykqTGH +M+r48bgQP7JvB6CNkQ4DOZNpDyBNMDoONc1OGhR78Wlm6QaBRBtPEFyb4LtAan2F +4TqgJpufUD5HmJEabP/l0HyN8HDkHBwTkkq8xNAdqJC49qLM3qq2oZMobnJqzf31 +i+IsHhDA25eu5B+Fixpp1zhP0qo/PCUmB7PL31lFxA3cbZf5uuhAR0jxsKpkRFyS +AWtvihKOJShZj3USQ2dSihubJI7jAAp2HbzWmjPBqjOywLBuewK0rTGMj7WssMJ1 +ee+cfuJw3w1djgfXLxQW2Hj807on+FkwCDtOnVPe1mlPqPEVlaUYThU7Uzfem8Q8 +giC9qMO0Yc7EQdBGsiUO1FUpMxXSXporKecvcVuXV5GTmF/Kd22iNDTnY+W2/0RI +ZPe1mBf0oJQex2ScChQOhh4kQxzvEPQvSf5vHaLsJi6J7HmNNZM+rLJgBu65dRJs +K4JAae6y+QezNCrvnkx0uBgqbwKOkgdgw8vXablrIHkacVZWh0VrSLdr9TB/RCV3 +ZhIbzrm0jHMvW92lcRLOmSuWgHe6PI0PjKzSIofuUp7aTNsUXho= +=SMZ7 +-----END PGP SIGNATURE----- diff --git a/emacs.changes b/emacs.changes index 52666d8..17ea7cf 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Mar 25 09:22:31 UTC 2024 - Dr. Werner Fink + +- Update to GNU Emacs version 29.3 + which is an emergency bugfix release intended to fix several + security vulnerabilities described below. + * Arbitrary Lisp code is no longer evaluated as part of turning on Org mode. + This is for security reasons, to avoid evaluating malicious Lisp code. + * New buffer-local variable 'untrusted-content'. + When this is non-nil, Lisp programs should treat buffer contents with + extra caution. + * Gnus now treats inline MIME contents as untrusted. + To get back previous insecure behavior, 'untrusted-content' should be + reset to nil in the buffer. + * LaTeX preview is now by default disabled for email attachments. + To get back previous insecure behavior, set the variable + 'org--latex-preview-when-risky' to a non-nil value. + * Org mode now considers contents of remote files to be untrusted. + Remote files are recognized by calling 'file-remote-p'. +- Port patch emacs-24.4-ps-bdf.patch + ------------------------------------------------------------------- Fri Feb 2 08:26:58 UTC 2024 - Dr. Werner Fink diff --git a/emacs.spec b/emacs.spec index 74f7b8c..c2055be 100644 --- a/emacs.spec +++ b/emacs.spec @@ -154,7 +154,7 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xwayland) BuildRequires: pkgconfig(xxf86vm) URL: http://www.gnu.org/software/emacs/ -Version: 29.2 +Version: 29.3 Release: 0 Summary: GNU Emacs Base Package License: GPL-3.0-or-later @@ -207,6 +207,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: gtk_crash_bsc1219891.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)} %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -353,6 +354,7 @@ and most assembler-like syntaxes. %patch -P25 -p0 -b .xft %patch -P26 -p0 -b .fmt %patch -P29 -p0 -b .xauth +%patch -P30 -p0 -b .gtk %patch -P0 -p0 -b .0 %if %{without tex4pdf} pushd etc/refcards/ diff --git a/gtk_crash_bsc1219891.patch b/gtk_crash_bsc1219891.patch new file mode 100644 index 0000000..1485d86 --- /dev/null +++ b/gtk_crash_bsc1219891.patch @@ -0,0 +1,19 @@ +--- + src/frame.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- src/frame.c ++++ src/frame.c 2024-02-14 08:27:16.356238553 +0000 +@@ -2259,7 +2259,11 @@ delete_frame (Lisp_Object frame, Lisp_Ob + if (terminal->reference_count == 0 + && (terminal->type == output_x_window + || terminal->type == output_pgtk)) +- terminal->reference_count = 1; ++ { ++ const char *delterm = getenv ("GTK_DELTERM"); ++ if (delterm) ++ terminal->reference_count = 1; ++ } + #endif /* USE_X_TOOLKIT || USE_GTK */ + + if (terminal->reference_count == 0)