From nobody Wed Jan 3 05:28:16 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 4T4dXx5wMBz54hKV; Wed, 3 Jan 2024 05:28:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4dXx0hXbz3qnN; Wed, 3 Jan 2024 05:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704259697; 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=dc9kt9TnaPRAkRe2GqrMjz8Y2mhgdWqgHgs/u+eX6FM=; b=rLdpYENL1+zlsPgkixx2wwcgd7dpLi2S6cJSX4oa/FiMhPVsLrvu+91s1EQE7RBHTJg5sz IUyUCW7x+zmfB8ZVapg1AL2ZHldg5kC0bm+c2pwT+7r4JXXOYfMCAK1JztVyzbhtPBNcSN HMI57hqmAB1QiuqVqtsyfQoS8o00AXMMBlB5eU+i0vktObZPYtpFyH3pDfx3ybtx8oU0+r t0i7AQCfyz0ovMxT+Clfq3+1v6ixjfEOSsK/XMj+1j9EsyenTWLl9bJ1K52IOgBNKowQXs zliA/Uj8myugUS8SqtWZFRmMu+c4NeuQoA1pU5D3z8RscJmUrcvwY/PiH7XEmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704259697; 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=dc9kt9TnaPRAkRe2GqrMjz8Y2mhgdWqgHgs/u+eX6FM=; b=lhzHzMY1Q+Y2heU0fz7v2opUpo1+BfUaYNccP9wvENHlUsWA/XScAmfNsoi341BVII1DVG DeaRbABfSIW+9qmAZHI1KoSlramBNvgO7eY8LLC6PXYuU0182Vllnqwz//2IQXxO6gU9/U bP2qx6TDiuzopN/Cc/QMh3hMUcPiOTtKISK4dHnKiho1ZV3PdvGpPPJjtcTekFJo/pP2GD +/WY4Jpz9L1KSGOvep1pA31Fv7my3p/jj07fxJh9i3gXgQfuUIDlA+wc80wzGT1ADkUt7v uzo0BaFF00q4kfCiENDnlWx8QEMOKVl1i61XSAzp6aC79jcIVbMySrcccRTg1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704259697; a=rsa-sha256; cv=none; b=JmF7t9DS4Iy6T9nyRXdw/P9geQqHvk4MIZN3VQCqo74lvUitJ7FSs5kzuEBMPY4J2E1W+i Sk7iAQ966xeHB8C/HDrlB2Yy1Ct8S/I8f/sH2D5jTIDTkzsGWiIK+21RRiPIFoCCAjPUSz 2Ou4dSKICfmQZfJ41qyiWm+hrF8VM8POtW5Z+zjASG2pLTbYF13yYQGypcYPK9BX6Esu1X 5pI6U3WtdyiH2d2dp224RGfBKfkYLL+omr72C5PQC0xTJxmEaLG/I9g4qNhYMZlrxqHJs0 3rKnj2/cafTDGF06G2YyaEInCEBYATfg+flvXa1mkMz7ufJi/8WwYbNiSdR1Wg== 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 4T4dXw6X5hzY7p; Wed, 3 Jan 2024 05:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4035SGEp094352; Wed, 3 Jan 2024 05:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4035SG4v094349; Wed, 3 Jan 2024 05:28:16 GMT (envelope-from git) Date: Wed, 3 Jan 2024 05:28:16 GMT Message-Id: <202401030528.4035SG4v094349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6963b8318f56 - main - devel/kyua: Switch to FreeBSD upstream 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6963b8318f5627ab2ffdeb25478cc7bae7a97f40 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6963b8318f5627ab2ffdeb25478cc7bae7a97f40 commit 6963b8318f5627ab2ffdeb25478cc7bae7a97f40 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-03 05:23:52 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-03 05:27:55 +0000 devel/kyua: Switch to FreeBSD upstream - As per the recent discussion switch to the FreeBSD upstream - For now resetting MAINTAINER to myself with ci@ hat on but anyone from ci@ feel free to commit - Pet port{clippy|fmt} PR: 276071 Approved by: jmmv (private mail) --- devel/kyua/Makefile | 11 ++++++----- devel/kyua/distinfo | 6 +++--- devel/kyua/files/patch-utils_datetime.cpp | 20 -------------------- devel/kyua/files/patch-utils_datetime__test.cpp | 19 ------------------- devel/kyua/pkg-plist | 1 + 5 files changed, 10 insertions(+), 47 deletions(-) diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile index bab190f32c06..b3f3b1439b3e 100644 --- a/devel/kyua/Makefile +++ b/devel/kyua/Makefile @@ -1,10 +1,8 @@ PORTNAME= kyua -PORTVERSION= 0.13 -PORTREVISION= 6 +DISTVERSION= 0.13 +PORTREVISION= 7 PORTEPOCH= 3 CATEGORIES= devel -MASTER_SITES= https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \ - LOCAL/jmmv MAINTAINER= jmmv@FreeBSD.org COMMENT= Testing framework for infrastructure software @@ -14,7 +12,10 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= liblutok.so:devel/lutok -USES= lua pkgconfig sqlite +USES= autoreconf lua pkgconfig sqlite +USE_GITHUB= yes +GH_ACCOUNT= freebsd +GH_TAGNAME= 84c8ec8 USE_CXXSTD= gnu++11 GNU_CONFIGURE= yes diff --git a/devel/kyua/distinfo b/devel/kyua/distinfo index 26a95a748056..798778e849c3 100644 --- a/devel/kyua/distinfo +++ b/devel/kyua/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472222340 -SHA256 (kyua-0.13.tar.gz) = db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 -SIZE (kyua-0.13.tar.gz) = 663776 +TIMESTAMP = 1704159547 +SHA256 (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 3d80730f9bc3ad23fa79cba5fe418c4b0ffc0326101ecce18441c1d18e26198f +SIZE (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 508997 diff --git a/devel/kyua/files/patch-utils_datetime.cpp b/devel/kyua/files/patch-utils_datetime.cpp deleted file mode 100644 index 899a1b9ca619..000000000000 --- a/devel/kyua/files/patch-utils_datetime.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- utils/datetime.cpp.orig 2016-08-26 10:09:37 UTC -+++ utils/datetime.cpp -@@ -590,11 +590,12 @@ datetime::timestamp::operator-=(const da - datetime::delta - datetime::timestamp::operator-(const datetime::timestamp& other) const - { -- if ((*this) < other) { -- throw std::runtime_error( -- F("Cannot subtract %s from %s as it would result in a negative " -- "datetime::delta, which are not supported") % other % (*this)); -- } -+ /* -+ * XXX-BD: gettimeofday isn't necessicarily monotonic so return the -+ * smallest non-zero delta if time went backwards. -+ */ -+ if ((*this) < other) -+ return datetime::delta::from_microseconds(1); - return datetime::delta::from_microseconds(to_microseconds() - - other.to_microseconds()); - } diff --git a/devel/kyua/files/patch-utils_datetime__test.cpp b/devel/kyua/files/patch-utils_datetime__test.cpp deleted file mode 100644 index cf6af9b370f5..000000000000 --- a/devel/kyua/files/patch-utils_datetime__test.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- utils/datetime_test.cpp.orig 2016-08-26 10:09:37 UTC -+++ utils/datetime_test.cpp -@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio - ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1); - ATF_REQUIRE_EQ(datetime::delta(99, 999988), ts3 - ts2); - -- ATF_REQUIRE_THROW_RE( -- std::runtime_error, -- "Cannot subtract 1291970850123456us from 1291970750123468us " -- ".*negative datetime::delta.*not supported", -- ts2 - ts3); -+ /* -+ * NOTE (ngie): behavior change for -+ * https://github.com/jmmv/kyua/issues/155 . -+ */ -+ ATF_REQUIRE_EQ(datetime::delta::from_microseconds(1), ts2 - ts3); - } - - diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist index 08ff3dcb0c01..4f1b389980d6 100644 --- a/devel/kyua/pkg-plist +++ b/devel/kyua/pkg-plist @@ -160,6 +160,7 @@ man/man5/kyuafile.5.gz %%TEST%%tests/kyua/utils/process/child_test %%TEST%%tests/kyua/utils/process/deadline_killer_test %%TEST%%tests/kyua/utils/process/exceptions_test +%%TEST%%tests/kyua/utils/process/executor_pid_test %%TEST%%tests/kyua/utils/process/executor_test %%TEST%%tests/kyua/utils/process/fdstream_test %%TEST%%tests/kyua/utils/process/helpers