From nobody Mon Jun 30 16:28:50 2025 X-Original-To: dev-commits-ports-main@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 4bWBS34PL2z60fSF; Mon, 30 Jun 2025 16:28:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bWBS21zffz3mv6; Mon, 30 Jun 2025 16:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751300930; 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=8zdffJ0jftC6/dfwhS6ZJ17g2/Fpdal1mlOAnroDQAY=; b=ul3oxQA8j3bPWLFW5fdEN85w9Rteok56V/ON8DjcecOFoQyOg1yiMB8ICd5Fr7MAq95zwN YWIGRDZrq2fx7ocAedIMqM5//ofz5cerapGZi42HdlD9vMY5CkDq+GdRLgKfcVO5aTrGP+ 6FpAEawfxTL+x/5p+1QPsEAQqGQ77hbzTSE0f2M+qkKXMQ72qdZr2c7DYXzEwoTZGf+5fa lgp85QNjfnqQ2xqb+d5WoLfqG3ZRxab9KtH7+WzyUxOb3EypdsyEDgNVyGq0wZr4pKRt6W ktEe4kXuFWW0SeXmwt87JSD6BtRWkIQpoDpkY1QTQHcpmYd3d3ovv84n+9u2Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751300930; 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=8zdffJ0jftC6/dfwhS6ZJ17g2/Fpdal1mlOAnroDQAY=; b=gZQHI/cUQR1WFMW9CZjx6gQ8XZOKmOVPldvOCtKYN/SY8BMMfaZsXAfHeLuoUYv5oTi6mG Xap/LiarSDfjyqS/v+xzEcfEkMsqWpWsQHzSr5jFWxc87E5ME6gyJjjak0lsjXgbDifwmB HvMSxL4/6cRlIPihOPgPuwDTJ/px3w+kbFg7AbL6UMIAmAp1Fg6LhmbNKU43muCJ/d22vw oOcoJBIooXOzBExe6/diyAQ/Nz80ETSYBynyOLtr57F//s5c2EDukVCxob/CcjFst6EFRx x57ul80Wbz7aJKpgdky0xU+cqyi1bS1Wm1pxtWRuVpf43kPHc/95UB2J0ovgjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751300930; a=rsa-sha256; cv=none; b=ydzSd4lxPd9k0qnSDKBNMluwk7xEc2LfGFDFdfZvFrEkE1n0CkxkxTfNxA9ahq+yeern9C j0smDZYpSmsIwpmhPHjJFtZtzZCWRMLH5ThfxEDNgt8ciGwfX0ZMZZ05Qv2rGzNvZKsIBN OFU0lJi+qSoyPwA9Be2SfbruTaYdHv65acvISjRTaKtlu0ZxSe1fqkCLFYG1qZZqV4+zXM OW8xnzzEQ5RoLmSj8ZZtknUvR00yemvzGKbZI+cDml89Je7px4mVFPapBcKT7OCwr6lixO yUgYUoT0F8I/fDdBw1v7RiUqkoEdGEsh/RYkEnVDJNkYdSMcmwqsvv4lHRsTnw== 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 4bWBS21YbFz1BGf; Mon, 30 Jun 2025 16:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55UGSoMN009583; Mon, 30 Jun 2025 16:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UGSoZM009580; Mon, 30 Jun 2025 16:28:50 GMT (envelope-from git) Date: Mon, 30 Jun 2025 16:28:50 GMT Message-Id: <202506301628.55UGSoZM009580@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: 457e0da037c4 - main - devel/py-buildbot-worker: Update version 3.11.9=>4.3.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 457e0da037c467d4db25b0e47e60bf52a4bf0e03 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=457e0da037c467d4db25b0e47e60bf52a4bf0e03 commit 457e0da037c467d4db25b0e47e60bf52a4bf0e03 Author: Muhammad Moinur Rahman AuthorDate: 2025-06-30 15:12:46 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-06-30 16:11:42 +0000 devel/py-buildbot-worker: Update version 3.11.9=>4.3.0 - If the buildbot-worker rc(8) script is started after setting `rc_flags` in `rc.conf(5)`, the error "I wasn't expecting so many arguments" appears and buildbot-worker does not start, the cause is that buildbot-worker expect to have the parameters first and the working directory second, but currently it is the other way around.[1] - Fix rc script startup error at system startup while using profiles [2] Changelog: https://github.com/buildbot/buildbot/releases/tag/v4.3.0 Sponsored by: The FreeBSD Foundation PR: 285166 [1] , 285167 [2] Reported by: dtxdf [1] [2] --- devel/py-buildbot-worker/Makefile | 13 +++--- devel/py-buildbot-worker/distinfo | 6 +-- devel/py-buildbot-worker/files/buildbot-worker.in | 8 ++-- devel/py-buildbot-worker/files/patch-setup.py | 54 +++++++++++++++++++++++ 4 files changed, 66 insertions(+), 15 deletions(-) diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index 8fc5f667f575..040cd0ef29d7 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildbot-worker -DISTVERSION= 3.11.9 -PORTREVISION= 1 +DISTVERSION= 4.3.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +12,9 @@ WWW= https://buildbot.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=20.12.3:www/py-autobahn@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>0.6.0:devel/py-msgpack@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}twisted>=21.2.0:devel/py-twisted@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} USES= python @@ -27,8 +25,6 @@ NO_ARCH= yes SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \ PYTHON_VER=${PYTHON_VER} -BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot_worker - USERS= buildbot GROUPS= buildbot @@ -38,10 +34,11 @@ PLIST_FILES= share/man/man1/buildbot-worker.1.gz # XXX fixup plist. see: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056 fix-plist: - ${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST} + ${REINPLACE_CMD} -e '/^buildbot_worker/d' ${TMPPLIST} post-install: ${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${RM} -rf ${STAGEDIR}${PREFIX}/buildbot_worker do-test: ${MKDIR} ${WRKDIR}/tmp diff --git a/devel/py-buildbot-worker/distinfo b/devel/py-buildbot-worker/distinfo index c61f171813f3..0aa80374e85c 100644 --- a/devel/py-buildbot-worker/distinfo +++ b/devel/py-buildbot-worker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728972057 -SHA256 (buildbot_worker-3.11.9.tar.gz) = beccbfb63960b3f713f0219e8ce5a8d25f9efc604fc34dc04899729fd3f7e2b0 -SIZE (buildbot_worker-3.11.9.tar.gz) = 133480 +TIMESTAMP = 1751293161 +SHA256 (buildbot_worker-4.3.0.tar.gz) = 14f5e806c32ef9669e58a3398e9d53ca54fa9080cd6f04956fed1e251da9f4dc +SIZE (buildbot_worker-4.3.0.tar.gz) = 135399 diff --git a/devel/py-buildbot-worker/files/buildbot-worker.in b/devel/py-buildbot-worker/files/buildbot-worker.in index d9334140c7cf..18f80be2a626 100644 --- a/devel/py-buildbot-worker/files/buildbot-worker.in +++ b/devel/py-buildbot-worker/files/buildbot-worker.in @@ -95,7 +95,7 @@ procname="%%PYTHON_CMD%%" ;; esac echo "===> ${name} profile: ${profile}" - if $0 $1 ${profile}; then + if /usr/sbin/service buildbot-worker $1 ${profile}; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" @@ -114,17 +114,17 @@ buildbot_worker_prestart() 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}" + rc_flags="start ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_prestop() { - rc_flags="stop ${buildbot_worker_basedir} ${rc_flags}" + rc_flags="stop ${rc_flags} ${buildbot_worker_basedir}" } buildbot_worker_reload() { - rc_flags="${buildbot_worker_basedir} ${rc_flags}" + rc_flags="${rc_flags} ${buildbot_worker_basedir}" ${command} sighup ${rc_flags} } diff --git a/devel/py-buildbot-worker/files/patch-setup.py b/devel/py-buildbot-worker/files/patch-setup.py new file mode 100644 index 000000000000..d9aa0b88b9ae --- /dev/null +++ b/devel/py-buildbot-worker/files/patch-setup.py @@ -0,0 +1,54 @@ +--- setup.py.orig 2025-06-30 14:40:44 UTC ++++ setup.py +@@ -25,23 +25,30 @@ from setuptools.command.sdist import sdist + from setuptools import Command + from setuptools import setup + from setuptools.command.sdist import sdist ++try: ++ from setuptools.command.install_data import install_data ++except ImportError: ++ from distutils.command.install_data import install_data + + from buildbot_worker import version + + BUILDING_WHEEL = bool("bdist_wheel" in sys.argv) + + +-class our_install_data(Command): ++class our_install_data(install_data): + def initialize_options(self): ++ super().initialize_options() + self.install_dir = None + + def finalize_options(self): ++ super().finalize_options() + self.set_undefined_options( + 'install', + ('install_lib', 'install_dir'), + ) + + def run(self): ++ super().run() + # ensure there's a buildbot_worker/VERSION file + fn = os.path.join(self.install_dir, 'buildbot_worker', 'VERSION') + with open(fn, 'w') as f: +@@ -121,8 +128,6 @@ setup_args = { + 'entry_points': { + 'console_scripts': [ + 'buildbot-worker=buildbot_worker.scripts.runner:run', +- # this will also be shipped on non windows :-( +- 'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine', + ] + }, + } +@@ -143,10 +148,6 @@ setup_args['install_requires'] += [ + 'autobahn >= 0.16.0', + 'msgpack >= 0.6.0', + ] +- +-# buildbot_worker_windows_service needs pywin32 +-if sys.platform == "win32": +- setup_args['install_requires'].append('pywin32') + + # Unit test hard dependencies. + test_deps = [