Merge branch 'f29'

This commit is contained in:
Neil Horman 2019-04-16 11:18:34 -04:00 committed by nhorman
commit b34d26371b
2 changed files with 18 additions and 1 deletions

11
cscope-dblfree.patch Normal file
View File

@ -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
@@ -803,7 +803,6 @@ changestring(void)
}
changing = NO;
mousemenu();
- fclose(script);
free(change);
return(anymarked);
}

View File

@ -1,7 +1,7 @@
Summary: C source code tree search and browse tool
Name: cscope
Version: 15.9
Release: 3%{?dist}
Release: 4%{?dist}
Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
URL: http://cscope.sourceforge.net
License: BSD and GPLv2+
@ -13,6 +13,8 @@ Requires: emacs-filesystem coreutils
Requires: xemacs-filesystem
%endif
Patch1: 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
@ -28,6 +30,7 @@ matches for use in file editing.
%prep
%setup -q
%patch1 -p1
autoreconf
@ -86,6 +89,9 @@ rm -f %{emacs_lisp_path}/xcscope.el
rm -f %{vim_plugin_path}/cctree.vim
%changelog
* Thu Apr 11 2019 Neil Horman <nhorman@redhat.com> - 15.9-4
- Fixing double free (bz 1657210)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 15.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild