From nobody Wed Jul 27 14:27:23 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 4LtGMJ08JZz4XhYR; Wed, 27 Jul 2022 14:27:24 +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 4LtGMH6Yqvz3ht8; Wed, 27 Jul 2022 14:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932043; 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=tV34SH9bS+q25jiJxmBRAXZxuIH/y895xnzUYP+RDV8=; b=y0hFmGkDI3QxRH7Q8wpMDqpBSuJMCbKb8QsmlRik17o1rTUnp32ZAHvrxZxiNf5thRyOuk ZlyILtHIHUXbAUBjBZSP27wXnSBqa9BlxpIvBxrZYYZC945FjbO435HhAfzSV+0JLc7h2T j2aYtFKI914hHtVq44RU3e24kzUKxCZdY6BpInCXgUF2mUGv0vVjLVO1oDKR1yGJsyVnBM Z1mmGT3Ux/IumdReEZ8zt4EqBpCKM+uJIgVq8KqGANyiorLiAbI94iAISVMB4I/Chp6FaR C/gQ0NCNUCn/yNK8T6RFeh6Z966mP7GFF9Gho9S1AFLR+PrCpKvyUKBODvvHLA== 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 4LtGMH5fWXzKVG; Wed, 27 Jul 2022 14:27:23 +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 26RERN0o066240; Wed, 27 Jul 2022 14:27:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RERN7x066239; Wed, 27 Jul 2022 14:27:23 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:27:23 GMT Message-Id: <202207271427.26RERN7x066239@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a418a01b1f2a - main - sysutils/cbsd: use pkg-message to show message on remove 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a418a01b1f2af140f7cfc5b4c4dd7c57de9ff174 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932043; 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=tV34SH9bS+q25jiJxmBRAXZxuIH/y895xnzUYP+RDV8=; b=JfGqCOkYLFRV6LUqyFSIXkJ/duRJmQTZr54DeKaS4Mo1xWOp+K9loKY3VLJfvav8hMrqsP 4hrwZdmHct/9whMeN5luwLzO8pdphK5P2amz6J7hk2sBsUJvcDftze5A/DAoNCf9eRX7gg pJLzbGLi03epcTFhshWYogzOJs9Abo4840UXVjCfJHsn25JR9CsG/wJ6SoZAk4a8tG0gr0 TA/1Xn84QR19Vu2XrRiNSvazqhhSn2JxMq7Xz9/wSIMhbS366oEaQxSp8MShijywJdxU7N TfkKWtJowmB0Vp4FJyz7E7JkS46NobIE+sF8eMWxDyr3FUWvW2l2tZMUGC+oLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658932043; a=rsa-sha256; cv=none; b=m+4ukJ/lIz36xNQwhAv/5ti9kaid2mHtluTz5OrrbzBBzqG+a+QneeDa6kD+whu9QaB1oA b6GtbJ521jekiKDPhhHobc5NX8JayieQh0HxhhFtl2MGU0nm+B9G1ZJv53TX6Mm+jZaNpe KLxjWkiNIf389z1+aqIdnUulZkdkyOn0ENaiaj+OcPFbxk0Al1nYkkqYKLRqdoIxHqDRuR veq75OkAqdBYXW51NX1bulP8YN21XSCiTNFmaj9wCKV+XaQfVv/YoanSYAoson/KSklouP YcFsDm5yIj8EqK5Tm6Wd5h40XCZmKy8gHAk3SnWUyubeBMtRNP1gDeBGTwPHsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a418a01b1f2af140f7cfc5b4c4dd7c57de9ff174 commit a418a01b1f2af140f7cfc5b4c4dd7c57de9ff174 Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:18:56 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:27:13 +0000 sysutils/cbsd: use pkg-message to show message on remove --- sysutils/cbsd/Makefile | 3 ++- sysutils/cbsd/files/pkg-deinstall.in | 23 ----------------------- sysutils/cbsd/files/pkg-message.in | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 6702f996e007..bbf171e19dd0 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= cbsd DISTVERSION= 13.1.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -21,7 +22,7 @@ USE_RC_SUBR= cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \ cbsd-statsd-jail MAKE_JOBS_UNSAFE= yes -SUB_FILES= pkg-deinstall pkg-message +SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${PORTNAME} diff --git a/sysutils/cbsd/files/pkg-deinstall.in b/sysutils/cbsd/files/pkg-deinstall.in deleted file mode 100644 index 4bf3facc595b..000000000000 --- a/sysutils/cbsd/files/pkg-deinstall.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -case $2 in -POST-DEINSTALL) - echo - echo "The cbsd package has been deleted." - echo - echo "If you are *not* upgrading this package, you may want to" - echo "remove the following to complete the deinstallation process:" - echo - echo "1) Records in /etc/rc.conf" - echo - echo " cbsdrsyncd_enable=\"YES\"" - echo " cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\"" - echo " cbsdd_enable=\"YES\"" - echo " devfs_load_rulesets=\"YES\"" - echo " cbsd_workdir=\"\$workdir\"" - echo " rcshutdown_timeout=\"900\"" - echo " sshd_flags=\"-oPort=22222\"" - echo - echo "2) Remove %%LOCALBASE%%/etc/sudoers.d/cbsd_sudoers" - echo - ;; -esac diff --git a/sysutils/cbsd/files/pkg-message.in b/sysutils/cbsd/files/pkg-message.in index e1ddcadd7bf4..d78189ebe990 100644 --- a/sysutils/cbsd/files/pkg-message.in +++ b/sysutils/cbsd/files/pkg-message.in @@ -12,6 +12,28 @@ Where /path is the path to the cbsd workdir, e.g.: /usr/jails For upgrading an existing installation, run: cbsd initenv +EOM +}, +{ type: remove + message: <