Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2015-01-21 21:55:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2014-11-06 16:50:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2015-01-21 21:56:18.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 13 14:59:50 UTC 2015 - [email protected] + +- Add upstream patches + * emacs-gnupg-15th-field.patch + epg.el (epg--list-keys-1): Ignore fields after the 15th field + * emacs24-primarysel2.patch + bsc#912872 -- CVE-2014-9483: a left-click in Emacs sometimes + modifies the PRIMARY + +------------------------------------------------------------------- New: ---- emacs-gnupg-15th-field.patch emacs24-primarysel2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.dt23Ic/_old 2015-01-21 21:56:20.000000000 +0100 +++ /var/tmp/diff_new_pack.dt23Ic/_new 2015-01-21 21:56:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package emacs # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -96,6 +96,8 @@ Source4: emacs-rpmlintrc Source5: emacs.sh Patch: emacs-24.4.dif +# PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change +Patch1: emacs-gnupg-15th-field.patch Patch2: emacs-24.4-glibc.patch Patch3: emacs-24.4-decl.dif Patch4: emacs-24.3-asian-print.patch @@ -103,6 +105,8 @@ Patch7: emacs-24.1-ps-mule.patch Patch8: emacs-24.4-nonvoid.patch Patch9: emacs-24.4-bzr118021.patch +# PATCH-FIX-UPSTREAM bsc#912872 -- CVE-2014-9483 +Patch10: emacs24-primarysel2.patch Patch11: emacs-24.4-xim.patch Patch12: emacs-24.3-x11r7.patch Patch15: emacs-24.3-iconic.patch @@ -207,6 +211,7 @@ %prep %setup -q -b 2 +%patch1 -p1 -b .gnupg %patch2 -p0 -b .glibc %patch3 -p0 -b .decl %patch4 -p0 -b .print @@ -214,6 +219,7 @@ %patch7 -p0 -b .psmu %patch8 -p0 -b .nvoid %patch9 -p0 -b .inrange +%patch10 -p1 -b .prime %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch15 -p0 -b .iconic @@ -520,6 +526,8 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/site-load.el.0 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/speedbar.el.0 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.0 +rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/epg.el.gnupg +rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/mouse.el.prime unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/bindings.elc unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/cus-start.elc unelc %{buildroot}%{_datadir}/emacs/%{version}/lisp/generic-x.elc ++++++ emacs-gnupg-15th-field.patch ++++++ >From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001 From: Daiki Ueno <[email protected]> Date: Fri, 07 Nov 2014 02:31:12 +0000 Subject: epg: Adjust to GnuPG 2.1 key listing change * epg.el (epg--list-keys-1): Ignore fields after the 15th field (bug#18979). Reported by Hideki Saito. --- (limited to 'lisp/epg.el') --- a/lisp/epg.el +++ b/lisp/epg.el 2015-01-13 00:00:00.000000000 +0000 @@ -1910,8 +1910,9 @@ This function is for internal use only." string (match-string 0) index 0 field 0) - (while (eq index - (string-match "\\([^:]+\\)?:" string index)) + (while (and (< field (length (car keys))) + (eq index + (string-match "\\([^:]+\\)?:" string index))) (setq index (match-end 0)) (aset (car keys) field (match-string 1 string)) (setq field (1+ field)))) ++++++ emacs24-primarysel2.patch ++++++ diff --git a/lisp/mouse.el b/lisp/mouse.el index e267418..2afe313 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -856,7 +856,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by (copy-region-as-kill (mark) (point))))) ;; Otherwise, run binding of terminating up-event. - (deactivate-mark) + (let (select-active-regions) + (deactivate-mark)) (if do-multi-click (goto-char start-point) (unless moved-off-start -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
