rpms/emacs/devel emacs-23.1-memmove.patch, NONE, 1.1 emacs.spec, 1.146, 1.147

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10196

Modified Files:
	emacs.spec 
Added Files:
	emacs-23.1-memmove.patch 
Log Message:
Fixed etags on x86_64. Resolves rhbz#545398.

emacs-23.1-memmove.patch:
 etags.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE emacs-23.1-memmove.patch ---
diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
--- emacs-23.1/lib-src/etags.c.memmove	2009-06-21 06:37:34.000000000 +0200
+++ emacs-23.1/lib-src/etags.c	2009-12-08 17:55:41.442792036 +0100
@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen(slashp + 2));
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen(slashp + 1));
 	      continue;
 	    }
 	}


Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- emacs.spec	3 Dec 2009 12:20:22 -0000	1.146
+++ emacs.spec	8 Dec 2009 17:02:32 -0000	1.147
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -28,9 +28,12 @@ Patch2: po-mode-auto-replace-date-71264.
 Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
+# Fixed in upstream CVS.
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
 Patch8: emacs-23.1-indian.patch
+# Fixed in upstream CVS
+Patch9: emacs-23.1-memmove.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -129,6 +132,7 @@ Emacs packages or see some elisp example
 %patch6 -p1
 %patch7 -p1 -b .scroll
 %patch8 -p1
+%patch9 -p1 -b .memmove
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -400,6 +404,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Dec  8 2009 Karel Klic <kklic at redhat.com> 1:23.1-17
+- Fixed rhbz#545398 - ETags messes up filenames
+
 * Thu Dec 03 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-16
 - fix #542657 -  emacs does not display indic text