diff --git a/emacs-CVE-2014-9483.patch b/emacs-CVE-2014-9483.patch new file mode 100644 index 0000000..4d37cad --- /dev/null +++ b/emacs-CVE-2014-9483.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/simple.el b/lisp/simple.el +index 57307ba..10d7797 100644 +--- a/lisp/simple.el ++++ b/lisp/simple.el +@@ -3987,7 +3987,8 @@ run `deactivate-mark-hook'." + ;; the region prior to the last command modifying the buffer. + ;; Set the selection to that, or to the current region. + (cond (saved-region-selection +- (x-set-selection 'PRIMARY saved-region-selection) ++ (if (x-selection-owner-p 'PRIMARY) ++ (x-set-selection 'PRIMARY saved-region-selection)) + (setq saved-region-selection nil)) + ;; If another program has acquired the selection, region + ;; deactivation should not clobber it (Bug#11772). diff --git a/emacs.spec b/emacs.spec index c534fb8..e7a2beb 100644 --- a/emacs.spec +++ b/emacs.spec @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 24.3 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -45,6 +45,7 @@ Patch22: emacs-compiled-timestamps.patch # BZ1104012, initialize kbd_macro_ptr and kbd_macro_end Patch23: emacs-24.3-macro.patch Patch24: emacs-umlaut-tex-mode.patch +Patch25: emacs-CVE-2014-9483.patch BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel @@ -197,6 +198,7 @@ packages that add functionality to Emacs. %patch22 -p1 -b .compiled-timestamps %patch23 -p1 %patch24 -p1 -b .umlaut-tex-mode +%patch25 -p1 -b .CVE-2014-9483 # We prefer our emacs.desktop file cp %SOURCE1 etc/emacs.desktop @@ -487,6 +489,9 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Tue May 26 2015 Petr Hracek - 1:24.3-27 +- Fixes CVE-2014-9483 (#1181599) + * Wed Apr 8 2015 Petr Hracek - 1:24.3-26 - Cannot enter umlaut in TeX input mode (#1145526)