From nobody Mon Feb 27 18:07:11 2023 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 4PQT3h0nrDz3vQrv; Mon, 27 Feb 2023 18:07:12 +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 4PQT3g733Fz3w6P; Mon, 27 Feb 2023 18:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521232; 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=yUTqqDlJrAUyboJXTKm5BnCyLTZadARn0xz/uhd2Okk=; b=rABH4E15+MzE+1qm3XyIJVAZLh7UcdVKguNobW9zZscSpgldDoFZ9h1NDx9Z6ELC6AgEpr pStQLApA7BCMSxd4bcAugkAlL62yphf3NbN2R/UgbT1DPD4WVZ8AwdEPQ1i0UBM9kFPXqt 2DxgBrKkoB9skWycm6Q9yDIpjU+n7lEF2upSL7pWgOALENq06xn/qRQWK8QA7z8SgAXnTK 5CXfFu6COyjGQo1q3m7d231qCzSK5QAXHlaV/aV+GcYtx1WCHKMmHQX/G7uOUYXAUV8UTU bzyda4bZ1vcEt0qIkzZXnHrsn4MJE4q0HS68g2ESBzLijbuyHCWyZC7nkRCqsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521232; 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=yUTqqDlJrAUyboJXTKm5BnCyLTZadARn0xz/uhd2Okk=; b=YD7tEwgyZKNE2+QW4rnVfvWjxcFYghCEkC+WxDnIVTuanbqjR4ERtOpHdEbomJ24iR4yjM aGFfaW0QX2jF6raMNS3wMsT1MxhfGrUuqsg+B8C1lGDAMEd5CqWsAOhmhpbTmJ/UOUm3O0 VEDAof/wjo7B9yF0j+1JpQNNUvF9bkS0vNc6WliaatfNujnoDXqdBzb8Nrj8piUpQvw43g DD1QhnKSgyBxwqsCEkOVHpaUSEPamQ9HNjzU5TIvbZTUfiMARm/uXO3/V3MbFMfstV4HaS PfgmxBdFFWx1iUrW37pT0171gT47O4/PIBE1Qus//mUL4G3l+heAN8rk7utfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677521232; a=rsa-sha256; cv=none; b=PhcLn1azyhsYdBX9xehlWnpNz7Xf5EXYWxddJzUDIg/TSY+h4YnEiweyjvyN3JfdgNUjyy hOw5Gxm7/XXJevq6oKx4bcu51rFT2Rzf3FZG0zGrqkQFqh8ia2EMTlMWbBuuVi/XSXhEKt WbLAYMYu/ISDxll1m84An/1lLCI32U1hHNkbnYHD6VhSrDx8OsyGoKDKVVYV+fpLAWRGfj n13FI0s6m5X2un8aeG7WujU9vdV4mvfGFa1brG2t4/EvN+s5qeEC7X+fnYD6qP9WPgdILK 3z/jFHe1eaaxGRTqLT9sSwPhdkmWYYQc+rsQblRSpmjcR3LeM+4L7xioyQ7hSw== 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 4PQT3g68Bszbb7; Mon, 27 Feb 2023 18:07:11 +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 31RI7B0N017337; Mon, 27 Feb 2023 18:07:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RI7BpU017336; Mon, 27 Feb 2023 18:07:11 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:07:11 GMT Message-Id: <202302271807.31RI7BpU017336@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: 8b9129a53d2d - main - net-p2p/cardano-node: Fix rc script. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b9129a53d2dfa76b2e9879b464545e6f4abdeba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b9129a53d2dfa76b2e9879b464545e6f4abdeba commit 8b9129a53d2dfa76b2e9879b464545e6f4abdeba Author: Alexey Yushkin <636808@mail.ru> AuthorDate: 2023-02-27 18:05:34 +0000 Commit: Gleb Popov CommitDate: 2023-02-27 18:06:37 +0000 net-p2p/cardano-node: Fix rc script. Fixes: 3f205a5360370992e14e0eed73c25da63dd0f2f2 --- net-p2p/cardano-node/Makefile | 2 +- net-p2p/cardano-node/files/cardano_node.in | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net-p2p/cardano-node/Makefile b/net-p2p/cardano-node/Makefile index d78149335f8e..5e24956142f8 100644 --- a/net-p2p/cardano-node/Makefile +++ b/net-p2p/cardano-node/Makefile @@ -1,6 +1,6 @@ PORTNAME= cardano-node PORTVERSION= 1.35.5 -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= https://input-output-hk.github.io/cardano-haskell-packages/package/:chap CATEGORIES= net-p2p diff --git a/net-p2p/cardano-node/files/cardano_node.in b/net-p2p/cardano-node/files/cardano_node.in index 415f90817956..2dee0bfef0b7 100644 --- a/net-p2p/cardano-node/files/cardano_node.in +++ b/net-p2p/cardano-node/files/cardano_node.in @@ -131,6 +131,11 @@ eval "_host=\${${name}_host}" eval "_port=\${${name}_port}" eval "_flags=\${${name}_flags}" +jail_topology="/topology_dir/`basename ${_topology}`" +jail_config="/config_dir/`basename ${_config}`" +jail_socket="/socket/`basename ${_socket}`" +jail_args="name=${name}_jail exec.jail_user=cardano exec.system_jail_user host=inherit" + jail_root="${_home}/jail" jail_copy_resolv_conf=yes jail_copy_services=yes @@ -139,16 +144,11 @@ jail_mount_devfs=yes jail_ip_inherit=yes #TODO: daemon fails with "Network.Socket.bind: permission denied" without suid ;\ jail_prepare_inside_cmds="mkdir ./socket ;\ - ln -s ./${jail_socket} ${_socket} ;\ + ln -s ./jail/${jail_socket} ${_socket} ;\ chmod +s ./bin/cardano-node" jail_nullfs_mounts="${_db} ${jail_root}/db rw \ ${_home}/logs ${jail_root}/logs rw" -jail_topology="/topology_dir/`basename ${_topology}`" -jail_config="/config_dir/`basename ${_config}`" -jail_socket="/socket/`basename ${_socket}`" -jail_args="name=${name}_jail exec.jail_user=cardano exec.system_jail_user host=inherit" - pidfile="/var/run/${name}.pid" flags="run +RTS ${_rts_flags} -RTS \ --database-path /db \