diff --git a/SOURCES/cscope-15.8-init-function-array-to-unknown.patch b/SOURCES/cscope-15.8-init-function-array-to-unknown.patch new file mode 100644 index 0000000..6c46309 --- /dev/null +++ b/SOURCES/cscope-15.8-init-function-array-to-unknown.patch @@ -0,0 +1,14 @@ +diff -up ./src/find.c.nullfix ./src/find.c +--- ./src/find.c.nullfix 2012-06-15 07:18:11.000000000 -0400 ++++ ./src/find.c 2016-02-11 14:19:45.409675762 -0500 +@@ -1201,7 +1201,9 @@ getposting(void) + static void + putpostingref(POSTING *p, char *pat) + { +- static char function[PATLEN + 1]; /* function name */ ++ // initialize function to "unknown" so that the first line of temp1 ++ // is properly formed if symbol matches a header file entry first time ++ static char function[PATLEN + 1] = "unknown";/* function name */ + + if (p->fcnoffset == 0) { + if (p->type == FCNDEF) { /* need to find the function name */ diff --git a/SOURCES/cscope-version.patch b/SOURCES/cscope-version.patch new file mode 100644 index 0000000..d9f3b49 --- /dev/null +++ b/SOURCES/cscope-version.patch @@ -0,0 +1,11 @@ +diff -up ./src/version.h.update ./src/version.h +--- ./src/version.h.update 2016-02-17 15:38:30.464094042 -0500 ++++ ./src/version.h 2016-02-17 15:38:38.235314016 -0500 +@@ -42,6 +42,6 @@ + #define CSCOPE_VERSION_H + + #define FILEVERSION 15 /* Initial Open Source and Linux Port */ +-#define FIXVERSION ".7a" /* feature and bug fix version */ ++#define FIXVERSION ".8" /* feature and bug fix version */ + + #endif /* CSCOPE_VERSION_H */ diff --git a/SPECS/cscope.spec b/SPECS/cscope.spec index 1822e41..a05d169 100644 --- a/SPECS/cscope.spec +++ b/SPECS/cscope.spec @@ -1,7 +1,7 @@ Summary: C source code tree search and browse tool Name: cscope Version: 15.8 -Release: 7%{?dist} +Release: 9%{?dist} Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2 URL: http://cscope.sourceforge.net License: BSD and GPLv2+ @@ -15,6 +15,8 @@ Requires: emacs-filesystem %define vim_plugin_path %{_datadir}/vim/vimfiles/plugin Patch0: cscope-invindex-sizing.patch +Patch1: cscope-15.8-init-function-array-to-unknown.patch +Patch2: cscope-version.patch %description cscope is a mature, ncurses based, C source code tree browsing tool. It @@ -26,6 +28,8 @@ matches for use in file editing. %prep %setup -q %patch0 -p0 +%patch1 -p1 +%patch2 -p1 -z .update %build %configure @@ -75,6 +79,12 @@ rm -f %{emacs_lisp_path}/xcscope.el rm -f %{vim_plugin_path}/cctree.vim %changelog +* Wed Feb 17 2016 Neil Horman - 15.8-9 +- Resolves bz 1057132) + +* Thu Feb 11 2016 Neil Horman - 15.8-8 +- Resolves bz 1124571 + * Fri Jan 24 2014 Daniel Mach - 15.8-7 - Mass rebuild 2014-01-24