diff --git a/cvs.spec b/cvs.spec index 404bfb476b021bec0f3e4e9597a4a690352b3fdb..12fdf7c98876404e8d936347bbd18d60776dac50 100644 --- a/cvs.spec +++ b/cvs.spec @@ -1,6 +1,6 @@ Name: cvs Version: 1.11.23 -Release: 53 +Release: 54 Summary: Version control system License: BSD and GPL+ and GPLv2+ and LGPLv2+ and zlib and Public Domain URL: http://cvs.nongnu.org/ @@ -44,6 +44,7 @@ Patch31: cvs-1.11.23-Pass-compilation-with-Wformat-security.patch Patch32: cvs-1.11.23-Fix-CVE-2017-12836.patch Patch33: cvs-1.11.23-Close-a-configuration-file-on-a-syntax-error.patch Patch34: cvs-1.11.23-Use-diff-label.patch +Patch35: fix-SIG-deregister-compilation-error.patch BuildRequires: autoconf automake coreutils glibc-common gzip krb5-devel vim-minimal BuildRequires: libtool make pam-devel perl-generators systemd texinfo zlib-devel xinetd @@ -136,5 +137,8 @@ make check %exclude %{_infodir}/dir %changelog +* Fri Aug 01 2025 liuqingtao 1.11.23-54 +- fix SIG-deregister compilation error + * Tue Feb 11 2020 duyeyu - 1.11.23-53 - Package init diff --git a/fix-SIG-deregister-compilation-error.patch b/fix-SIG-deregister-compilation-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..890914551f8548c439af409033f2a4dc05a528a4 --- /dev/null +++ b/fix-SIG-deregister-compilation-error.patch @@ -0,0 +1,17 @@ +diff --git a/src/cvs.h b/src/cvs.h +index 187a354..38d3270 100644 +--- a/src/cvs.h ++++ b/src/cvs.h +@@ -485,6 +485,12 @@ extern int parse_config PROTO ((char *)); + + typedef RETSIGTYPE (*SIGCLEANUPPROC) PROTO(()); + int SIG_register PROTO((int sig, SIGCLEANUPPROC sigcleanup)); ++#ifdef SIGABRT ++ /* Need to deregister the SIGABRT handler so that if an assertion ++ fails and calls abort while we're cleaning up, we won't ++ infinitely recurse in the cleanup function. */ ++int SIG_deregister PROTO((int sig, SIGCLEANUPPROC sigcleanup)); ++#endif + int isdir PROTO((const char *file)); + int isfile PROTO((const char *file)); + int islink PROTO((const char *file));