From nobody Sun Jun 18 21:21:36 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 4Qkm6n10Z4z4fQT4; Sun, 18 Jun 2023 21:21:37 +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 4Qkm6n0VdVz465X; Sun, 18 Jun 2023 21:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687123297; 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=KqL1gWhD+gLxrwFqStPS/2nwqpazM3KQ6ZTF5fpANKY=; b=L6y26Hwda3OuslP4jM46XYnZPYP+eJYUr2ERJa7JXN06ewZpyXUHMhIQmLZSsLRJYMIC45 wBkseIq6loDkx8/qf06203Vx7BWAZ7RwogqEHAZa1zqE8tdzt7ZqcJOA9KGCmIAkXJSg2I mtQGdZgypLd27GJlGIu97YWa+Xp/ypcCRSmaQSLW9EPcceERnlngMQ5wWItPxIcmKrBAqe p/bJ586DPmWm4UPty4qFDZSbskjmsYYuiC7c9oiHMw4XENsY7hW3LV+QjgzGr6ZZ8Na5ud VF4Jrvk1L5O0dO6K1mmLq8/7ywPNkmc9NSJPuLyfecysib8qc0/kDHhSSM6weg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687123297; 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=KqL1gWhD+gLxrwFqStPS/2nwqpazM3KQ6ZTF5fpANKY=; b=QW+MzVvZLJOiVWjIOID68xsY+007ZVGI5GPIvS70v+h1aO7BEvn8xfg6XaV1ZLZCVKrgXU 2y/v+RPqBhE3KoT3v/Q1sJhbQxPqoLUx+hWSm/7nWPEqDIbaZFK9K6dyuRGQJqT76nPLBR daysLq70Tt7+LH2R7sbpg7+dlknFdGaCKVW1rnAv7M6T7Nb/L1qspfTsNu6exAFK8lIoCw abzcng6ovPn8pqa9g4hTuALZn8ugUjjKVzYWzf9zPYYQXgcepKgeuOARRbCMwvSMijmKqZ Cr84nevJB593vCnzG6l5Bm+T5jqIjFLCw8uGF3KG4NJtb6q7c3pDTeLAGv0kJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687123297; a=rsa-sha256; cv=none; b=d2xbb0t8fgJgFf/XiYD2G6Q6g5XgJxkcRYE9hbUh2a2opj6lRS51QIdvcneegZYKz1v+CI GXnpxEsj/7bd4xrZWYedzOQF3VbiP8rNhgfxsuxpMDZQj6lQhWIbwnxDAQJSgvu0nQt9LM j7K2zUfkExmU9NgWeiGz3FOVUK+a0mcCiW6ZK2N0RrB6xKqYcv/k0OltfSfczmzaLCDi76 RmxWzN/OA6noMVuw3C1/2+7TUsiGK+USV0Wmm23MyVBM6SckQH9cCSh96rgQ2vKKiRz1Aa 6gtsoDrUPxLt+tM2hfnFTbjaHJgTZTlxypd7GGV79PCZbeC68xZtoY4ctPSLgw== 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 4Qkm6m6hfDzrFd; Sun, 18 Jun 2023 21:21:36 +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 35ILLahH085367; Sun, 18 Jun 2023 21:21:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ILLas4085366; Sun, 18 Jun 2023 21:21:36 GMT (envelope-from git) Date: Sun, 18 Jun 2023 21:21:36 GMT Message-Id: <202306182121.35ILLas4085366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 25000d47a3a8 - main - devel/soft-serve: Update to 0.5.4 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25000d47a3a80095f1b559447e8ff480653602cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=25000d47a3a80095f1b559447e8ff480653602cd commit 25000d47a3a80095f1b559447e8ff480653602cd Author: Ashish SHUKLA AuthorDate: 2023-06-18 16:37:48 +0000 Commit: Ashish SHUKLA CommitDate: 2023-06-18 21:21:19 +0000 devel/soft-serve: Update to 0.5.4 - Update rc.d script to include migrate target - Add an UPDATING note for upgrade - Add a pkg-message for upgrade --- UPDATING | 37 ++++++++++++++++++++++++++++ devel/soft-serve/Makefile | 6 +++-- devel/soft-serve/distinfo | 14 +++++------ devel/soft-serve/files/pkg-message.in | 39 +++++++++++++++++++++++++++++ devel/soft-serve/files/soft-serve.in | 46 ++++++++++++++++++++++++++--------- 5 files changed, 121 insertions(+), 21 deletions(-) diff --git a/UPDATING b/UPDATING index dda87fb5202f..b8b56619cfd3 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,43 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230618 + AFFECTS: users of devel/soft-serve + AUTHOR: ashish@FreeBSD.org + + soft-serve no longer uses config repository for configuration. To migrate + configuration from 0.4.x to 0.5.x, please review the upgrade documentation at: + + https://github.com/charmbracelet/soft-serve/releases/tag/v0.5.0 + + The migration process has been incorporated in rc.d script's migrate command, + and can be performed using following instructions: + + 0. Please make sure to backup repository data + + 1. Stop existing process: + + # /usr/local/etc/rc.d/soft-serve stop + + 2. Run the rc.d script to migrate, e.g. + + # /usr/local/etc/rc.d/soft-serve migrate + INFO Setting SSH listen address... + INFO Copying SSH host key... + INFO Reading config repository... + INFO Setting server settings... + INFO Copying repos... + INFO Copying repo ports + INFO Copying readme from "config" to ".soft-serve" + INFO Setting repos metadata & collabs... + INFO Creating users & collabs... + INFO Creating user "ashish" + INFO Writing config... + INFO Done! + + Another variable is introduced in rc.d script, soft_serve_data_path, + indicating the path to data directory used by soft-serve. + 20230609: AFFECTS: users of security/sequoia AUTHOR: vishwin@FreeBSD.org diff --git a/devel/soft-serve/Makefile b/devel/soft-serve/Makefile index 078f8b4ef71c..36e05f378fa7 100644 --- a/devel/soft-serve/Makefile +++ b/devel/soft-serve/Makefile @@ -1,7 +1,6 @@ PORTNAME= soft-serve DISTVERSIONPREFIX= v -DISTVERSION= 0.4.7 -PORTREVISION= 1 +DISTVERSION= 0.5.4 CATEGORIES= devel MAINTAINER= ashish@FreeBSD.org @@ -19,16 +18,19 @@ GH_ACCOUNT= charmbracelet GO_MODULE= github.com/charmbracelet/soft-serve GO_TARGET= ./cmd/soft USE_RC_SUBR= soft-serve +SUB_FILES= pkg-message SUB_LIST+= CHOWN="${CHOWN}" \ CUT="${CUT}" \ DEFAULTHOST=0.0.0.0 \ DEFAULTKEY=.ssh/soft_serve_server_ed25519 \ DEFAULTPORT=23231 \ DEFAULTREPO=.repos \ + DEFAULTDATA=data \ DIRNAME="${DIRNAME}" \ GITUSER="${USERS}" \ MKDIR="${MKDIR}" \ PW="${PW}" \ + SU="${SU_CMD:[1]}" \ SETENV="${SETENV}" USERS= git GROUPS= git diff --git a/devel/soft-serve/distinfo b/devel/soft-serve/distinfo index c1313bf333a9..7bc18c7b1eac 100644 --- a/devel/soft-serve/distinfo +++ b/devel/soft-serve/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1680139619 -SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/v0.4.7.mod) = ef1fbfc5c6935a714359db87e5334032a3dc178ce33122ad8b81dd42fa31e594 -SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/v0.4.7.mod) = 3393 -SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/v0.4.7.zip) = 3b31183de65758c7c2a1b1066449227039b2d238cd728d7f51d8b962a5e8f733 -SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/v0.4.7.zip) = 98820 -SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/charmbracelet-soft-serve-v0.4.7_GH0.tar.gz) = d850f3560584a206bbe1d88ec2f92622743a216e6f1cde868a606acdcd4e1de9 -SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.4.7_GH0/charmbracelet-soft-serve-v0.4.7_GH0.tar.gz) = 67151 +TIMESTAMP = 1687104983 +SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/v0.5.4.mod) = 4f88d2ffd3eefb6df2f5e48f6d37ae880811701fc42fcdc71f3563ddeec5c1b7 +SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/v0.5.4.mod) = 3922 +SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/v0.5.4.zip) = cf4439453eaa997928f35007377caa57e8e755f0ac776050458b1b0d307019d2 +SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/v0.5.4.zip) = 160514 +SHA256 (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/charmbracelet-soft-serve-v0.5.4_GH0.tar.gz) = ac9365cfc171a09e68875503ad0518c7461f900d7267dbe92e3e686dcd985356 +SIZE (go/devel_soft-serve/charmbracelet-soft-serve-v0.5.4_GH0/charmbracelet-soft-serve-v0.5.4_GH0.tar.gz) = 103793 diff --git a/devel/soft-serve/files/pkg-message.in b/devel/soft-serve/files/pkg-message.in new file mode 100644 index 000000000000..a3e7eb32a5e1 --- /dev/null +++ b/devel/soft-serve/files/pkg-message.in @@ -0,0 +1,39 @@ +[ +{ type: upgrade + maximum_version: 0.5.0 + message: <