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

Accepting request 281053 from editors

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/281053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=112
This commit is contained in:
Stephan Kulow 2015-01-21 20:55:45 +00:00 committed by Git OBS Bridge
commit d271d2159c
4 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
emacs-gnupg-15th-field.patch Normal file
View File

@ -0,0 +1,24 @@
From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
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))))

10
emacs.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jan 13 14:59:50 UTC 2015 - werner@suse.de
- 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
-------------------------------------------------------------------
Wed Oct 29 11:27:26 UTC 2014 - werner@suse.de

10
emacs.spec
View File

@ -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 @@ Source3: dot.gnu-emacs
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 @@ Patch5: emacs-24.4-ps-bdf.patch
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 @@ and most assembler-like syntaxes.
%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 @@ and most assembler-like syntaxes.
%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/net/ange-ftp.el.0
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

14
emacs24-primarysel2.patch Normal file
View File

@ -0,0 +1,14 @@
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