diff --git a/srcpkgs/leatherman-devel b/srcpkgs/leatherman-devel deleted file mode 120000 index 03015502720..00000000000 --- a/srcpkgs/leatherman-devel +++ /dev/null @@ -1 +0,0 @@ -leatherman \ No newline at end of file diff --git a/srcpkgs/leatherman/patches/catch.patch b/srcpkgs/leatherman/patches/catch.patch deleted file mode 100644 index a2398ab31b9..00000000000 --- a/srcpkgs/leatherman/patches/catch.patch +++ /dev/null @@ -1,390 +0,0 @@ -Backport -https://github.com/catchorg/Catch2/commit/6c6cfe126aa5f4a0cfbe8e805db550e47e26aab1 -And run: -python2 scripts/generateSingleHeader.py -Index: leatherman-1.12.4/catch/inc/catch.hpp -=================================================================== ---- leatherman-1.12.4.orig/catch/inc/catch.hpp -+++ leatherman-1.12.4/catch/inc/catch.hpp -@@ -1,6 +1,6 @@ - /* - * Catch v1.10.0 -- * Generated: 2017-08-26 15:16:46.676990 -+ * Generated: 2022-10-12 22:42:54.972394 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. -@@ -6320,9 +6320,12 @@ CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - // #included from: catch_fatal_condition.hpp - #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED - -+#include -+#include -+ - namespace Catch { - -- // Report the error condition -+ //! Signals fatal error message to the run context - inline void reportFatal( std::string const& message ) { - IContext& context = Catch::getCurrentContext(); - IResultCapture* resultCapture = context.getResultCapture(); -@@ -6360,8 +6363,31 @@ namespace Catch { - # if !defined ( CATCH_CONFIG_WINDOWS_SEH ) - - namespace Catch { -- struct FatalConditionHandler { -- void reset() {} -+ class FatalConditionHandler { -+ bool m_started = false; -+ -+ // Install/disengage implementation for specific platform. -+ // Should be if-defed to work on current platform, can assume -+ // engage-disengage 1:1 pairing. -+ void engage_platform() {} -+ void disengage_platform() {} -+ -+ public: -+ // Should also have platform-specific implementations as needed -+ FatalConditionHandler() {} -+ ~FatalConditionHandler() {} -+ -+ void engage() { -+ assert(!m_started && "Handler cannot be installed twice."); -+ m_started = true; -+ engage_platform(); -+ } -+ -+ void disengage() { -+ assert(m_started && "Handler cannot be uninstalled without being installed first"); -+ m_started = false; -+ disengage_platform(); -+ } - }; - } - -@@ -6381,53 +6407,72 @@ namespace Catch { - { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" }, - }; - -- struct FatalConditionHandler { -- -- static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { -- for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { -- if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { -- reportFatal(signalDefs[i].name); -- } -+ static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { -+ for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { -+ if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { -+ reportFatal(signalDefs[i].name); - } -- // If its not an exception we care about, pass it along. -- // This stops us from eating debugger breaks etc. -- return EXCEPTION_CONTINUE_SEARCH; - } -+ // If its not an exception we care about, pass it along. -+ // This stops us from eating debugger breaks etc. -+ return EXCEPTION_CONTINUE_SEARCH; -+ } - -- FatalConditionHandler() { -- isSet = true; -- // 32k seems enough for Catch to handle stack overflow, -- // but the value was found experimentally, so there is no strong guarantee -- guaranteeSize = 32 * 1024; -- exceptionHandlerHandle = CATCH_NULL; -+ // Since we do not support multiple instantiations, we put these -+ // into global variables and rely on cleaning them up in outlined -+ // constructors/destructors -+ static PVOID exceptionHandlerHandle = CATCH_NULL; -+ -+ class FatalConditionHandler { -+ bool m_started = false; -+ -+ // Install/disengage implementation for specific platform. -+ // Should be if-defed to work on current platform, can assume -+ // engage-disengage 1:1 pairing. -+ -+ void engage_platform() { - // Register as first handler in current chain - exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); -- // Pass in guarantee size to be filled -- SetThreadStackGuarantee(&guaranteeSize); -+ if (!exceptionHandlerHandle) { -+ throw std::runtime_error("Could not register vectored exception handler"); -+ } - } - -- static void reset() { -- if (isSet) { -- // Unregister handler and restore the old guarantee -- RemoveVectoredExceptionHandler(exceptionHandlerHandle); -- SetThreadStackGuarantee(&guaranteeSize); -- exceptionHandlerHandle = CATCH_NULL; -- isSet = false; -+ void disengage_platform() { -+ if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) { -+ throw std::runtime_error("Could not unregister vectored exception handler"); - } -+ exceptionHandlerHandle = CATCH_NULL; - } - -- ~FatalConditionHandler() { -- reset(); -+ public: -+ FatalConditionHandler() { -+ ULONG guaranteeSize = static_cast(32 * 1024); -+ if (!SetThreadStackGuarantee(&guaranteeSize)) { -+ // We do not want to fully error out, because needing -+ // the stack reserve should be rare enough anyway. -+ Catch::cerr() -+ << "Failed to reserve piece of stack." -+ << " Stack overflows will not be reported successfully."; -+ } - } -- private: -- static bool isSet; -- static ULONG guaranteeSize; -- static PVOID exceptionHandlerHandle; -- }; - -- bool FatalConditionHandler::isSet = false; -- ULONG FatalConditionHandler::guaranteeSize = 0; -- PVOID FatalConditionHandler::exceptionHandlerHandle = CATCH_NULL; -+ // We do not attempt to unset the stack guarantee, because -+ // Windows does not support lowering the stack size guarantee. -+ ~FatalConditionHandler() {} -+ -+ void engage() { -+ assert(!m_started && "Handler cannot be installed twice."); -+ m_started = true; -+ engage_platform(); -+ } -+ -+ void disengage() { -+ assert(m_started && "Handler cannot be uninstalled without being installed first"); -+ m_started = false; -+ disengage_platform(); -+ } -+ }; - - } // namespace Catch - -@@ -6438,8 +6483,31 @@ namespace Catch { - # if !defined(CATCH_CONFIG_POSIX_SIGNALS) - - namespace Catch { -- struct FatalConditionHandler { -- void reset() {} -+ class FatalConditionHandler { -+ bool m_started = false; -+ -+ // Install/disengage implementation for specific platform. -+ // Should be if-defed to work on current platform, can assume -+ // engage-disengage 1:1 pairing. -+ void engage_platform() {} -+ void disengage_platform() {} -+ -+ public: -+ // Should also have platform-specific implementations as needed -+ FatalConditionHandler() {} -+ ~FatalConditionHandler() {} -+ -+ void engage() { -+ assert(!m_started && "Handler cannot be installed twice."); -+ m_started = true; -+ engage_platform(); -+ } -+ -+ void disengage() { -+ assert(m_started && "Handler cannot be uninstalled without being installed first"); -+ m_started = false; -+ disengage_platform(); -+ } - }; - } - -@@ -6463,29 +6531,56 @@ namespace Catch { - { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" } - }; - -- struct FatalConditionHandler { -+// Older GCCs trigger -Wmissing-field-initializers for T foo = {} -+// which is zero initialization, but not explicit. We want to avoid -+// that. -+#if defined(__GNUC__) -+# pragma GCC diagnostic push -+# pragma GCC diagnostic ignored "-Wmissing-field-initializers" -+#endif - -- static bool isSet; -- static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; -- static stack_t oldSigStack; -- static char altStackMem[SIGSTKSZ]; -- -- static void handleSignal( int sig ) { -- std::string name = ""; -- for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { -- SignalDefs &def = signalDefs[i]; -- if (sig == def.id) { -- name = def.name; -- break; -- } -+ static char* altStackMem = CATCH_NULL; -+ static std::size_t altStackSize = 0; -+ static stack_t oldSigStack; -+ static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; -+ -+ static void restorePreviousSignalHandlers() { -+ // We set signal handlers back to the previous ones. Hopefully -+ // nobody overwrote them in the meantime, and doesn't expect -+ // their signal handlers to live past ours given that they -+ // installed them after ours.. -+ for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { -+ sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL); -+ } -+ // Return the old stack -+ sigaltstack(&oldSigStack, CATCH_NULL); -+ } -+ -+ static void handleSignal( int sig ) { -+ char const * name = ""; -+ for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { -+ SignalDefs &def = signalDefs[i]; -+ if (sig == def.id) { -+ name = def.name; -+ break; - } -- reset(); -- reportFatal(name); -- raise( sig ); - } -+ // We need to restore previous signal handlers and let them do -+ // their thing, so that the users can have the debugger break -+ // when a signal is raised, and so on. -+ restorePreviousSignalHandlers(); -+ reportFatal( name ); -+ raise( sig ); -+ } - -- FatalConditionHandler() { -- isSet = true; -+ class FatalConditionHandler { -+ bool m_started = false; -+ -+ // Install/disengage implementation for specific platform. -+ // Should be if-defed to work on current platform, can assume -+ // engage-disengage 1:1 pairing. -+ -+ void engage_platform() { - stack_t sigStack; - sigStack.ss_sp = altStackMem; - sigStack.ss_size = SIGSTKSZ; -@@ -6500,26 +6595,42 @@ namespace Catch { - } - } - -- ~FatalConditionHandler() { -- reset(); -+ void disengage_platform() { -+ restorePreviousSignalHandlers(); - } -- static void reset() { -- if( isSet ) { -- // Set signals back to previous values -- hopefully nobody overwrote them in the meantime -- for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) { -- sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL); -- } -- // Return the old stack -- sigaltstack(&oldSigStack, CATCH_NULL); -- isSet = false; -+ -+ public: -+ FatalConditionHandler() { -+ assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists"); -+ if (altStackSize == 0) { -+ altStackSize = SIGSTKSZ; - } -+ altStackMem = new char[altStackSize](); -+ } -+ -+ ~FatalConditionHandler() { -+ delete[] altStackMem; -+ // We signal that another instance can be constructed by zeroing -+ // out the pointer. -+ altStackMem = CATCH_NULL; -+ } -+ -+ void engage() { -+ assert(!m_started && "Handler cannot be installed twice."); -+ m_started = true; -+ engage_platform(); -+ } -+ -+ void disengage() { -+ assert(m_started && "Handler cannot be uninstalled without being installed first"); -+ m_started = false; -+ disengage_platform(); - } - }; - -- bool FatalConditionHandler::isSet = false; -- struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; -- stack_t FatalConditionHandler::oldSigStack = {}; -- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; -+#if defined(__GNUC__) -+# pragma GCC diagnostic pop -+#endif - - } // namespace Catch - -@@ -6527,6 +6638,23 @@ namespace Catch { - - #endif // not Windows - -+namespace Catch { -+ -+ //! Simple RAII guard for (dis)engaging the FatalConditionHandler -+ class FatalConditionHandlerGuard { -+ FatalConditionHandler* m_handler; -+ public: -+ FatalConditionHandlerGuard(FatalConditionHandler* handler): -+ m_handler(handler) { -+ m_handler->engage(); -+ } -+ ~FatalConditionHandlerGuard() { -+ m_handler->disengage(); -+ } -+ }; -+ -+} // end namespace Catch -+ - #include - #include - -@@ -6865,9 +6993,8 @@ namespace Catch { - } - - void invokeActiveTestCase() { -- FatalConditionHandler fatalConditionHandler; // Handle signals -+ FatalConditionHandlerGuard _(&m_fatalConditionhandler); - m_activeTestCase->invoke(); -- fatalConditionHandler.reset(); - } - - private: -@@ -6905,6 +7032,7 @@ namespace Catch { - std::vector m_unfinishedSections; - std::vector m_activeSections; - TrackerContext m_trackerContext; -+ FatalConditionHandler m_fatalConditionhandler; - size_t m_prevPassed; - bool m_shouldReportUnexpected; - }; -Index: leatherman-1.12.4/catch/CMakeLists.txt -=================================================================== ---- leatherman-1.12.4.orig/catch/CMakeLists.txt -+++ leatherman-1.12.4/catch/CMakeLists.txt -@@ -1 +1 @@ --add_leatherman_vendored("Catch-1.10.0.zip" "Catch-1.10.0" "single_include") -+add_leatherman_includes("catch/include") diff --git a/srcpkgs/leatherman/patches/fix-include.patch b/srcpkgs/leatherman/patches/fix-include.patch deleted file mode 100644 index 36b81bf6801..00000000000 --- a/srcpkgs/leatherman/patches/fix-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: leatherman-1.12.4/util/inc/leatherman/util/scope_exit.hpp -=================================================================== ---- leatherman-1.12.4.orig/util/inc/leatherman/util/scope_exit.hpp -+++ leatherman-1.12.4/util/inc/leatherman/util/scope_exit.hpp -@@ -4,6 +4,7 @@ - */ - #pragma once - -+#include - #include - - namespace leatherman { namespace util { -Index: leatherman-1.12.4/util/inc/leatherman/util/scoped_resource.hpp -=================================================================== ---- leatherman-1.12.4.orig/util/inc/leatherman/util/scoped_resource.hpp -+++ leatherman-1.12.4/util/inc/leatherman/util/scoped_resource.hpp -@@ -4,6 +4,7 @@ - */ - #pragma once - -+#include - #include - - namespace leatherman { namespace util { diff --git a/srcpkgs/leatherman/patches/reduce-vendor.patch b/srcpkgs/leatherman/patches/reduce-vendor.patch deleted file mode 100644 index 4d4dfe525e5..00000000000 --- a/srcpkgs/leatherman/patches/reduce-vendor.patch +++ /dev/null @@ -1,128 +0,0 @@ -Still vendor rapidjson, facter depends on older API ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,11 +66,10 @@ file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES - add_subdirectory(locales) - - add_leatherman_dir(catch EXCLUDE_FROM_VARS) --add_leatherman_dir(nowide) - add_leatherman_dir(util) - add_leatherman_dir(locale) - add_leatherman_dir(logging) - add_leatherman_dir(rapidjson) - add_leatherman_dir(json_container) - add_leatherman_dir(file_util) - add_leatherman_dir(curl) ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -1,10 +1,8 @@ --find_package(Boost 1.54 REQUIRED date_time chrono system) -+find_package(Boost 1.54 REQUIRED date_time chrono system nowide) - - add_leatherman_deps(${Boost_LIBRARIES}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) -- - if(WIN32) - set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") - set(PLATFORM_TESTS "tests/windows/environment.cc") ---- a/json_container/CMakeLists.txt -+++ b/json_container/CMakeLists.txt -@@ -1,11 +1,11 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex) -+find_package(Boost 1.54 REQUIRED COMPONENTS regex nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - - leatherman_dependency(rapidjson) - leatherman_dependency(locale) - - add_leatherman_library("src/json_container.cc") - add_leatherman_headers("inc/leatherman") --add_leatherman_test("tests/json_container_test.cc") -\ No newline at end of file -+add_leatherman_test("tests/json_container_test.cc") ---- a/logging/CMakeLists.txt -+++ b/logging/CMakeLists.txt -@@ -1,10 +1,10 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex) -+find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time -+ filesystem system chrono regex nowide) - find_package(Threads) - - add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") ---- a/execution/CMakeLists.txt -+++ b/execution/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") -@@ -10,7 +10,6 @@ endif() - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - - leatherman_dependency(util) --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(file_util) ---- a/file_util/CMakeLists.txt -+++ b/file_util/CMakeLists.txt -@@ -1,9 +1,8 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(util) ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,4 +1,5 @@ --set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) -+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread -+ filesystem regex nowide) - if (LEATHERMAN_USE_LOCALES) - set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) - endif() ---- a/file_util/src/file.cc -+++ b/file_util/src/file.cc -@@ -1,6 +1,6 @@ - #include - #include --#include -+#include - #include - #include - #include ---- a/util/src/environment.cc -+++ b/util/src/environment.cc -@@ -1,5 +1,5 @@ - #include --#include -+#include - #include - - using namespace std; ---- a/util/tests/environment.cc -+++ b/util/tests/environment.cc -@@ -1,6 +1,6 @@ - #include - #include --#include -+#include - - using namespace std; - using namespace leatherman::util; diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template deleted file mode 100644 index 8a3031789e5..00000000000 --- a/srcpkgs/leatherman/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'leatherman' -pkgname=leatherman -version=1.12.4 -revision=8 -build_style=cmake -configure_args="-DLEATHERMAN_SHARED=ON" -hostmakedepends="pkg-config python3" -makedepends="boost-devel-minimal libboost_filesystem libboost_system - libboost_date_time libboost_log_setup libboost_regex - libboost_locale libboost_log libboost_nowide libcurl-devel" -short_desc="Collection of C++ and CMake utility libraries" -maintainer="Orphaned " -license="Apache-2.0" -homepage="https://github.com/puppetlabs/leatherman/" -distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=00f1b50a7f5f15fcb8dcf0e242f8ada7d31ec78b6093152eee8744e3e284dc28 -python_version=3 - -CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value" -CXXFLAGS+=" -Wno-deprecated-copy -Wno-type-limits -Wno-deprecated-declarations" - -post_extract() { - mkdir catch/inc - bsdtar -C catch/inc --strip-components=2 -xf vendor/Catch-* '*/single_include' -} - -do_check() { - cd build - ctest -V -} - -post_install() { - cat <<-'EOF' >"${DESTDIR}/usr/lib/cmake/leatherman/catch.cmake" - add_leatherman_includes("${LEATHERMAN_PREFIX}/include/leatherman/vendor") - EOF -} - -leatherman-devel_package() { - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove "usr/lib/*.so" - vinstall catch/inc/catch.hpp 644 usr/include/leatherman/vendor - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b830850dfc4..c1e27e97998 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -85,6 +85,7 @@ replaces=" compton-conf<=0.15.0_1 couchdb<=1.7.1_2 couchpotato<=3.0.1_3 + cpp-hocon<=0.3.0_9 cpuminer<=2.5.1_1 cracklib-python<=2.9.7_1 crystal<=0.34.0_4 @@ -352,6 +353,7 @@ replaces=" ladish-devel<=1_11 ladish<=1_11 laditools<=1.1.0_3 + leatherman<=1.12.4_8 libArcus-devel<=4.13.1_8 libArcus-python3<=4.13.1_8 libArcus<=4.13.1_8