From nobody Tue Jul 12 13:17:06 2022 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 583551CFBF10; Tue, 12 Jul 2022 13:17:06 +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 4Lj1W62453z40XC; Tue, 12 Jul 2022 13:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657631826; 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=f5LUVuY+3gK4oomKaKTMze8/UE1pBEHvi3/3Xx+BuRQ=; b=vhsupLkq/O7lHKUl04Vq7jebCqZGwYFEyuCGbsdDhq52NAEDaMJCAbacyaGy+r110+Fqt3 d57VQY36Qq61K0IV457Y2TnnbUDpKWL3lPFAc7HWtYBXlZLtTyjuBPkja2LQQF8Kf9R9rc xPkUgBrSFxDJCxRmrsSXZE1aGEJkp2gR6hdSpr/2WUw9jiEKsxkDhHZN88HC56YWX1PGdq 8DuSq3vFqykiNleO6hUR1JabQ3YIoFqJytsAdA/weQenBhU4v6r93CHDgpNLk4lCkjkiZM D5sDuYUXFHsESIIHaUstDOTuMBXcCo/izO9LTCbnfjeUHG4GQF8tzhg8KNqBTg== 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 4Lj1W617dlzlTF; Tue, 12 Jul 2022 13:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26CDH6sg015109; Tue, 12 Jul 2022 13:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CDH6A1015108; Tue, 12 Jul 2022 13:17:06 GMT (envelope-from git) Date: Tue, 12 Jul 2022 13:17:06 GMT Message-Id: <202207121317.26CDH6A1015108@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: 1435927b3e9c - main - comms/ebusd: update to the 22.3 version 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: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1435927b3e9c6cfcdf11967bf5d410098a390855 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657631826; 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=f5LUVuY+3gK4oomKaKTMze8/UE1pBEHvi3/3Xx+BuRQ=; b=VLLaVMSaPY/nPa0LTPxDIrC1RYvh1E3X1an6hadWF+iDHq/hzCfl/MU5VkWRCHW6qA9EWP 9ojqMrQGqEbK7AWch5e2wR0Ojs9NAhuxqwioZf3bFfH5GLvxNrsYYvLo6PSK+ocSEqsk22 Q8B407Rh61JQ6+Wavxx9eOEAwhV2F0JQxd2xY8kjA7f0PNhgWMkPfCiPlsacvI3sDa6kEn 22GXw4tDpNyXxE4qcdxgRhUIgY98TKMInPZSnz8sdP8pqlIynf4KSLX8CQFSlou13BFwzP Ts/1GQv7UOfL/iouVmrAhWmo4ebnb6zyWZvsr6Eu4Lq82X8XcR1FYt5eiXTcMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657631826; a=rsa-sha256; cv=none; b=AeOGCgyLz+wkwLVjgii5D2a6VBZTIJ/v3uXjGquRRt7s2vgs6v17xwqq0018zZZYwbOFj+ o9GLa48a48qUJ+iFkAcGhIFocbmUBXImi39Q9LcGw1LXsHCnALDV9ByDf75syQq9T0KFtw Q4mwSPGHaJfez9J16JwIxvv0aU4oncPFBqnVr2t4Xv9mx3xih0tUcgQ50DxyLF49EPU/pL yk5VTdW8tOFlrCoZYTFE2ZSMgbce8H77iX5Jzl/MVNIurD6JlxYnef0qG5hWFarbstLwA+ 1Dz1ZH9FM/tu8thcMMKxmVfNB6/AVmEXceHm/JGkqoIxIaHjFBDGKIZXzH2CaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1435927b3e9c6cfcdf11967bf5d410098a390855 commit 1435927b3e9c6cfcdf11967bf5d410098a390855 Author: Oleksii Samorukov AuthorDate: 2022-07-12 13:12:55 +0000 Commit: Oleksii Samorukov CommitDate: 2022-07-12 13:16:51 +0000 comms/ebusd: update to the 22.3 version - Update to the latest version - Fix FreeBSD build --- comms/ebusd/Makefile | 3 ++- comms/ebusd/distinfo | 6 +++--- comms/ebusd/files/patch-configure.ac | 8 ++++---- comms/ebusd/files/patch-src_ebusd_main.cpp | 12 ++++++++++++ comms/ebusd/files/patch-src_tools_ebusctl.cpp | 16 ++++++++++++++++ 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile index a70d55ea157d..060ebd06b06c 100644 --- a/comms/ebusd/Makefile +++ b/comms/ebusd/Makefile @@ -1,5 +1,5 @@ PORTNAME= ebusd -PORTVERSION= 21.3 +PORTVERSION= 22.3 DISTVERSIONPREFIX= v CATEGORIES= comms @@ -25,6 +25,7 @@ LOGDIR= /var/log/${PORTNAME} RUNDIR= /var/run/${PORTNAME} CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ebusfeed PLIST_SUB= USER=${USERS} GROUP=${GROUPS} \ LOGDIR=${LOGDIR} \ diff --git a/comms/ebusd/distinfo b/comms/ebusd/distinfo index 0d9400cb12ef..387b6d7f353f 100644 --- a/comms/ebusd/distinfo +++ b/comms/ebusd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637778910 -SHA256 (john30-ebusd-v21.3_GH0.tar.gz) = 251bdbac3d400001bb6b39701e5ae9ac1fdbc1ec65ce688def5cc6b79e8d927d -SIZE (john30-ebusd-v21.3_GH0.tar.gz) = 501795 +TIMESTAMP = 1657630258 +SHA256 (john30-ebusd-v22.3_GH0.tar.gz) = 7b9b8297c76670617bd25d3bb66f4a887188b8d9a4980a27b5e2f172448e0134 +SIZE (john30-ebusd-v22.3_GH0.tar.gz) = 532334 diff --git a/comms/ebusd/files/patch-configure.ac b/comms/ebusd/files/patch-configure.ac index 1ccde321b677..ffea9bbbceba 100644 --- a/comms/ebusd/files/patch-configure.ac +++ b/comms/ebusd/files/patch-configure.ac @@ -1,11 +1,11 @@ ---- configure.ac.orig 2018-12-26 15:38:15 UTC +--- configure.ac.orig 2022-05-08 17:50:35 UTC +++ configure.ac -@@ -118,7 +119,7 @@ AM_COND_IF([CONTRIB], [AC_CONFIG_FILES([ +@@ -133,7 +133,7 @@ AM_COND_IF([CONTRIB], [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(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision 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 new file mode 100644 index 000000000000..c451ab1188d9 --- /dev/null +++ b/comms/ebusd/files/patch-src_ebusd_main.cpp @@ -0,0 +1,12 @@ +--- src/ebusd/main.cpp.orig 2022-07-12 12:56:35 UTC ++++ src/ebusd/main.cpp +@@ -34,6 +34,9 @@ + #include "lib/utils/log.h" + #include "lib/utils/httpclient.h" + ++#ifdef __FreeBSD__ ++extern char **environ; ++#endif + + /** the version string of the program. */ + const char *argp_program_version = "" PACKAGE_STRING "." REVISION ""; diff --git a/comms/ebusd/files/patch-src_tools_ebusctl.cpp b/comms/ebusd/files/patch-src_tools_ebusctl.cpp new file mode 100644 index 000000000000..dcffdadcaf90 --- /dev/null +++ b/comms/ebusd/files/patch-src_tools_ebusctl.cpp @@ -0,0 +1,16 @@ +--- src/tools/ebusctl.cpp.orig 2022-07-12 13:01:34 UTC ++++ src/tools/ebusctl.cpp +@@ -147,7 +147,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste + time_t now; + time(&now); + time_t endTime = now + timeout; ++ + #ifdef HAVE_PPOLL ++ ++#ifndef POLLRDHUP ++# define POLLRDHUP 0 ++#endif ++ + int nfds = 2; + struct pollfd fds[nfds]; +