From nobody Wed Dec 14 14:19:03 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 4NXHY3661fz4kjvw; Wed, 14 Dec 2022 14:19:03 +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 4NXHY35h9yz4YGM; Wed, 14 Dec 2022 14:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671027543; 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=4p9M81JkAUSoGfiFGirXgidfQ0fTC5BKqpY1M2CXnRo=; b=Pq4TwqlHW3dopIh7f6Wzay8JKh3gya1pdNRhkEt+WRGUKVjwlFe34e7nVydM/SMBqcu1++ w3srFW0V3oKHvWkJJ+e7qoZPaJaEBFNukDBMvStZisPpMIJqRSTLG4Lg3lDlFwqHluf2TF ZIUc2oeaBLA4SJQkfaGNzxRNaoB7Rnt0rOVWq9kqU3OapUJISeIXax3gePAU0ymyHWhtf/ 6JcAUEjO0FjOeU5pIfONrc82oxunus/UzyA4P/jEVGThsNFE4PL+FXYAdFy8YKyN25VMCt BEsU75o3xl3Knp3kw5vHOIZI++xopXxcT2+OrvdRFaMb8W26x00k1i3bfD73VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671027543; 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=4p9M81JkAUSoGfiFGirXgidfQ0fTC5BKqpY1M2CXnRo=; b=FWX1ZDpD3UWw9I5r+kUqIbfytJUoPWjtkQw7gHeLGpd+T07kwx0zncAPvr2D+ux5SSuwqp c0iLeivLSoP4xJcueg0an47jwNCG7CgfsY3jnE3KymfIVvK4NAbaC8Y82oX5q8jB6TnGxE HKGa6vVnngKTag8P1RU0h01JxDnoG2LZrEx/yzihhFNEvfv8upwuplngYSh8x1ezPVE1/x IfHT+dP0f9TWoRgklCXjH5G7tWZwDe6NgdvN163Jy61zaslaz2KYz0KoIAxEfJExrfMmLf oOsq5oMdzUmNxeltYYlu58bAXXwaVuzwf2FUq2cXcgQhq54Kc9yeonhPmo/CrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671027543; a=rsa-sha256; cv=none; b=I3TZqcbw+ywAk5ihFMVNWTVOyY4G3QzEa7vShkFSxkI1C+kdI8ixb2zDuXUfHvxJUvPDfT cNpROkr2limS+J7yxUSSFdENXcgDM6t12mxFD3HeZSk1NBxaHQ4ZoHq/4tc73+UCV9FQuR dzEJEe7NQiYo16v8gu03Uuuqb6uLfUrx9Vzd3jNzgV0N2dZu1/wco3fmA+VLe8LBgnclsf RhD7huHqyJaFEZiASl3rc52qjhtfwyICCtYvV7PS6/137NYWYssdNJywMKwcL8O99PZ9aW vulmWxBrxkRsjEXRzoFqDEkogMheclJvqKLCOqAB7uAGweVoWYGSrPk5cEg+kQ== 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 4NXHY34pGdzx4G; Wed, 14 Dec 2022 14:19:03 +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 2BEEJ3jS063330; Wed, 14 Dec 2022 14:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEEJ3gX063329; Wed, 14 Dec 2022 14:19:03 GMT (envelope-from git) Date: Wed, 14 Dec 2022 14:19:03 GMT Message-Id: <202212141419.2BEEJ3gX063329@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: b6471b43913d - main - devel/py-buildbot: 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: b6471b43913ddd7d12d07bc3bfa2c2ab3a4aac7b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6471b43913ddd7d12d07bc3bfa2c2ab3a4aac7b commit b6471b43913ddd7d12d07bc3bfa2c2ab3a4aac7b Author: Muhammad Moinur Rahman AuthorDate: 2022-12-14 14:08:22 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-12-14 14:18:51 +0000 devel/py-buildbot: Update version 3.5.0=>3.7.0 - Use the existing buildbot users and groups - Refactor the rc script to run as buildbot user and pointing the basedir to the home directory of buildbot user [1] PR: 248234 [1] Reported by: ari@ish.com.au [1] --- devel/py-buildbot/Makefile | 6 +++++- devel/py-buildbot/distinfo | 6 +++--- devel/py-buildbot/files/buildbot.in | 16 ++++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 82d27ac9be31..4c3d5c1fcd61 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -1,5 +1,5 @@ PORTNAME= buildbot -PORTVERSION= 3.5.0 +PORTVERSION= 3.7.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-www>0:devel/py-buildbot-www@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ @@ -36,6 +37,9 @@ USES= cpe python:3.5+ USE_PYTHON= autoplist concurrent distutils USE_RC_SUBR= buildbot +USERS= ${PORTNAME} +GROUPS= ${PORTNAME} + NO_ARCH= yes SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ PYTHON_VER=${PYTHON_VER} diff --git a/devel/py-buildbot/distinfo b/devel/py-buildbot/distinfo index ba27d1e3e8f5..505573d92226 100644 --- a/devel/py-buildbot/distinfo +++ b/devel/py-buildbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646763989 -SHA256 (buildbot-3.5.0.tar.gz) = c281877426a7e6a4e9d34b6836459af36d4481540cacf2be3965e8a857202034 -SIZE (buildbot-3.5.0.tar.gz) = 2450653 +TIMESTAMP = 1670858091 +SHA256 (buildbot-3.7.0.tar.gz) = 60c2d3d523fa35e9c9214553bebe7c195aed3571f0f9b85f80ca59bb7adebc6e +SIZE (buildbot-3.7.0.tar.gz) = 2459736 diff --git a/devel/py-buildbot/files/buildbot.in b/devel/py-buildbot/files/buildbot.in index c8b45f213cf3..74c4ebc47cba 100644 --- a/devel/py-buildbot/files/buildbot.in +++ b/devel/py-buildbot/files/buildbot.in @@ -7,20 +7,22 @@ # # Add the following lines to /etc/rc.conf to enable buildbot: # buildbot_enable (bool): Set to "NO" by default -# buildbot_basedir (path): Must be set to the path of the buildbot directory -# file, e.g. /var/www/buildbot -# buildbot_user (str): Set to "root" by default. Change it to run -# buildbot as a different user. +# buildbot_basedir (path): Set to "/var/www/buildbot" by default +# buildbot_user (str): Set to "buildbot" by default. . /etc/rc.subr export PATH=${PATH}:%%PREFIX%%/bin name="buildbot" +desc="Buildbot Master" rcvar=buildbot_enable command="%%PREFIX%%/bin/buildbot-%%PYTHON_VER%%" load_rc_config $name +: ${buildbot_user:="buildbot"} +: ${buildbot_basedir:="/var/db/buildbot"} + check_cmd="${name}_check" extra_commands="check reload" reload_cmd="${name}_reload" @@ -39,6 +41,12 @@ buildbot_check() buildbot_prestart() { + if [ ! -f "${buildbot_basedir}/${name}.tac" ]; then + su -m ${buildbot_user} -c "exec ${command} create-master ${buildbot_basedir}" + fi + if [ ! -f "${buildbot_basedir}/master.cfg" ]; then + install -o ${buildbot_user} -g ${buildbot_user} -m 750 ${buildbot_basedir}/master.cfg.sample ${buildbot_basedir}/master.cfg + fi rc_flags="start ${buildbot_basedir} ${rc_flags}" }