From b7aad51321d054f262d24d1c820c470e4fcb5ae4628bbd3e7d3c2ca63be4b482 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 22 Sep 2017 10:10:22 +0000 Subject: [PATCH] Update emacs 25.3 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=239 --- emacs-24.4-ps-bdf.patch | 8 ++++---- emacs-25.2-ImageMagick7.patch | 17 ++++++++++------- emacs-25.2-bsc1058425.patch | 29 +++++++++-------------------- emacs-25.2.tar.xz | 3 --- emacs-25.2.dif => emacs-25.3.dif | 0 emacs-25.3.tar.xz | 3 +++ emacs.changes | 11 +++++++++++ emacs.spec | 6 +++--- 8 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 emacs-25.2.tar.xz rename emacs-25.2.dif => emacs-25.3.dif (100%) create mode 100644 emacs-25.3.tar.xz diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index b4a0873..2f5ccf1 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -4,9 +4,9 @@ 2 files changed, 4 insertions(+), 4 deletions(-) --- lisp/ldefs-boot.el -+++ lisp/ldefs-boot.el 2017-02-27 14:06:23.653891166 +0000 -@@ -22142,9 +22142,9 @@ With prefix argument ARG, restart the Pr - ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22676 23208 878521 628000)) ++++ lisp/ldefs-boot.el 2017-09-22 09:54:57.114564921 +0000 +@@ -22141,9 +22141,9 @@ With prefix argument ARG, restart the Pr + ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22768 58519 620336 792000)) ;;; Generated autoloads from ps-bdf.el -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -18,7 +18,7 @@ (custom-autoload 'bdf-directory-list "ps-bdf" t) --- lisp/ps-bdf.el -+++ lisp/ps-bdf.el 2017-02-27 14:04:37.999877798 +0000 ++++ lisp/ps-bdf.el 2017-09-22 09:53:18.780402545 +0000 @@ -42,9 +42,9 @@ (defcustom bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) diff --git a/emacs-25.2-ImageMagick7.patch b/emacs-25.2-ImageMagick7.patch index c10f7f5..e68c287 100644 --- a/emacs-25.2-ImageMagick7.patch +++ b/emacs-25.2-ImageMagick7.patch @@ -1,8 +1,13 @@ Index: emacs-25.2/configure.ac =================================================================== ---- emacs-25.2.orig/configure.ac 2017-04-12 11:44:53.680930444 +0200 -+++ emacs-25.2/configure.ac 2017-04-12 11:44:53.692930606 +0200 -@@ -2406,7 +2406,7 @@ if test "${HAVE_X11}" = "yes" || test "$ +--- + emacs-25.3/configure.ac | 2 +- + emacs-25.3/src/image.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +--- emacs-25.3/configure.ac ++++ emacs-25.3/configure.ac 2017-09-22 09:59:44.049203440 +0000 +@@ -2408,7 +2408,7 @@ if test "${HAVE_X11}" = "yes" || test "$ if test "${with_imagemagick}" != "no"; then ## 6.3.5 is the earliest version known to work; see Bug#17339. ## 6.8.2 makes Emacs crash; see Bug#13867. @@ -11,10 +16,8 @@ Index: emacs-25.2/configure.ac EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE]) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) -Index: emacs-25.2/src/image.c -=================================================================== ---- emacs-25.2.orig/src/image.c 2017-02-03 11:25:45.000000000 +0100 -+++ emacs-25.2/src/image.c 2017-04-12 12:01:48.298637854 +0200 +--- emacs-25.3/src/image.c ++++ emacs-25.3/src/image.c 2017-09-22 09:59:44.053203364 +0000 @@ -8402,7 +8402,11 @@ imagemagick_compute_animated_image (Magi PixelWand **source, **dest; size_t source_width, source_height; diff --git a/emacs-25.2-bsc1058425.patch b/emacs-25.2-bsc1058425.patch index 60d513e..797c453 100644 --- a/emacs-25.2-bsc1058425.patch +++ b/emacs-25.2-bsc1058425.patch @@ -1,4 +1,4 @@ -From 9ad0fcc54442a9a01d41be19880250783426db70 Mon Sep 17 00:00:00 2001 +Based on 9ad0fcc54442a9a01d41be19880250783426db70 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 8 Sep 2017 20:23:31 -0700 Subject: Remove unsafe enriched mode translations @@ -9,25 +9,11 @@ Do not worry about enriched or richtext type. Remove translations for FUNCTION, display (Bug#28350). (enriched-handle-display-prop, enriched-decode-display-prop): Remove. --- - lisp/gnus/mm-view.el | 4 ---- - lisp/textmodes/enriched.el | 32 -------------------------------- - 2 files changed, 36 deletions(-) + lisp/textmodes/enriched.el | 35 ----------------------------------- + 1 file changed, 35 deletions(-) ---- lisp/gnus/mm-view.el -+++ lisp/gnus/mm-view.el 2017-09-13 07:19:26.107456442 +0000 -@@ -383,10 +383,6 @@ - (goto-char (point-max)))) - (save-restriction - (narrow-to-region b (point)) -- (when (member type '("enriched" "richtext")) -- (set-text-properties (point-min) (point-max) nil) -- (ignore-errors -- (enriched-decode (point-min) (point-max)))) - (mm-handle-set-undisplayer - handle - `(lambda () --- lisp/textmodes/enriched.el -+++ lisp/textmodes/enriched.el 2017-09-13 07:19:26.119456217 +0000 ++++ lisp/textmodes/enriched.el 2017-09-22 10:03:36.648869529 +0000 @@ -117,12 +117,7 @@ expression, which is evaluated to get th (full "flushboth") (center "center")) @@ -41,7 +27,7 @@ Remove translations for FUNCTION, display (Bug#28350). (unknown (nil format-annotate-value)) ; (font-size (2 "bigger") ; unimplemented ; (-2 "smaller")) -@@ -477,32 +472,5 @@ Return value is \(begin end name positiv +@@ -477,35 +472,5 @@ Return value is \(begin end name positiv (message "Warning: no color specified for ") nil)) @@ -71,6 +57,9 @@ Remove translations for FUNCTION, display (Bug#28350). - (error nil))))) - (unless prop - (message "Warning: invalid parameter %s" param)) -- (list start end 'display prop))) +- ;; Disabled in Emacs 25.3 to avoid execution of arbitrary Lisp +- ;; forms in display properties stored within enriched text. +- ;; (list start end 'display prop))) +- (list start end))) ;;; enriched.el ends here diff --git a/emacs-25.2.tar.xz b/emacs-25.2.tar.xz deleted file mode 100644 index b8e754a..0000000 --- a/emacs-25.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa -size 46900336 diff --git a/emacs-25.2.dif b/emacs-25.3.dif similarity index 100% rename from emacs-25.2.dif rename to emacs-25.3.dif diff --git a/emacs-25.3.tar.xz b/emacs-25.3.tar.xz new file mode 100644 index 0000000..70c244a --- /dev/null +++ b/emacs-25.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b +size 42854740 diff --git a/emacs.changes b/emacs.changes index 8f41966..c5f5339 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Sep 22 10:06:54 UTC 2017 - werner@suse.de + +- Update to emacs version 25.2 a security release + ** Security vulnerability related to Enriched Text mode is removed. +- Modified patches + * emacs-24.4-ps-bdf.patch + * emacs-25.2-ImageMagick7.patch + * emacs-25.2-bsc1058425.patch now partly upstream +- Rename emacs-25.2.dif to emacs-25.3.dif + ------------------------------------------------------------------- Wed Sep 13 07:21:34 UTC 2017 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index f2d10f5..1c2845b 100644 --- a/emacs.spec +++ b/emacs.spec @@ -85,7 +85,7 @@ BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: zlib-devel Url: http://www.gnu.org/software/emacs/ -Version: 25.2 +Version: 25.3 Release: 0 %if 0%{suse_version} >= 1300 Requires: etags @@ -108,7 +108,7 @@ Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs Source4: emacs-rpmlintrc Source5: emacs.sh -Patch: emacs-25.2.dif +Patch: emacs-25.3.dif # PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change Patch2: emacs-24.4-glibc.patch Patch3: emacs-24.4-decl.dif @@ -245,7 +245,7 @@ and most assembler-like syntaxes. %patch16 -p0 -b .flyspell %patch22 -p0 -b .obsolate %patch23 -p0 -b .custfnt -%patch24 -p1 +%patch24 -p1 -b .imag %patch25 -p0 %if 0%{?suse_version} > 1320 %patch26 -p1