From nobody Mon Sep 26 07:13:39 2022 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 4MbYrg5Qwbz4d8J1; Mon, 26 Sep 2022 07:13:39 +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 4MbYrg519Wz3Gg4; Mon, 26 Sep 2022 07:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664176419; 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=YTJgwwHU1lu5bd4ncPXkkqkjb5Mfz+JaVhCQNYVnYO4=; b=bSE0fbXALyfsbNs4Hk439mJ+2jgoRZ0lkXFo4E7xRRPHhRcs+87Siz/LLT5k8WtnXCgLQd E1hSZEYAp6ag9e+KhWeORsnRMJ2zcmWoMKVN0T6+7FpeGnNjDCpoy3DvJTflx5ilXCWl3p 05NZ5ZPdT+IPZD4+HGL0Y484wIN+wpbF06IFqGX6uMcOTUuVtIuqDR1X0OId4gtBJzIlQo mpHxxQ/hajduBE7si8IUokoux+5BMt5Hl+NB3w5Wpie1gJe6v1X8ORWPx7r10702B4veD/ CMmL2N6BqXsu2eQDg3nkXXZwPvRkq7Netlkl+E3sVo9LmkIcbQ4vWYjs3lO9Zw== 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 4MbYrg45SPzhf3; Mon, 26 Sep 2022 07:13:39 +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 28Q7DdPu023109; Mon, 26 Sep 2022 07:13:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28Q7DdZ8023108; Mon, 26 Sep 2022 07:13:39 GMT (envelope-from git) Date: Mon, 26 Sep 2022 07:13:39 GMT Message-Id: <202209260713.28Q7DdZ8023108@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: ba6fef6feed4 - main - net-p2p/cardano-node: Fix startup on systems without ipv6. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba6fef6feed41cf3a30a566f93bd58c2f01f2d4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664176419; 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=YTJgwwHU1lu5bd4ncPXkkqkjb5Mfz+JaVhCQNYVnYO4=; b=Wjid6Q7cjO8VwFZEJ9nBz3RVplygDMXBHODue/Whzu3/8AAZBS5z1Q9XMa4c1O/EebetJO y/kqGKsNmgh51AjHeUcKJ8hnT9MQc5P/CLefwQeuj8BHlTVe729YRITmciKQN4Vme1ce84 GexsvbhQgaktARgzF4S02CQHLJZO+JXNW4JYI9eYNc0TgAm8Note4fMY93tytnp+b4GnZk UcToUjMROVuonwmrhUp133TdwWqRVmsL3394aqF3VS3F0H0Wemim/VhHLYbMe9cQwLZ2aI ldEqgdazMF6PUAvY073E87i0iMUaNCthkUAVoVcLEBkTNhPNhdeIvgzslnZa+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664176419; a=rsa-sha256; cv=none; b=BwHSXzBZzebcIqhDcpsDUkytfGAP8XS5c+EqCnvEHU0Cx3JSeOndsSuTXSuqu98aaoPy7Q i7ezzcgzqMKVAG3u3KPxEV1u55HllJ4KVi8Y7MntS0SChbrxCfg1HH/4TeRAVu1FgThVtc pcOrIn/8MnI2eCPw8fKqzFRoS1RC3+g9foF/SJIwwOJRdzI9xFrtmyglmlI5PzLjNezq1o rLQKH7P/tciic9F8mGloV5eMZqN/1hQfxSGLeYFQouAgQza6bfnmH0zMj+cjhSAEO42Uhu G/QanBHvJ8Qnj4GN9sYEzWIIjRZUR9vPz+4eOCFRHh+ymhS7En1xIZWlu7ujTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba6fef6feed41cf3a30a566f93bd58c2f01f2d4a commit ba6fef6feed41cf3a30a566f93bd58c2f01f2d4a Author: Gleb Popov AuthorDate: 2022-09-22 16:09:03 +0000 Commit: Gleb Popov CommitDate: 2022-09-26 07:13:32 +0000 net-p2p/cardano-node: Fix startup on systems without ipv6. --- net-p2p/cardano-node/Makefile | 2 +- net-p2p/cardano-node/files/cardano_node.in | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-p2p/cardano-node/Makefile b/net-p2p/cardano-node/Makefile index 9b510a851e95..f6ff9d3c3fc1 100644 --- a/net-p2p/cardano-node/Makefile +++ b/net-p2p/cardano-node/Makefile @@ -1,6 +1,6 @@ PORTNAME= cardano-node PORTVERSION= 1.35.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MAINTAINER= arrowd@FreeBSD.org diff --git a/net-p2p/cardano-node/files/cardano_node.in b/net-p2p/cardano-node/files/cardano_node.in index 53d33cbebd45..74c7fb2d3890 100644 --- a/net-p2p/cardano-node/files/cardano_node.in +++ b/net-p2p/cardano-node/files/cardano_node.in @@ -135,7 +135,13 @@ jail_root="${_home}/jail" jail_topology="/topology_dir/`basename ${_topology}`" jail_config="/config_dir/`basename ${_config}`" jail_socket="/socket/`basename ${_socket}`" -jail_cmd="jail -c name=${name}_jail path=${jail_root} exec.jail_user=cardano exec.system_jail_user ip4=inherit ip6=inherit host=inherit" +jail_ip6_arg="" +sysctl -q kern.features.inet6 2> /dev/null +if [ "$?" = "0" ] +then + jail_ip6_arg="ip6=inherit" +fi +jail_cmd="jail -c name=${name}_jail path=${jail_root} exec.jail_user=cardano exec.system_jail_user ip4=inherit ${jail_ip6_arg} host=inherit" pidfile="/var/run/${name}.pid" flags="run +RTS ${_rts_flags} -RTS \