From ec43e38e4641d9490474591b1653c512d9e839b6baefe93e4753790b9554c99a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 1 Aug 2011 07:39:21 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/ctags revision 17.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=858a70b7e72239d756cc9a4b4bd64f1f --- ctags.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ctags.spec b/ctags.spec index 6ca7481..b46b252 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,7 +1,7 @@ # -# spec file for package ctags (Version 2009.12.21) +# spec file for package ctags # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -21,7 +21,7 @@ Name: ctags %define ctags_ver 5.8 %define etags_ver 17.38.1.4 # Let the date means last update of either ctags or etags tarball -Version: 2011.07.29 +Version: 2011.7.29 Release: 1 License: GPLv2+ Summary: A Program to Generate Tag Files for Use with vi and Other Editors From 86a91423582d8fcc262b4d244dc2c97a473ebc39aa437266e1984c7bafbacdc0 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 2 Aug 2011 15:35:31 +0000 Subject: [PATCH 2/2] bnc#705308 OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=10 --- ctags.changes | 5 +++++ ctags.spec | 2 ++ etags-strcpy-overlap.patch | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 etags-strcpy-overlap.patch diff --git a/ctags.changes b/ctags.changes index d648127..9caf4ad 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 2 15:33:11 UTC 2011 - puzel@novell.com + +- add etags-strcpy-overlap.patch (bnc#705308) + ------------------------------------------------------------------- Fri Jul 29 16:49:36 UTC 2011 - puzel@novell.com diff --git a/ctags.spec b/ctags.spec index b46b252..6681b33 100644 --- a/ctags.spec +++ b/ctags.spec @@ -36,6 +36,7 @@ Patch1: ctags-5.7.diff #Patch2: ctags-ycp-parser.diff Patch3: ctags-date-time.patch Patch4: etags-%{etags_ver}.diff +Patch5: etags-strcpy-overlap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +55,7 @@ Postscript, Erlang, Python, Prolog, and most assembler-like syntaxes. %patch3 -p1 cd ../etags-%{etags_ver} %patch4 +%patch5 -p1 %build CC=gcc diff --git a/etags-strcpy-overlap.patch b/etags-strcpy-overlap.patch new file mode 100644 index 0000000..083baef --- /dev/null +++ b/etags-strcpy-overlap.patch @@ -0,0 +1,34 @@ +Index: etags-17.38.1.4/etags.c +=================================================================== +--- etags-17.38.1.4.orig/etags.c ++++ etags-17.38.1.4/etags.c +@@ -907,6 +907,13 @@ print_version () + exit (EXIT_SUCCESS); + } + ++static void etags_strcpy(char *to, char *from) ++{ ++ while (*from) ++ *to++ = *from++; ++ *to = *from; ++} ++ + #ifndef PRINT_UNDOCUMENTED_OPTIONS_HELP + # define PRINT_UNDOCUMENTED_OPTIONS_HELP FALSE + #endif +@@ -6695,13 +6702,13 @@ absolute_filename (file, dir) + else if (cp[0] != '/') + cp = slashp; + #endif +- strcpy (cp, slashp + 3); ++ etags_strcpy (cp, slashp + 3); + slashp = cp; + continue; + } + else if (slashp[2] == '/' || slashp[2] == '\0') + { +- strcpy (slashp, slashp + 2); ++ etags_strcpy (slashp, slashp + 2); + continue; + } + }