Date: Mon, 9 Dec 2024 09:15:25 GMT From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 119957ec7382 - main - net-p2p/clboss: upgrade from 0.14.0 to 0.14.1 Message-ID: <202412090915.4B99FP6r035019@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=119957ec73824fd115dff13b49b505f463f73135 commit 119957ec73824fd115dff13b49b505f463f73135 Author: Vasil Dimov <vd@FreeBSD.org> AuthorDate: 2024-12-09 09:13:49 +0000 Commit: Vasil Dimov <vd@FreeBSD.org> CommitDate: 2024-12-09 09:15:16 +0000 net-p2p/clboss: upgrade from 0.14.0 to 0.14.1 --- net-p2p/clboss/Makefile | 5 +- net-p2p/clboss/distinfo | 6 +- .../files/patch-program_invocation_name.diff | 67 ---------------------- 3 files changed, 6 insertions(+), 72 deletions(-) diff --git a/net-p2p/clboss/Makefile b/net-p2p/clboss/Makefile index 4291aa5b39c1..88ca89cc20bc 100644 --- a/net-p2p/clboss/Makefile +++ b/net-p2p/clboss/Makefile @@ -1,7 +1,7 @@ PORTNAME= clboss DISTVERSIONPREFIX= v # To build from an arbitrary git commit comment DISTVERSION -DISTVERSION= 0.14.0 +DISTVERSION= 0.14.1 # and uncomment the following two lines (use for example -gf8d8348c where f8d8348c is a commit hash) #DISTVERSION= 0 #DISTVERSIONSUFFIX= -g0673c50e7 @@ -18,7 +18,8 @@ LICENSE= MIT BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive LIB_DEPENDS= libcurl.so:ftp/curl \ - libev.so:devel/libev + libev.so:devel/libev \ + libunwind.so:devel/libunwind RUN_DEPENDS= lightningd:net-p2p/c-lightning USES= autoreconf \ diff --git a/net-p2p/clboss/distinfo b/net-p2p/clboss/distinfo index 4caef010f51f..b610d1f54e9c 100644 --- a/net-p2p/clboss/distinfo +++ b/net-p2p/clboss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728188289 -SHA256 (ZmnSCPxj-clboss-v0.14.0_GH0.tar.gz) = 629216804fa9696ebdb90ae0f92ab3b96b90f25d10c0dab7fe1f36651a24de72 -SIZE (ZmnSCPxj-clboss-v0.14.0_GH0.tar.gz) = 2966085 +TIMESTAMP = 1733677893 +SHA256 (ZmnSCPxj-clboss-v0.14.1_GH0.tar.gz) = 49b248152ae74690eb9a3cc0c64b8b17552440858b3937f280145030cacf3fbf +SIZE (ZmnSCPxj-clboss-v0.14.1_GH0.tar.gz) = 2968495 diff --git a/net-p2p/clboss/files/patch-program_invocation_name.diff b/net-p2p/clboss/files/patch-program_invocation_name.diff deleted file mode 100644 index ce366ddda9aa..000000000000 --- a/net-p2p/clboss/files/patch-program_invocation_name.diff +++ /dev/null @@ -1,67 +0,0 @@ -diff --git i/Boss/Main.cpp w/Boss/Main.cpp -index ff9bf8f..41dc6d5 100644 ---- i/Boss/Main.cpp -+++ w/Boss/Main.cpp -@@ -17,12 +17,14 @@ - #include<unistd.h> - - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif - -+const char* g_argv0{"unknown"}; -+ - namespace Boss { - - class Main::Impl { - private: - std::istream& cin; - std::ostream& cout; -@@ -59,12 +61,13 @@ public: - , exit_code(0) - , is_version(false) - , is_help(false) - { - assert(argv.size() >= 1); - argv0 = argv[0]; -+ g_argv0 = argv0.c_str(); - if (argv.size() >= 2) { - auto argv1 = argv[1]; - if (argv1 == "--version" || argv1 == "-V") - is_version = true; - else if (argv1 == "--debugger") { - auto os = std::ostringstream(); -diff --git i/Util/BacktraceException.hpp w/Util/BacktraceException.hpp -index 313efb8..8d022e8 100644 ---- i/Util/BacktraceException.hpp -+++ w/Util/BacktraceException.hpp -@@ -6,12 +6,14 @@ - #include <iomanip> - #include <memory> - #include <sstream> - #include <vector> - #include <string.h> - -+extern const char* g_argv0; -+ - namespace Util { - - /** class Util::BacktraceException<E> - * - * @brief A wrapper for an exception E which additionally stores a - * backtrace when it is constructed. The backtrace formatting is -@@ -77,13 +79,13 @@ private: - // Unfortunately there is no simple way to get a high quality - // backtrace using in-process libraries. Instead for now we - // popen an addr2line process and use it's output. - std::string addr2line(void* addr) const { - char cmd[512]; - snprintf(cmd, sizeof(cmd), -- "addr2line -C -f -p -e %s %p", program_invocation_name, addr); -+ "addr2line -C -f -p -e %s %p", g_argv0, addr); - - std::array<char, 128> buffer; - std::string result; - std::unique_ptr<FILE, PcloseDeleter> pipe(popen(cmd, "r")); - - if (!pipe) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412090915.4B99FP6r035019>