import cscope-15.9-9.el8

SOURCES/cscope-coverity-fixes.patch

@@ -1,14 +1,3 @@
-diff -up ./src/command.c.coverity2 ./src/command.c
---- ./src/command.c.coverity2	2018-10-11 15:20:44.113781058 -0400
-+++ ./src/command.c	2018-10-11 15:21:35.078607301 -0400
-@@ -785,7 +785,6 @@ changestring(void)
- 	}
-     }
-     fprintf(script, "w\nq\n!\n");	/* write and quit */
--    fclose(script);
- 
-     /* if any line was marked */
-     if (anymarked == YES) {
 diff -up ./src/egrep.c.coverity2 ./src/egrep.c
 --- ./src/egrep.c.coverity2	2018-10-11 15:22:40.481384312 -0400
 +++ ./src/egrep.c	2018-10-11 15:23:31.152211589 -0400

SOURCES/cscope-dblfree.patch

@@ -0,0 +1,11 @@
+diff -up ./src/command.c.dblfree ./src/command.c
+--- ./src/command.c.dblfree	2019-04-11 07:08:24.358253603 -0400
++++ ./src/command.c	2019-04-11 07:08:43.955193615 -0400
+@@ -785,7 +785,6 @@ changestring(void)
+ 	}
+     }
+     fprintf(script, "w\nq\n!\n");	/* write and quit */
+-    fclose(script);
+ 
+     /* if any line was marked */
+     if (anymarked == YES) {

SPECS/cscope.spec

@@ -1,35 +1,36 @@
-Summary: C source code tree search and browse tool 
+Summary: C source code tree search and browse tool
 Name: cscope
 Version: 15.9
-Release: 6%{?dist}
+Release: 9%{?dist}
 Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 URL: http://cscope.sourceforge.net
 License: BSD and GPLv2+
-Group: Development/Tools 
-BuildRequires: pkgconf-pkg-config ncurses-devel flex bison m4
+Group: Development/Tools
+BuildRequires: gcc pkgconf-pkg-config ncurses-devel flex bison m4
 BuildRequires: autoconf automake
-Requires: emacs-filesystem
+Requires: emacs-filesystem coreutils
+Requires: ed
 %if !0%{?rhel}
 Requires: xemacs-filesystem
 %endif
 
-Patch0:	cscope-coverity-fixes.patch
+Patch0: cscope-coverity-fixes.patch
 Patch1: cscope-selftest.patch
 Patch2: cscope-selftest-repoint.patch
 Patch3: cscope-version.patch
 Patch4: cscope-cscope-indexer-help.patch
+Patch5: cscope-dblfree.patch
 
 %define cscope_share_path %{_datadir}/cscope
 %define xemacs_lisp_path %{_datadir}/xemacs/site-packages/lisp
 %define emacs_lisp_path %{_datadir}/emacs/site-lisp
 %define vim_plugin_path %{_datadir}/vim/vimfiles/plugin
 
-
 %description
-cscope is a mature, ncurses based, C source code tree browsing tool.  It 
+cscope is a mature, ncurses based, C source code tree browsing tool.  It
 allows users to search large source code bases for variables, functions,
-macros, etc, as well as perform general regex and plain text searches.  
-Results are returned in lists, from which the user can select individual 
+macros, etc, as well as perform general regex and plain text searches.
+Results are returned in lists, from which the user can select individual
 matches for use in file editing.
 
 %prep
@@ -46,7 +47,7 @@ make check
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.files
-make DESTDIR=$RPM_BUILD_ROOT install 
+make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/var/lib/cs
 mkdir -p $RPM_BUILD_ROOT%{cscope_share_path}
 cp -a contrib/xcscope/xcscope.el $RPM_BUILD_ROOT%{cscope_share_path}
@@ -59,8 +60,6 @@ for dir in %{xemacs_lisp_path} %{emacs_lisp_path} ; do
   echo "%ghost $dir/xcscope.el*" >> %{name}-%{version}.files
 done
 
-
-
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -96,6 +95,17 @@ rm -f %{emacs_lisp_path}/xcscope.el
 rm -f %{vim_plugin_path}/cctree.vim
 
 %changelog
+* Wed Oct 21 2020 Vladis Dronov <vdronov@redhat.com> - 15.9-9
+- Remove another fclose() to please covscan (bz1886165)
+
+* Wed Oct 07 2020 Vladis Dronov <vdronov@redhat.com> - 15.9-8
+- Fix a double-free in changestring() (bz1886165)
+- Update Requires to include coreutils and ed
+- Adjust cscope-coverity-fixes.patch removing the fclose(script) chunk
+- Adjust BuildRequires and remove trailing spaces
+- Remove older source version from .gitignore
+- Rename cscope-invindex-sizing.patch as it is for the older upstream version
+
 * Tue Jun 25 2019 Neil Horman <nhorman@redhat.com> - 15.9-6
 - Fix covscan warning (bz 1722404)
 
@@ -275,7 +285,7 @@ rm -f %{vim_plugin_path}/cctree.vim
 
 * Tue Sep 28 2004 Neil Horman <nhorman@redhat.com>
 - fixed inverted index bug (bz 133942)
- 
+
 * Mon Sep 13 2004 Frank Ch. Eigler <fche@redhat.com>
 - bumped release number to a plain "1"
 
@@ -289,7 +299,7 @@ rm -f %{vim_plugin_path}/cctree.vim
 - Added upstream ocs fix
 - Added feature to find symbol assignments
 - Changed default SYSDIR directory to /var/lib/cs
-- Incoproated M. Schwendt's fix for ocs -s 
+- Incoproated M. Schwendt's fix for ocs -s
 
 * Fri Jun 18 2004 Neil Horman <nhorman@redhat.com>
 - built the package