rpms/xemacs/F-11 xemacs-21.5.29-etags-memmove-545399.patch, NONE, 1.1 xemacs.spec, 1.55, 1.56
Jerry James
jjames at fedoraproject.org
Tue Dec 8 17:17:37 UTC 2009
Author: jjames
Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15905/F-11
Modified Files:
xemacs.spec
Added Files:
xemacs-21.5.29-etags-memmove-545399.patch
Log Message:
* Tue Dec 8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
- Add patch to use memmove in etags (bz 545399).
xemacs-21.5.29-etags-memmove-545399.patch:
ChangeLog | 5 +++++
etags.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE xemacs-21.5.29-etags-memmove-545399.patch ---
diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog
--- xemacs-21.5.29.ORIG/lib-src/ChangeLog 2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/ChangeLog 2009-12-08 10:09:57.753594714 -0700
@@ -1,3 +1,8 @@
+2009-12-08 Sjoerd Mullender <sjoerd at acm.org>
+
+ * etags.c (absolute_filename): Use memmove instead of strcpy to move
+ characters within a string.
+
2009-05-18 Stephen J. Turnbull <stephen at xemacs.org>
* XEmacs 21.5.29 "garbanzo" is released.
diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c
--- xemacs-21.5.29.ORIG/lib-src/etags.c 2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lib-src/etags.c 2009-12-08 10:09:09.100592092 -0700
@@ -6829,13 +6829,13 @@
else if (cp[0] != '/')
cp = slashp;
#endif
- strcpy (cp, slashp + 3);
+ memmove (cp, slashp + 3, strlen (slashp + 3) + 1);
slashp = cp;
continue;
}
else if (slashp[2] == '/' || slashp[2] == '\0')
{
- strcpy (slashp, slashp + 2);
+ memmove (slashp, slashp + 2, strlen (slashp + 2) + 1);
continue;
}
}
Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xemacs.spec 9 Nov 2009 16:50:45 -0000 1.55
+++ xemacs.spec 8 Dec 2009 17:17:37 -0000 1.56
@@ -22,7 +22,7 @@
Name: xemacs
Version: 21.5.29
-Release: 7%{?snap:.%{snap}}%{?dist}
+Release: 8%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -54,6 +54,8 @@ Patch8: %{name}-21.5.28-courier-
Patch9: %{name}-21.5.29-destdir.patch
# Sent upstream 2009-10-28
Patch10: %{name}-21.5.29-tty-font-512623.patch
+# Sent upstream 2009-12-08
+Patch11: %{name}-21.5.29-etags-memmove-545399.patch
# Sent upstream 2009-03-12
Patch14: %{name}-beta-infodir.patch
@@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%patch14 -p1
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -589,6 +592,9 @@ fi
%changelog
+* Tue Dec 8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
+- Add patch to use memmove in etags (bz 545399).
+
* Mon Nov 9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-7
- Move macros.xemacs to the -common subpackage (bz 533611).
- Updated TTY font patch from upstream.
More information about the scm-commits
mailing list