From owner-dev-commits-ports-branches@freebsd.org Mon Aug 16 06:01:13 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A4CD66D14B; Mon, 16 Aug 2021 06:01:13 +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 4Gp3ST0H9Xz3GRt; Mon, 16 Aug 2021 06:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E5F3C243E6; Mon, 16 Aug 2021 06:01:12 +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 17G61CoX023553; Mon, 16 Aug 2021 06:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17G61CXj023552; Mon, 16 Aug 2021 06:01:12 GMT (envelope-from git) Date: Mon, 16 Aug 2021 06:01:12 GMT Message-Id: <202108160601.17G61CXj023552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 706575fed19d - 2021Q3 - sysutils/cbsd: Fix jail profiles MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 706575fed19da227dba700bb50979624f73aa304 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2021 06:01:13 -0000 The branch 2021Q3 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=706575fed19da227dba700bb50979624f73aa304 commit 706575fed19da227dba700bb50979624f73aa304 Author: Kirill Ponomarev AuthorDate: 2021-08-16 06:00:11 +0000 Commit: Kirill Ponomarev CommitDate: 2021-08-16 06:01:09 +0000 sysutils/cbsd: Fix jail profiles Submitted by: maintainer (cherry picked from commit 54b578b414af1b4057b44329bb81c1ee20bf324b) --- sysutils/cbsd/Makefile | 1 + .../patch-etc_defaults_jail-freebsd-default.conf | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 81eb5d547f0d..7a73f88dc826 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= cbsd DISTVERSION= 13.0.12 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf b/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf new file mode 100644 index 000000000000..25b5b35a41fe --- /dev/null +++ b/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf @@ -0,0 +1,19 @@ +--- etc/defaults/jail-freebsd-default.conf.orig 2021-08-13 08:31:58 UTC ++++ etc/defaults/jail-freebsd-default.conf +@@ -40,15 +40,7 @@ systemskeldir="${workdir}/share/jail-system-default" + removejconf="1" # remove jconf after jcreate? 0 - don't remove + delpkglist="1" # remove pkglist file after jcreate? 0 - don't remove + +-# pkg bootstrap for new jail? +-case "${platform}" in +- DragonFly) +- pkg_bootstrap=0 +- ;; +- *) +- pkg_bootstrap="1" +- ;; +-esac ++pkg_bootstrap="1" + + # JAIL.CONF part + # default params whitch is overwrite zero-value for jcreate, jconstruct-tui, makejconf