ok (traditionally we would set REVISION to 0 not 1 when adding it, but it doesn't really matter)
On 2025/09/16 07:20, Mikolaj Kucharski wrote: > Hi. > > Ping. > > On Wed, Sep 10, 2025 at 08:02:33PM +0000, Mikolaj Kucharski wrote: > > Hi all. > > > > On Tue, Mar 25, 2025 at 10:03:41AM +0000, Mikolaj Kucharski wrote: > > > Hi. > > > > > > I am addressing two issues here. The setproctitle problem in the rc.d(8) > > > scripts I reported in the past > > > https://marc.info/?t=170056003800006&r=1&w=2 > > > and change for pexp works for me. > > > > > > Second is, salt needs tornado. > > > > > > > Kind reminder. This email thread went into different directions with few > > open questions. One of them was should more dependencies be added, but I > > would like to focus on one problem at a time and fix immediate issues > > which I faced over the months: > > > > - proc title issue > > - missing tornado dependency > > > > At this stage, I would like to fix only two above issues. > > > > Comments? > > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/salt/Makefile,v > diff -u -p -u -r1.189 Makefile > --- Makefile 20 Mar 2025 09:30:47 -0000 1.189 > +++ Makefile 10 Sep 2025 19:56:49 -0000 > @@ -17,6 +17,7 @@ COMMENT = remote execution and configur > > MODPY_DISTV = 3007.1 > DISTNAME = salt-${MODPY_DISTV} > +REVISION = 1 > > CATEGORIES = sysutils net devel > > @@ -39,12 +40,14 @@ BUILD_DEPENDS = textproc/py-yaml \ > # requirements/base.txt > RUN_DEPENDS = devel/py-looseversion \ > devel/py-jmespath \ > + devel/py-setproctitle \ > net/py-msgpack>=0.6.2v0 \ > security/py-cryptography \ > textproc/py-MarkupSafe \ > textproc/py-yaml \ > www/py-jinja2 \ > www/py-requests \ > + www/py-tornado \ > sysutils/py-distro>=1.5.0 \ > sysutils/py-packaging > > Index: pkg/salt_api.rc > =================================================================== > RCS file: /cvs/ports/sysutils/salt/pkg/salt_api.rc,v > diff -u -p -u -r1.3 salt_api.rc > --- pkg/salt_api.rc 11 Mar 2022 19:58:00 -0000 1.3 > +++ pkg/salt_api.rc 10 Sep 2025 19:56:49 -0000 > @@ -5,7 +5,7 @@ daemon_user="_salt" > > . /etc/rc.d/rc.subr > > -pexp="${MODPY_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" > +pexp="python${MODPY_VERSION}: ${MODPY_BIN} ${daemon}${daemon_flags:+ > ${daemon_flags}}.*" > rc_reload=NO > > rc_cmd $1 > Index: pkg/salt_master.rc > =================================================================== > RCS file: /cvs/ports/sysutils/salt/pkg/salt_master.rc,v > diff -u -p -u -r1.6 salt_master.rc > --- pkg/salt_master.rc 11 Mar 2022 19:58:00 -0000 1.6 > +++ pkg/salt_master.rc 10 Sep 2025 19:56:49 -0000 > @@ -4,7 +4,7 @@ daemon="${TRUEPREFIX}/bin/salt-master -d > > . /etc/rc.d/rc.subr > > -pexp="${MODPY_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" > +pexp="python${MODPY_VERSION}: ${MODPY_BIN} ${daemon}${daemon_flags:+ > ${daemon_flags}}.*" > rc_reload=NO > > rc_cmd $1 > Index: pkg/salt_minion.rc > =================================================================== > RCS file: /cvs/ports/sysutils/salt/pkg/salt_minion.rc,v > diff -u -p -u -r1.5 salt_minion.rc > --- pkg/salt_minion.rc 11 Mar 2022 19:58:00 -0000 1.5 > +++ pkg/salt_minion.rc 10 Sep 2025 19:56:49 -0000 > @@ -4,7 +4,7 @@ daemon="${TRUEPREFIX}/bin/salt-minion -d > > . /etc/rc.d/rc.subr > > -pexp="${MODPY_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" > +pexp="python${MODPY_VERSION}: ${MODPY_BIN} ${daemon}${daemon_flags:+ > ${daemon_flags}}.*" > rc_reload=NO > > rc_cmd $1 > Index: pkg/salt_proxy.rc > =================================================================== > RCS file: /cvs/ports/sysutils/salt/pkg/salt_proxy.rc,v > diff -u -p -u -r1.3 salt_proxy.rc > --- pkg/salt_proxy.rc 11 Mar 2022 19:58:00 -0000 1.3 > +++ pkg/salt_proxy.rc 10 Sep 2025 19:56:49 -0000 > @@ -4,7 +4,7 @@ daemon="${TRUEPREFIX}/bin/salt-proxy -d" > > . /etc/rc.d/rc.subr > > -pexp="${MODPY_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" > +pexp="python${MODPY_VERSION}: ${MODPY_BIN} ${daemon}${daemon_flags:+ > ${daemon_flags}}.*" > rc_reload=NO > > rc_cmd $1 > Index: pkg/salt_syndic.rc > =================================================================== > RCS file: /cvs/ports/sysutils/salt/pkg/salt_syndic.rc,v > diff -u -p -u -r1.4 salt_syndic.rc > --- pkg/salt_syndic.rc 11 Mar 2022 19:58:00 -0000 1.4 > +++ pkg/salt_syndic.rc 10 Sep 2025 19:56:49 -0000 > @@ -5,7 +5,7 @@ daemon_flags="-u _salt" > > . /etc/rc.d/rc.subr > > -pexp="${MODPY_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}" > +pexp="python${MODPY_VERSION}: ${MODPY_BIN} ${daemon}${daemon_flags:+ > ${daemon_flags}}.*" > rc_reload=NO > > rc_cmd $1 > > -- > Regards, > Mikolaj >
