Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
@ -0,0 +1,81 @@
|
||||
From eaea31cb93ecddda69a373f83f632e1a450c3c90 Mon Sep 17 00:00:00 2001
|
||||
From: Brock Zheng Techyauld Ltd <yzheng@techyauld.com>
|
||||
Date: Tue, 25 Aug 2020 20:28:11 +0800
|
||||
Subject: [PATCH 9/9] emacs plugin fixup: GNU/Emacs 27.1 removes function
|
||||
process-kill-without-query
|
||||
|
||||
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
|
||||
---
|
||||
contrib/xcscope/xcscope.el | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/contrib/xcscope/xcscope.el b/contrib/xcscope/xcscope.el
|
||||
index 0e814ea..859dff5 100644
|
||||
--- a/contrib/xcscope/xcscope.el
|
||||
+++ b/contrib/xcscope/xcscope.el
|
||||
@@ -180,7 +180,7 @@
|
||||
;; variable is used to determine the mapping. One use for this
|
||||
;; variable is when you want to share the database file with other
|
||||
;; users; in this case, the database may be located in a directory
|
||||
-;; separate from the source files.
|
||||
+;; separate from the source files.
|
||||
;;
|
||||
;; Setting the variable, `cscope-initial-directory', is useful when a
|
||||
;; search is to be expanded by specifying a cscope database directory
|
||||
@@ -366,7 +366,7 @@
|
||||
;; disable automatic database creation, updating, and
|
||||
;; maintenance.
|
||||
;;
|
||||
-;; "cscope-display-cscope-buffer"
|
||||
+;; "cscope-display-cscope-buffer"
|
||||
;; If non-nil, display the *cscope* buffer after each search
|
||||
;; (default). This variable can be set in order to reduce the
|
||||
;; number of keystrokes required to navigate through the matches.
|
||||
@@ -1233,7 +1233,7 @@ directory should begin.")
|
||||
:style toggle :selected cscope-use-relative-paths ]
|
||||
[ "No mouse prompts" (setq cscope-no-mouse-prompts
|
||||
(not cscope-no-mouse-prompts))
|
||||
- :style toggle :selected cscope-no-mouse-prompts ]
|
||||
+ :style toggle :selected cscope-no-mouse-prompts ]
|
||||
)
|
||||
))
|
||||
|
||||
@@ -1291,7 +1291,7 @@ The text properties to be added:
|
||||
)
|
||||
|
||||
|
||||
-(defun cscope-show-entry-internal (file line-number
|
||||
+(defun cscope-show-entry-internal (file line-number
|
||||
&optional save-mark-p window arrow-p)
|
||||
"Display the buffer corresponding to FILE and LINE-NUMBER
|
||||
in some window. If optional argument WINDOW is given,
|
||||
@@ -1943,7 +1943,7 @@ using the mouse."
|
||||
cscope-directory
|
||||
(file-name-directory cscope-directory))
|
||||
))
|
||||
- (setq cscope-directory
|
||||
+ (setq cscope-directory
|
||||
(file-name-as-directory cscope-directory))
|
||||
(if (not (member cscope-directory cscope-searched-dirs))
|
||||
(progn
|
||||
@@ -2006,7 +2006,7 @@ using the mouse."
|
||||
(set-process-filter cscope-process cscope-filter-func)
|
||||
(set-process-sentinel cscope-process cscope-sentinel-func)
|
||||
(set-marker (process-mark cscope-process) (point))
|
||||
- (process-kill-without-query cscope-process)
|
||||
+ (set-process-query-on-exit-flag cscope-process nil)
|
||||
(if cscope-running-in-xemacs
|
||||
(setq modeline-process ": Searching ..."))
|
||||
(setq buffer-read-only t)
|
||||
@@ -2139,7 +2139,7 @@ SENTINEL-FUNC are optional process filter and sentinel, respectively."
|
||||
cscope-indexing-script args))
|
||||
(set-process-sentinel cscope-unix-index-process
|
||||
'cscope-unix-index-files-sentinel)
|
||||
- (process-kill-without-query cscope-unix-index-process)
|
||||
+ (set-process-query-on-exit-flag cscope-unix-index-process nil)
|
||||
)
|
||||
))
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
23
SOURCES/dist-5-fix-signal-handler.patch
Normal file
23
SOURCES/dist-5-fix-signal-handler.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff -up ./src/main.c.orig ./src/main.c
|
||||
--- ./src/main.c.orig 2024-08-04 16:49:08.723525637 +0200
|
||||
+++ ./src/main.c 2024-08-04 16:53:19.967862016 +0200
|
||||
@@ -1056,11 +1056,18 @@ Please see the manpage for more informat
|
||||
void
|
||||
myexit(int sig)
|
||||
{
|
||||
+ /* reset signal handlers to default ones, so myexit() is not called
|
||||
+ * recursively as a signal handler during a normal exit */
|
||||
+ signal(SIGINT, SIG_DFL);
|
||||
+ signal(SIGQUIT, SIG_DFL);
|
||||
+ signal(SIGHUP, SIG_DFL);
|
||||
+ signal(SIGTERM, SIG_DFL);
|
||||
+
|
||||
/* HBB 20010313; close file before unlinking it. Unix may not care
|
||||
* about that, but DOS absolutely needs it */
|
||||
if (refsfound != NULL)
|
||||
fclose(refsfound);
|
||||
-
|
||||
+
|
||||
/* remove any temporary files */
|
||||
if (temp1[0] != '\0') {
|
||||
unlink(temp1);
|
||||
@ -1,14 +1,20 @@
|
||||
%if !0%{?rhel} && 0%{?fedora} < 36
|
||||
%bcond_without xemacs
|
||||
%else
|
||||
%bcond_with xemacs
|
||||
%endif
|
||||
|
||||
Summary: C source code tree search and browse tool
|
||||
Name: cscope
|
||||
Version: 15.9
|
||||
Release: 17%{?dist}
|
||||
Release: 26%{?dist}
|
||||
Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/v%{version}/%{name}-%{version}.tar.gz
|
||||
URL: http://cscope.sourceforge.net
|
||||
License: BSD and GPLv2+
|
||||
License: BSD-3-Clause AND GPL-2.0-or-later
|
||||
BuildRequires: pkgconf-pkg-config ncurses-devel gcc flex bison m4
|
||||
BuildRequires: autoconf automake make
|
||||
Requires: emacs-filesystem coreutils ed
|
||||
%if !0%{?rhel} && 0%{?fedora} < 36
|
||||
%if %{with xemacs}
|
||||
Requires: xemacs-filesystem
|
||||
%endif
|
||||
|
||||
@ -20,8 +26,7 @@ Patch4: cscope-4-Avoid-double-free-via-double-fclose-in-changestring.patch
|
||||
Patch5: cscope-5-contrib-ocs-Fix-bashims-Closes-480591.patch
|
||||
Patch6: cscope-6-doc-cscope.1-Fix-hyphens.patch
|
||||
Patch7: cscope-7-fscanner-swallow-function-as-parameters.patch
|
||||
# this patch is not needed - RHEL8 has emacs-26.1
|
||||
# Patch8: cscope-8-emacs-plugin-fixup-GNU-Emacs-27.1-removes-function-p.patch
|
||||
Patch8: cscope-8-emacs-plugin-fixup-GNU-Emacs-27.1-removes-function-p.patch
|
||||
Patch9: cscope-9-fix-access-beyond-end-of-string.patch
|
||||
Patch10: cscope-a-docs-typo-fixes-in-man-page-and-comments.patch
|
||||
|
||||
@ -30,9 +35,10 @@ Patch11: dist-1-coverity-fixes.patch
|
||||
Patch12: dist-2-cscope-indexer-help.patch
|
||||
Patch13: dist-3-add-selftests.patch
|
||||
Patch14: dist-4-fix-printf.patch
|
||||
Patch15: dist-5-fix-signal-handler.patch
|
||||
|
||||
%define cscope_share_path %{_datadir}/cscope
|
||||
%if !0%{?rhel} && 0%{?fedora} < 36
|
||||
%if %{with xemacs}
|
||||
%define xemacs_lisp_path %{_datadir}/xemacs/site-packages/lisp
|
||||
%else
|
||||
%define xemacs_lisp_path %nil
|
||||
@ -84,7 +90,7 @@ make check
|
||||
%dir /var/lib/cs
|
||||
%doc AUTHORS COPYING ChangeLog README TODO contrib/cctree.txt
|
||||
|
||||
%if !0%{?rhel} && 0%{?fedora} < 36
|
||||
%if %{with xemacs}
|
||||
%triggerin -- xemacs
|
||||
ln -sf %{cscope_share_path}/xcscope.el %{xemacs_lisp_path}/xcscope.el
|
||||
%endif
|
||||
@ -95,7 +101,7 @@ ln -sf %{cscope_share_path}/xcscope.el %{emacs_lisp_path}/xcscope.el
|
||||
%triggerin -- vim-filesystem
|
||||
ln -sf %{cscope_share_path}/cctree.vim %{vim_plugin_path}/cctree.vim
|
||||
|
||||
%if !0%{?rhel} && 0%{?fedora} < 36
|
||||
%if %{with xemacs}
|
||||
%triggerun -- xemacs
|
||||
[ $2 -gt 0 ] && exit 0
|
||||
rm -f %{xemacs_lisp_path}/xcscope.el
|
||||
@ -110,43 +116,64 @@ rm -f %{emacs_lisp_path}/xcscope.el
|
||||
rm -f %{vim_plugin_path}/cctree.vim
|
||||
|
||||
%changelog
|
||||
* Thu Oct 31 2024 Vladis Dronov <vdronov@redhat.com> - 15.9-26
|
||||
- Update cscope to 15.9-26 from Fedora (RHEL-65465)
|
||||
- Fix signal handling at exit
|
||||
- Minor edits in the rpm scripts and the changelog
|
||||
- Make xemacs a bcond
|
||||
|
||||
* Thu Sep 29 2022 Vladis Dronov <vdronov@redhat.com> - 15.9-17
|
||||
- Update to the upstream git @ 7f2369ac (bz 2129887)
|
||||
- Update to the upstream git @ 7f2369ac (bz 2129890)
|
||||
|
||||
* Fri Apr 22 2022 Vladis Dronov <vdronov@redhat.com> - 15.9-11
|
||||
- Add another small distrubution patch (bz 2074437)
|
||||
* Fri Apr 22 2022 Vladis Dronov <vdronov@redhat.com> - 15.9-15
|
||||
- Add another small distrubution patch (bz 2072635)
|
||||
|
||||
* Mon Apr 11 2022 Vladis Dronov <vdronov@redhat.com> - 15.9-10
|
||||
- Add missing upstream patches (bz 2074437)
|
||||
* Mon Apr 11 2022 Vladis Dronov <vdronov@redhat.com> - 15.9-14
|
||||
- Add distrubution patches which were not upstreamed (bz 2072635)
|
||||
- Add self-tests
|
||||
- Add OSCI harness
|
||||
|
||||
* Wed Oct 21 2020 Vladis Dronov <vdronov@redhat.com> - 15.9-9
|
||||
- Remove another fclose() to please covscan (bz1886165)
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 15.9-12
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* 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
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 15.9-11
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jun 25 2019 Neil Horman <nhorman@redhat.com> - 15.9-6
|
||||
- Fix covscan warning (bz 1722404)
|
||||
* Tue Mar 16 2021 Vladis Dronov <vdronov@redhat.com> - 15.9-10
|
||||
- Bring in important patches from the upstream (39fb38..eaea31 in a git repo)
|
||||
- Fix the upstream tarball URL
|
||||
- Remove outdated patch files
|
||||
|
||||
* Mon Jun 24 2019 Neil Horman <nhorman@redhat.com> - 15.9-5
|
||||
- update help for cscope-indexer (bz 1722404)
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 15.9-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jun 03 2019 Neil Horman <nhorman@redhat.com> - 15.9-4
|
||||
- Fix cscope version (bz 1685920)
|
||||
* Wed Jul 29 2020 Neil Horman <nhorman@redhat.com> - 15.9-8
|
||||
- Adding missing dependency on ed (bz 1861697)
|
||||
|
||||
* Thu Feb 28 2019 Neil Horman <nhorman@redhat.com> - 15.9-3
|
||||
- Add CI test harness (bz 1682353)
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 15.9-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Oct 12 2018 Neil Horman <nhorman@redhat.com> - 15.9-2
|
||||
- Fix up some coverity scan issues (bz 1602468)
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 15.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 15.9-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Mon Dec 10 2018 Neil Horman <nhorman@redhat.com> - 15.9-2
|
||||
- update Requires to include coreutils (bz 1657775)
|
||||
|
||||
* Tue Jul 24 2018 Neil Horman <nhorman@redhat.com> - 15.9-1
|
||||
- Update to latest upstream with coverity fixes (bz 1602468)
|
||||
- update to latest upstream
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 15.8b-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Mar 01 2018 Josh Boyer <jwboyer@fedoraproject.org> - 15.8b-8
|
||||
- Conditionalize xemacs
|
||||
@ -209,7 +236,7 @@ rm -f %{vim_plugin_path}/cctree.vim
|
||||
- Update to latest upstream
|
||||
|
||||
* Mon Mar 12 2012 Neil Horman <nhorman@redhat.com> -15.7a-10
|
||||
- Fixed a segfault in invlib construction ( bz 786523)
|
||||
- Fixed a segfault in invlib construction (bz 786523)
|
||||
|
||||
* Mon Mar 05 2012 Neil Horman <nhorman@redhat.com> 15.7a-9
|
||||
- Fixed a segfault in the symbol assignment search (bz 799643)
|
||||
@ -218,7 +245,7 @@ rm -f %{vim_plugin_path}/cctree.vim
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Jun 30 2011 Neil Horman <nhorman@redhat.com> - 15.7a-7
|
||||
- Added LEXERR token to catch bad parsing before we crash (bz717545)
|
||||
- Added LEXERR token to catch bad parsing before we crash (bz 717545)
|
||||
|
||||
* Fri Jun 24 2011 Neil Horman <nhorman@redhat.com> - 15.7a-6
|
||||
- Fixed licensing for xcscope.el (bz 715898)
|
||||
@ -242,7 +269,7 @@ rm -f %{vim_plugin_path}/cctree.vim
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 15.6-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 12 2009 Neil Horman <nhorman@redhat.com>
|
||||
* Fri Jun 12 2009 Neil Horman <nhorman@redhat.com> - 15.6-4
|
||||
- Fix some buffer overflows (bz 505605)
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 15.6-3
|
||||
@ -277,7 +304,7 @@ rm -f %{vim_plugin_path}/cctree.vim
|
||||
- Fix putstring overflow (bz 189666)
|
||||
|
||||
* Fri May 5 2006 Neil Horman <nhorman@redhat.com>
|
||||
- Adding fix to put SYSDIR in right location (bz190580)
|
||||
- Adding fix to put SYSDIR in right location (bz 190580)
|
||||
|
||||
* Fri Apr 21 2006 Neil Horman <nhorman@redhat.com> - 15.5-13.4
|
||||
- adding inverted index overflow patch
|
||||
@ -322,7 +349,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
|
||||
- Incorporated M. Schwendt's fix for ocs -s
|
||||
|
||||
* Fri Jun 18 2004 Neil Horman <nhorman@redhat.com>
|
||||
- built the package
|
||||
|
||||
Loading…
Reference in New Issue
Block a user