rpms
/
emacs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Emacs bug #11580, 'Fix querying BBDB for entries without a last name'

This commit is contained in:
Karel Klic 2012-11-16 17:14:08 +01:00
parent cf202808df
commit 3925af8408
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
emacs-bz11580-eudc-bbdb.patch Normal file
View File

@ -0,0 +1,47 @@
From: Sergio Durigan Junior <sergiodj@riseup.net>
Date: Tue, 02 Oct 2012 05:10:16 +0000
Subject: Bugfix for EUDCB-BBDB queries.
* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
querying BBDB for entries without a last name.
2012-10-02 Sergio Durigan Junior <sergiodj@riseup.net>
* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
querying BBDB for entries without a last name (Bug#11580).
Index: emacs-23.3/lisp/net/eudcb-bbdb.el
===================================================================
--- emacs-23.3.orig/lisp/net/eudcb-bbdb.el
+++ emacs-23.3/lisp/net/eudcb-bbdb.el
@@ -169,18 +169,18 @@ The record is filtered according to `eud
(symbol-name attr)))
'record))))
(t
- (setq val "Unknown BBDB attribute")))
- (if val
- (cond
- ((memq attr '(phones addresses))
- (setq eudc-rec (append val eudc-rec)))
- ((and (listp val)
- (= 1 (length val)))
- (setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
- ((> (length val) 0)
- (setq eudc-rec (cons (cons attr val) eudc-rec)))
- (t
- (error "Unexpected attribute value")))))
+ (error "Unknown BBDB attribute")))
+ (cond
+ ((or (not val) (equal val ""))) ; do nothing
+ ((memq attr '(phones addresses))
+ (setq eudc-rec (append val eudc-rec)))
+ ((and (listp val)
+ (= 1 (length val)))
+ (setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
+ ((> (length val) 0)
+ (setq eudc-rec (cons (cons attr val) eudc-rec)))
+ (t
+ (error "Unexpected attribute value"))))
(nreverse eudc-rec)))

9
emacs.spec
View File

@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.3
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@ -39,6 +39,8 @@ Patch8: emacs-ede-cve-2012-0035.patch
# CVE-2012-3479 emacs: Evaluation of 'eval' forms in file-local
# variable sections, when 'enable-local-variables' set to ':safe'
Patch9: emacs-cve-2012-3479.patch
# Fix for Emacs bug #11580.
Patch10: emacs-bz11580-eudc-bbdb.patch
BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@ -162,6 +164,7 @@ packages that add functionality to Emacs.
%patch7 -p1 -b .wm-state-hidden
%patch8 -p1 -b .ede-cve-2012-0035
%patch9 -p1 -b .cve-2012-3479
%patch10 -p1 -b .emacs-bz11580-eudc-bbdb
# Install site-lisp files
cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp
@ -438,6 +441,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
* Tue Nov 06 2012 Sergio Durigan Junior <sergiodj@riseup.net> - 1:23.3-11
- Fix for Emacs bug #11580, 'Fix querying BBDB for entries without a last
name'.
* Tue Aug 14 2012 Karel Klíč <kklic@redhat.com> - 1:23.3-10
- CVE-2012-3479 emacs: Evaluation of 'eval' forms in file-local
variable sections, when 'enable-local-variables' set to ':safe'