From nobody Mon Jul 10 21:16:10 2023 X-Original-To: dev-commits-ports-main@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 4R0GyL2czTz4gsZx; Mon, 10 Jul 2023 21:16:10 +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 4R0GyL2C2Lz3Dlf; Mon, 10 Jul 2023 21:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689023770; 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=7qIu0mdA+j2e9O0m3A8qO4Iwyke41Xu4o+XSBa/aCv0=; b=d+GaYwQKl8I2fl6aDsDsYoNM0B526hc9DLQkj0yuCAPJqeQmyj8EAh53xadeehTbN3vBwp 4jLI/9wlLbqX59rku1e1Q+mZ0lS7Sx3XeJe766d5ghCMSv2Z26MKUPpTRn5oUblhuHJSQi 2/Lbnp2NgFFH/7+jEvunbBtaCxoJdYVXwE9kmgLtADYeFO5W57lzrpEVKBO1wGmpgQ+Dni DnWO2xJrxuy6jNV/FztLTF/W6cl4WsOK2LItFPkiXnjRhM/+QCkFAuoY4+g6sdPfPMJfbW m0cwB7ar3RSveC31Yj4LMaQBW4dEdtYTkfnkKzAmTdIeverhzGU44LWZXZxUiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689023770; 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=7qIu0mdA+j2e9O0m3A8qO4Iwyke41Xu4o+XSBa/aCv0=; b=uZMRBhpjYcPDIV35k+GNAFh6I9/3PF9o2pY0dDTcQlvpC647V7lLvMFLC9BFOrc5+Exi6G Rm+15TRSprWRe8JQUaHQBMtW2L9MPkwy+vHkv7i9/vY2Zd71GHlppMLbGlsDTVtTa+810n yuTFxaYxM8SJtrvyBY3Aqxh4Gpz+kWN+JTrSVxbGdX0wE7PYNCaxqeER9SUr8nojZpXMC6 /u/AG1+Bd+1CUjcyIhyaO+l04qxkqd/VfZbauEG5yzMBGy58EAfuP8Yh3AlfEB9ZTDSNxH 9KOMb0rfwu4CRR0Z+qp/hxgIvbfXXS92frd9w7WgFJoPqcIDrGoj6SmV+W1O1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689023770; a=rsa-sha256; cv=none; b=oEUsuo4ok9QWahhCmqo2f6ApcTJs9eHBGzUzdqaK0sd57g1tB28/JPGWeOGAbuTllC0RlZ tH/n/PbR8h/9LEPirmE81+nOwWWQBEa5w2JTsQ4ZSq7iAOddInwBtXAQwERL+hfwrbxYVM w6ztYA0X3GRI19jeMVNsQX2tf/ggGhnF5oZ5B9A7dqFfQd4jvP3WbI1KbBvAekGoWdf8F1 TXydzjKh7uTvA1CWSpjt8wYWBEpfQiXVYXLWw3E/i7msNz1kyV0bvTmEOPbaBMacMMc1fT yh6Jfp2MZtA9t1QcTSEdoV6C7J3O/ol/ouvE2wKSgh8UTjphao6Yyeu4vIfRtw== 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 4R0GyL1GMczyvM; Mon, 10 Jul 2023 21:16:10 +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 36ALGAdx034763; Mon, 10 Jul 2023 21:16:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ALGA7V034762; Mon, 10 Jul 2023 21:16:10 GMT (envelope-from git) Date: Mon, 10 Jul 2023 21:16:10 GMT Message-Id: <202307102116.36ALGA7V034762@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: 1d3175f02263 - main - comms/ebusd: update to 23.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d3175f022639e45f7884e1950cf86ee3e17cac6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d3175f022639e45f7884e1950cf86ee3e17cac6 commit 1d3175f022639e45f7884e1950cf86ee3e17cac6 Author: Oleksii Samorukov AuthorDate: 2023-07-10 21:13:34 +0000 Commit: Oleksii Samorukov CommitDate: 2023-07-10 21:15:53 +0000 comms/ebusd: update to 23.2 ChangeLog: https://github.com/john30/ebusd/blob/master/ChangeLog.md --- comms/ebusd/Makefile | 2 +- comms/ebusd/distinfo | 6 +++--- comms/ebusd/files/patch-configure.ac | 8 ++++---- comms/ebusd/files/patch-src_ebusd_main.cpp | 6 +++--- comms/ebusd/files/patch-src_tools_ebusctl.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile index a96f465a8457..bb001ba1c09c 100644 --- a/comms/ebusd/Makefile +++ b/comms/ebusd/Makefile @@ -1,5 +1,5 @@ PORTNAME= ebusd -PORTVERSION= 23.1 +PORTVERSION= 23.2 CATEGORIES= comms MAINTAINER= samm@FreeBSD.org diff --git a/comms/ebusd/distinfo b/comms/ebusd/distinfo index 616d92cd8ec1..efc416bc0441 100644 --- a/comms/ebusd/distinfo +++ b/comms/ebusd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685978814 -SHA256 (john30-ebusd-23.1_GH0.tar.gz) = 179743c967cc5e0fcbe8a884d57edec2dc387d7ff6a35298d4ee0e1781be7f6f -SIZE (john30-ebusd-23.1_GH0.tar.gz) = 563842 +TIMESTAMP = 1689021891 +SHA256 (john30-ebusd-23.2_GH0.tar.gz) = 133ec8f44c446e31cc73b1777af5045a228ee20e0024b626c5fbb947f6a31952 +SIZE (john30-ebusd-23.2_GH0.tar.gz) = 568811 diff --git a/comms/ebusd/files/patch-configure.ac b/comms/ebusd/files/patch-configure.ac index ffea9bbbceba..4df45b0b98d6 100644 --- a/comms/ebusd/files/patch-configure.ac +++ b/comms/ebusd/files/patch-configure.ac @@ -1,11 +1,11 @@ ---- configure.ac.orig 2022-05-08 17:50:35 UTC +--- configure.ac.orig 2023-07-08 13:54:20 UTC +++ configure.ac -@@ -133,7 +133,7 @@ AM_COND_IF([CONTRIB], [AC_CONFIG_FILES([ +@@ -154,7 +154,7 @@ AM_COND_IF([KNX], [AC_CONFIG_FILES([ ])]) AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, LOCALSTATEDIR "/run/" PACKAGE ".pid", [The path and name of the PID file.]) -AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE ".log", [The path and name of the log file.]) +AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE "/" PACKAGE ".log", [The path and name of the log file.]) AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) - AC_DEFINE(PACKAGE_VERSION_MAJOR, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])]", [The major version of the package.]) - AC_DEFINE(PACKAGE_VERSION_MINOR, "[m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])]", [The minor version of the package.]) + AC_DEFINE(PACKAGE_VERSION_MAJOR, [m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])], [The major version of the package.]) + AC_DEFINE(PACKAGE_VERSION_MINOR, [m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])], [The minor version of the package.]) diff --git a/comms/ebusd/files/patch-src_ebusd_main.cpp b/comms/ebusd/files/patch-src_ebusd_main.cpp index c451ab1188d9..c4cf8070d4f3 100644 --- a/comms/ebusd/files/patch-src_ebusd_main.cpp +++ b/comms/ebusd/files/patch-src_ebusd_main.cpp @@ -1,8 +1,8 @@ ---- src/ebusd/main.cpp.orig 2022-07-12 12:56:35 UTC +--- src/ebusd/main.cpp.orig 2023-07-08 13:54:20 UTC +++ src/ebusd/main.cpp -@@ -34,6 +34,9 @@ - #include "lib/utils/log.h" +@@ -36,6 +36,9 @@ #include "lib/utils/httpclient.h" + #include "ebusd/scan.h" +#ifdef __FreeBSD__ +extern char **environ; diff --git a/comms/ebusd/files/patch-src_tools_ebusctl.cpp b/comms/ebusd/files/patch-src_tools_ebusctl.cpp index dcffdadcaf90..786c114c35fa 100644 --- a/comms/ebusd/files/patch-src_tools_ebusctl.cpp +++ b/comms/ebusd/files/patch-src_tools_ebusctl.cpp @@ -1,6 +1,6 @@ ---- src/tools/ebusctl.cpp.orig 2022-07-12 13:01:34 UTC +--- src/tools/ebusctl.cpp.orig 2023-07-08 13:54:20 UTC +++ src/tools/ebusctl.cpp -@@ -147,7 +147,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste +@@ -153,7 +153,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste time_t now; time(&now); time_t endTime = now + timeout;