From nobody Wed Dec 14 14:19:04 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 4NXHY474rnz4kjqs; Wed, 14 Dec 2022 14:19:04 +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 4NXHY46gcBz4YDV; Wed, 14 Dec 2022 14:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671027544; 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=NACQjjRBXD5i0e15aCuX+5+JPc1i43YoOo2pEGsEqQs=; b=scDMbx6LrXrwPHIo8cR9lbPeYc+r1qwG6beZ1FKKh0u7vKoU2zPPkf4jiV0aFljwpoOgiv cy7nP0Ux/HYQTjVW9lVY9VY/569IV8d68L4xakn3Nwk6jMMsE/X4MYY3MjZpf1PrcDMldE iS6igCzzzfoFYzobrCm3mtL02pvm7gJF+y8wmwSx7MGlmVwyvlWMHtGczS25Gv/xdhyc2g T5yriwLiX8fAj26xsf6wcL6ixQ3uSSbgYS+St8hF9DC626SEmlPmD5zjtpzKSjlD+ammA2 0vWiI9p/gwUXOX6nBnYIvPzalTeLAhmW7Raamxuw3liWLnQ++nC89IaD/iciJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671027544; 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=NACQjjRBXD5i0e15aCuX+5+JPc1i43YoOo2pEGsEqQs=; b=fW2CIX3pNkq3I+ACl3kM48qwKhcRN9C8szeWvjL665c5OUcWygijEy1zTTRz6IDoI0Tv5I /UgOVkjYv9YJBW8ynuajCzCcrdzNWxSv/R8dxR+DFCkpVmH/Wf0Nx+f13yDvNQn2la1hpC R+d1Wd1cVUwIXB7jAUEoWkErnRMjV/9bac7dsoIPuWfFMf1thfsXXVuFNpzgjlCwCXtxQO LrTaV4k3ZCiFNascTia1dVOE/Rt73fUUM85JMnVBMWKSijK+6PY70WZjlSke2rbdmFYAII phssSlGbMlVV8KydBr3RDNyzE92Ol58ZlHUTBmH6AVuL2wOO7RsAXdpf7UF/QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671027544; a=rsa-sha256; cv=none; b=apAsgncd6cyzRGNszQGmo1/1HS8Mnf8O4tIeYdlP+kIRFnCMlfBxbu1zdYPL9nS7DdjRIA SwLVHuxNZlmrthFripUZSzr6J8r3e5orLiMgzQoDRH3sMNbMeKlrcjua96L+qpZJqVO6Hn OkVQWpyLQgj3jblM9VqVI5uiKaHb9Yx7SOHtGPjHrqu/3hiMnWjPC/0COd94s5i5qkZjwg TIEZaWhtkLNcRghFuQMCe2QoSOP2+51MJi77NrTRInt4EwERfcFCQKhc5/17SJe/seq8n6 gHnFp9X7JYYl+wP/zRSRp+pR4c5mP9+Y4f9sywYn5Y/Ipg8YNcr4tR3fUzz5DA== 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 4NXHY45nCnzwpr; Wed, 14 Dec 2022 14:19:04 +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 2BEEJ40B063356; Wed, 14 Dec 2022 14:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEEJ4wc063355; Wed, 14 Dec 2022 14:19:04 GMT (envelope-from git) Date: Wed, 14 Dec 2022 14:19:04 GMT Message-Id: <202212141419.2BEEJ4wc063355@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 0620448973d0 - main - devel/py-buildbot-worker: Update version 3.5.0=>3.7.0 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0620448973d04bd533a728538da3f8184c1e4ab1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0620448973d04bd533a728538da3f8184c1e4ab1 commit 0620448973d04bd533a728538da3f8184c1e4ab1 Author: Muhammad Moinur Rahman AuthorDate: 2022-12-14 14:11:20 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-12-14 14:18:51 +0000 devel/py-buildbot-worker: Update version 3.5.0=>3.7.0 - Use the existing buildbot users and groups - Refactor the rc script to use the existing users. Please be informed that buildbot_worker_{uid|gid} is no longer the recommended rcvar. If a different user needs to be used the rcvar should be updated with buildbot_worker_user. Currently this defaults to buildbot and buildbot_worker_basedir defaults to a subfolder named workers under the home directory of buildbot that is /var/db/buildbot [1] - Refactor the rc script to use the program as the command rather than using twistd as per upstream documentation PR: 248234 [1] Reported by: ari@ish.com.au [1] --- devel/py-buildbot-worker/Makefile | 3 +- devel/py-buildbot-worker/distinfo | 6 +- devel/py-buildbot-worker/files/buildbot-worker.in | 79 +++++++++++++---------- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index 0f699317ddd3..1aa458bb946d 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-worker -PORTVERSION= 3.5.0 -PORTREVISION= 2 +PORTVERSION= 3.7.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-buildbot-worker/distinfo b/devel/py-buildbot-worker/distinfo index b1448604213a..ae28e9f560b6 100644 --- a/devel/py-buildbot-worker/distinfo +++ b/devel/py-buildbot-worker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646763855 -SHA256 (buildbot-worker-3.5.0.tar.gz) = 1d91f74dd1f9761af77fa7afdb93b74a03cf35b88518c980a7d0c7c1c6ffd8c0 -SIZE (buildbot-worker-3.5.0.tar.gz) = 111349 +TIMESTAMP = 1670859600 +SHA256 (buildbot-worker-3.7.0.tar.gz) = 2dcf8536b7d72df7849c3a8d06cf51f7a8eda0510e086daf2d15862a2a7ff953 +SIZE (buildbot-worker-3.7.0.tar.gz) = 120972 diff --git a/devel/py-buildbot-worker/files/buildbot-worker.in b/devel/py-buildbot-worker/files/buildbot-worker.in index 6b19fbfb3455..4b6dd5c4a9e9 100644 --- a/devel/py-buildbot-worker/files/buildbot-worker.in +++ b/devel/py-buildbot-worker/files/buildbot-worker.in @@ -3,25 +3,19 @@ # PROVIDE: buildbot-worker # REQUIRE: LOGIN # KEYWORD: shutdown + # -# Add the following lines to /etc/rc.conf to run buildbot-worker: +# Add the following lines to /etc/rc.conf to enable buildbot-worker: # # buildbot_worker_enable (bool): Set to "YES" to enable buildbot-worker. -# Default: "NO" -# +# Default: "NO" # buildbot_worker_flags (flags): Set extra command flags here. See buildbot-worker(8) -# Default: Empty (""). -# -# buildbot_worker_uid (user): User to run buildbot-worker as. -# Default: "buildbot" -# -# buildbot_worker_gid (group): Group to run buildbot-worker as. -# Default: "buildbot" -# -# buildbot_worker_basedir (path): Location for buildbot-worker base directory -# Default: %%PREFIX%%/etc/buildbot-worker -# -# buildbot_worker_profiles (str): Define profiles names. Space-delimited. +# Default: Empty (""). +# buildbot_worker_user (user): User to run buildbot-worker as. +# Default: "buildbot" +# buildbot_worker_basedir (path): Location for buildbot-worker base directory +# Default: /usr/local/etc/buildbot-worker +# buildbot_worker_profiles (str): Define profiles names. Space-delimited. # Default: Empty ("") # # This rc.d script supports multiple "profiles". When profiles are @@ -32,33 +26,34 @@ # buildbot_worker_profiles="foo bar" # # buildbot_worker_foo_enable="YES" -# buildbot_worker_foo_basedir="/usr/home/foo/buildbot" -# buildbot_worker_foo_uid="foo" -# buildbot_worker_foo_gid="foo" +# buildbot_worker_foo_basedir="/var/db/buildbot/workers/foo" +# buildbot_worker_foo_user="foo" # # buildbot_worker_bar_enable="YES" -# buildbot_worker_bar_basedir="/usr/home/buildbot/" +# buildbot_worker_bar_basedir="/var/db/buildbot/workers/bar" . /etc/rc.subr export PATH=${PATH}:%%LOCALBASE%%/bin -name=buildbot_worker +name="buildbot_worker" desc="Buildbot Buildworker" rcvar=buildbot_worker_enable - +command="/usr/local/bin/buildbot-worker-3.9" load_rc_config ${name} # These are just the defaults, they might get overriden for a specific profile. eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" -eval ": \${${name}_uid:=\"buildbot\"}" -eval ": \${${name}_gid:=\"buildbot\"}" -eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}" +eval ": \${${name}_user:=\"buildbot\"}" +eval ": \${${name}_basedir:=\"/var/db/buildbot/workers\"}" + +reload_cmd="${name}_reload" +start_precmd="${name}_prestart" +stop_precmd="${name}_prestop" -command="%%PREFIX%%/bin/twistd-%%PYTHON_VER%%" -command_interpreter="%%PYTHON_CMD%%" pidfile="${buildbot_worker_basedir}/twistd.pid" +procname="%%PYTHON_CMD%%" # A specific profile is specified in the command if [ -n "$2" ]; then @@ -67,9 +62,8 @@ pidfile="${buildbot_worker_basedir}/twistd.pid" if [ -n "${buildbot_worker_profiles}" ]; then eval buildbot_worker_enable="\${buildbot_worker_${profile}_enable:-${buildbot_worker_enable}}" eval buildbot_worker_flags="\${buildbot_worker_${profile}_flags:-${buildbot_worker_flags}}" - eval buildbot_worker_uid="\${buildbot_worker_${profile}_uid:-${buildbot_worker_uid}}" - eval buildbot_worker_gid="\${buildbot_worker_${profile}_gid:-${buildbot_worker_gid}}" - eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}" + eval buildbot_worker_user="\${buildbot_worker_${profile}_user:-${buildbot_worker_user}}" + eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}/${profile}}" eval pidfile="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}/twistd.pid" else echo "$0: extra argument ignored" @@ -112,9 +106,26 @@ pidfile="${buildbot_worker_basedir}/twistd.pid" fi fi -# run_rc_command would send ${name}_flags as parameters to $command (daemon) -# This ensures they are actually passed to fcgiwrap instead. -actual_buildbot_worker_flags="${buildbot_worker_flags}" -buildbot_worker_flags="" -command_args="--uid=${buildbot_worker_uid} --gid=${buildbot_worker_gid} --pidfile=${pidfile} --python=${buildbot_worker_basedir}/buildbot.tac ${actual_buildbot_worker_flags}" +buildbot_worker_prestart() +{ + if [ ! -f "${buildbot_worker_basedir}/buildbot.tac" ]; then + echo "Worker is not configured." + echo "Run the following command to create a new worker:" + echo "su -m ${buildbot_worker_user} -c \"exec ${command} create-worker ${buildbot_worker_basedir} \"" + exit 1 + fi + rc_flags="start ${buildbot_worker_basedir} ${rc_flags}" +} + +buildbot_worker_prestop() +{ + rc_flags="stop ${buildbot_worker_basedir} ${rc_flags}" +} + +buildbot_worker_reload() +{ + rc_flags="${buildbot_worker_basedir} ${rc_flags}" + ${command} sighup ${rc_flags} +} + run_rc_command "$1"