From 90e13deb0eba50b367573db3c24e449e598f86f6 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Sep 06 2021 16:37:48 +0000 Subject: Import catch1-1.12.2-8.el9 in CloudSIG xena --- diff --git a/.catch1.metadata b/.catch1.metadata index 5f5be0f..b3c5e30 100644 --- a/.catch1.metadata +++ b/.catch1.metadata @@ -1 +1 @@ -340a18695d88be7c27574eaa88002a249cf851d8 SOURCES/catch1-1.12.1.tar.gz +742d0f5c5607037112a655c28853639263ad770d SOURCES/catch1-1.12.2.tar.gz diff --git a/SOURCES/catch1-sigstksz.patch b/SOURCES/catch1-sigstksz.patch new file mode 100644 index 0000000..dbd8941 --- /dev/null +++ b/SOURCES/catch1-sigstksz.patch @@ -0,0 +1,68 @@ +commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680 +Author: Tom Hughes +Date: Fri Feb 19 10:45:49 2021 +0000 + + Patch for non-constant SIGSTKSZ + +diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp +index 1dcd545d..f7d9e10d 100644 +--- a/include/internal/catch_fatal_condition.hpp ++++ b/include/internal/catch_fatal_condition.hpp +@@ -136,7 +136,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = ""; +@@ -156,7 +156,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -188,7 +188,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + + } // namespace Catch +diff --git a/single_include/catch.hpp b/single_include/catch.hpp +index fdb046fe..d64fd1a5 100644 +--- a/single_include/catch.hpp ++++ b/single_include/catch.hpp +@@ -6540,7 +6540,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = ""; +@@ -6560,7 +6560,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -6591,7 +6591,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + } // namespace Catch + diff --git a/SPECS/catch1.spec b/SPECS/catch1.spec index ab54d23..55d59e5 100644 --- a/SPECS/catch1.spec +++ b/SPECS/catch1.spec @@ -1,13 +1,15 @@ %global debug_package %{nil} Name: catch1 -Version: 1.12.1 -Release: 1%{?dist} +Version: 1.12.2 +Release: 8%{?dist} Summary: A modern, C++-native, header-only, framework for unit-tests, TDD and BDD License: Boost -URL: https://github.com/philsquared/Catch -Source0: https://github.com/philsquared/Catch/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/catchorg/Catch2 +Source0: https://github.com/catchorg/Catch2/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/catchorg/Catch2/issues/2178 +Patch0: catch1-sigstksz.patch BuildRequires: cmake make gcc-c++ @@ -35,8 +37,8 @@ is packaged up as a single header for extra convenience. %build -%cmake . -Bbuild -%make_build -Cbuild +%cmake +%cmake_build %install @@ -45,8 +47,7 @@ cp -pr include %{buildroot}%{_includedir}/catch %check -cd build -ctest -V %{?_smp_mflags} +%ctest %files devel @@ -56,6 +57,30 @@ ctest -V %{?_smp_mflags} %changelog +* Fri Feb 19 2021 Tom Hughes - 1.12.2-8 +- Add patch for non-constant SIGSTKSZ + +* Tue Jan 26 2021 Fedora Release Engineering - 1.12.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.12.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.12.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.12.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 15 2018 Tom Hughes - 1.12.2-1 +- Update to 1.12.2 upstream release + * Sat Mar 3 2018 Tom Hughes - 1.12.1-1 - Update to 1.12.1 upstream release