From 17d5e7a27e34c5d6348bfac88b5cce5b378103de Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Fri, 27 Mar 2009 14:21:00 +0000 Subject: [PATCH] fix #489066 --- emacs.spec | 7 ++++++- emacsclient.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 emacsclient.patch diff --git a/emacs.spec b/emacs.spec index 47e0f27..bb0143a 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 22.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -28,6 +28,7 @@ Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch2: po-mode-auto-replace-date-71264.patch Patch3: rpm-spec-mode-utc.patch +Patch4: emacsclient.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel @@ -110,6 +111,7 @@ Emacs packages or see some elisp examples. %prep %setup -q %patch0 -p1 -b .glibc-open-macro +%patch4 -p1 # install rest of site-lisp files ( cd site-lisp @@ -361,6 +363,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Fri Mar 27 2009 Daniel Novotny 1:22.3-10 +- fix segfaults when emacsclient connects to a tcp emacs server (#489066) + * Thu Mar 12 2009 Daniel Novotny 1:22.3-9 - implement UTC change log option in rpm-spec-mode.el (#489829) diff --git a/emacsclient.patch b/emacsclient.patch new file mode 100644 index 0000000..6306157 --- /dev/null +++ b/emacsclient.patch @@ -0,0 +1,12 @@ +*** emacs-22.3/lib-src/emacsclient.c~ 2007-02-16 09:12:59.000000000 -0800 +--- emacs-22.3/lib-src/emacsclient.c 2009-03-05 15:42:53.000000000 -0800 +*************** +*** 48,53 **** +--- 48,54 ---- + + # ifdef HAVE_INET_SOCKETS + # include ++ # include + # endif + + # define INVALID_SOCKET -1