From nobody Wed Oct 9 10:05:54 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XNpS31JgYz5YLHv; Wed, 09 Oct 2024 10:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNpS30MNkz4L55; Wed, 9 Oct 2024 10:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728468355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMo5jTHcTbjTWad6v716O/eOW8531Yv5CyPINuStEoo=; b=adVMisuhfgBmYPVr3DFCgosgX+fPb+qrKt5yXXAwK8WSX8nFDLyAceV/aaF26dx6ijuD9l MUokikxzlePtQL41A0yHVSEv/c1jIfxrTWuZCH0ZVjcpNUGrmrJqJ4EuMnFIA3Bq4Cx8Zc 9UpVv8pB6zG4XJ7s4+q13HAeGop1ch3hjAcZjQ3J7bMFFiUcd3WSZLitVOpW7rpobLQ//U YWdHzokmbapTDv3vN3SZQXNUCKo7kFn7eUgKuV8IVD3uEW7IYrcefRuL3vISQz2X2I5nzt JDJRJTSjjlJA8L2p0GBuTBzG2ihTRBk0V2zFG6vbmDOOWpSbiay9L/8hqP0ByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728468355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iMo5jTHcTbjTWad6v716O/eOW8531Yv5CyPINuStEoo=; b=CbN24UyMkKieQIfT6ZPgKZJ2aY0XlTwpvHVVusou7ylJB9MuaQrLuCkSqwwGgmitXrj9fK fHoLiGa6AHfC4FNny4GAwGY30fhbdujjsN4+8ay69Cl/hoXGDtNKmBJJpMnVyuvbG5QxHx BYtB1gXjuLt/nnyoYefn2OapVmzSCR7wAQlR4TKKPs/Gbfzy9E7tXJb2hPsrDgZSQS0mPM SVOf9n9lNMDo6CIwb0sf31KhA5WJ9hHnP0AergiV0IQ/YXa2HcrYyJUuiCfbe7HAiNuiRP Thg5ke1CmiAxHSRE2AB0r6sMgDwm7CsPJtCtKkHV14pzpn4JEamZawxWx2K30A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728468355; a=rsa-sha256; cv=none; b=sTsQsmuG3u92B/JRbZCZfnJ7c7xR8+5gJWL4Aenn7SNgPJwP0P1xzr4P7LMXKEu5hP/Emb 2Ixo0q7Dxj6Y3jCJ9Sdb0Q2+DqBPLRPtE8F4aYJ1vt56tM/S3cS2B9HaKYBiNDOO+E0DSX vDZxAlQ2dNW9b10BCgjCW14SyXzWDFI2YxjsRihxsUbxQCph7aWzMJJp0GBk027lZ2YIC6 MT6K68eBN4KbiJYJI4A9dWF7aV12A0e8CU1g5RfWj7guY6n9h2Rl/770ZK1VTAaV5EbFrF XUMZgatZra7MoC6wdkC5MnRBAiFQEtfEhp+oJfBPCjnJHE08P3hReR/W1Q2WSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XNpS26mLqz18Zv; Wed, 9 Oct 2024 10:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499A5ssd003401; Wed, 9 Oct 2024 10:05:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499A5sbC003398; Wed, 9 Oct 2024 10:05:54 GMT (envelope-from git) Date: Wed, 9 Oct 2024 10:05:54 GMT Message-Id: <202410091005.499A5sbC003398@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vasil Dimov Subject: git: 7541fc802d65 - main - net-p2p/clboss: upgrade from 0.13.3 to 0.14.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7541fc802d650f310fa0770d60b9edbfdb91ad04 Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7541fc802d650f310fa0770d60b9edbfdb91ad04 commit 7541fc802d650f310fa0770d60b9edbfdb91ad04 Author: Vasil Dimov AuthorDate: 2024-10-09 10:04:58 +0000 Commit: Vasil Dimov CommitDate: 2024-10-09 10:05:40 +0000 net-p2p/clboss: upgrade from 0.13.3 to 0.14.0 --- net-p2p/clboss/Makefile | 10 +++- net-p2p/clboss/distinfo | 6 +- .../files/patch-program_invocation_name.diff | 67 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/net-p2p/clboss/Makefile b/net-p2p/clboss/Makefile index 54902737255d..4291aa5b39c1 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.13.3 +DISTVERSION= 0.14.0 # and uncomment the following two lines (use for example -gf8d8348c where f8d8348c is a commit hash) #DISTVERSION= 0 #DISTVERSIONSUFFIX= -g0673c50e7 @@ -28,7 +28,10 @@ USES= autoreconf \ pkgconfig \ sqlite:3 +PATCH_STRIP= -p1 + CXXFLAGS+= -Wno-deprecated-declarations +LDFLAGS+= -lexecinfo GNU_CONFIGURE= yes @@ -38,4 +41,9 @@ GH_ACCOUNT= ZmnSCPxj SUB_FILES= pkg-message PLIST_FILES= bin/clboss +post-patch: + echo "#pragma once" > ${WRKSRC}/commit_hash.h + echo "#define GIT_COMMIT_HASH \"d5955419e3bea3f0414affc4a4994043abc0a726\"" >> ${WRKSRC}/commit_hash.h + echo "#define GIT_DESCRIBE \"v0.14.0-0-gd595541-dirty\"" >> ${WRKSRC}/commit_hash.h + .include diff --git a/net-p2p/clboss/distinfo b/net-p2p/clboss/distinfo index d0ea4ae8ed9c..4caef010f51f 100644 --- a/net-p2p/clboss/distinfo +++ b/net-p2p/clboss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725363351 -SHA256 (ZmnSCPxj-clboss-v0.13.3_GH0.tar.gz) = 9b19cc3d6f5b444605df0a904481e87b686b14f155ce947061f815d35f59294a -SIZE (ZmnSCPxj-clboss-v0.13.3_GH0.tar.gz) = 2948591 +TIMESTAMP = 1728188289 +SHA256 (ZmnSCPxj-clboss-v0.14.0_GH0.tar.gz) = 629216804fa9696ebdb90ae0f92ab3b96b90f25d10c0dab7fe1f36651a24de72 +SIZE (ZmnSCPxj-clboss-v0.14.0_GH0.tar.gz) = 2966085 diff --git a/net-p2p/clboss/files/patch-program_invocation_name.diff b/net-p2p/clboss/files/patch-program_invocation_name.diff new file mode 100644 index 000000000000..ce366ddda9aa --- /dev/null +++ b/net-p2p/clboss/files/patch-program_invocation_name.diff @@ -0,0 +1,67 @@ +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 + + #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 + #include + #include + #include + #include + ++extern const char* g_argv0; ++ + namespace Util { + + /** class Util::BacktraceException + * + * @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 buffer; + std::string result; + std::unique_ptr pipe(popen(cmd, "r")); + + if (!pipe) {