Bug 274453 - sysutils/cfengine: switch from 3.22.0 to 3.21.3 as default/latest
Summary: sysutils/cfengine: switch from 3.22.0 to 3.21.3 as default/latest
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Cy Schubert
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-10-13 15:24 UTC by Craig Comstock
Modified: 2023-10-14 00:20 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (cy)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Craig Comstock 2023-10-13 15:24:42 UTC
Currently I see 3.22.0 is the latest version in freebsd ports. This is a feature release and unmaintained with patches from our development work in master.

It would be more appropriate to follow our LTS versions which are well maintained. See https://cfengine.com/supported-versions/

Currently this would be 3.21.3 which we have just released.

Not sure how this would work, but maybe remove 3.22 and upgrade 3.21.2 to 3.21.3 here? https://cgit.freebsd.org/ports/tree/sysutils/cfengine321/distinfo

I see cfengine-devel tracks our master branch. Thanks for that!

https://cgit.freebsd.org/ports/commit/sysutils/cfengine-devel/Makefile?id=918d6e3cc0d0d9473af7770eeb3d736ef226f242
Comment 1 Craig Comstock 2023-10-13 15:28:36 UTC
I am new to freebsd contributions and couldn't see how to submit a patch just yet. I am working on a patch via github now.
Comment 2 Craig Comstock 2023-10-13 15:33:14 UTC
Here is a naive patch: https://github.com/craigcomstock/freebsd-ports/tree/cfengine-3.21.3

I suspect the pkg-plist might need adjusting possibly?
Comment 3 Cy Schubert freebsd_committer freebsd_triage 2023-10-13 17:48:49 UTC
How about a new cfengine-lts meta-port pinned to cfengine321?
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-10-13 19:59:39 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4222609aebc40b65f8a628e2c434e19dfcf38b89

commit 4222609aebc40b65f8a628e2c434e19dfcf38b89
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-10-13 19:48:44 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-10-13 19:58:36 +0000

    sysutils/cfengine*-lts: New ports tracking cfengine*-lts

    LTS support is documented at:
            https://cfengine.com/supported-versions/

    The sysutils/cfengine-lts and sysutils/cfengine-masterfiles-lts
    will track cfengine's LTS branch simliarly to devel/subversion-lts
    and devel/jenkins-lts tracking their respective upstream LTS
    branches. This port must only be updated in accordance to documentation
    at https://cfengine.com/supported-versions/.

    PR:             274453
    MFH:            2023Q4

 sysutils/Makefile                                | 2 ++
 sysutils/cfengine-lts/Makefile (new)             | 7 +++++++
 sysutils/cfengine-masterfiles-lts/Makefile (new) | 9 +++++++++
 3 files changed, 18 insertions(+)
Comment 5 Cy Schubert freebsd_committer freebsd_triage 2023-10-13 20:01:51 UTC
A switch of cfengine meta-port from 322 to 321 would require a PORTEPOCH bump. I prefer not to do that. In a similar vein to subversion-lts, jenkins-lts, and firefox-esr, cfengine-lts will make it clear that this port/package is long term support.
Comment 6 Craig Comstock 2023-10-13 21:47:07 UTC
Thanks Cy. Appreciate the quick response and commit!

Would it be possible going forward to make the cfengine meta port link to cfengine-lts? Like here maybe?

https://cgit.freebsd.org/ports/tree/sysutils/cfengine/Makefile

So something like


VERSIONS=		320 321 322 -lts
CFENGINE_VERSION?=	-lts

MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}

.include "${MASTERDIR}/Makefile"


Does that work and make sense?
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-10-13 22:03:04 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df04f6accbc6cd5a1e86c4ea6249b1c02308ad8e

commit df04f6accbc6cd5a1e86c4ea6249b1c02308ad8e
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-10-13 21:56:41 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-10-13 21:56:41 +0000

    sysutils/cfengine*-lts: Make these ports LTS ports for real

    PKGNAMESUFFIX was missing from the original commit.

    PR:             274453
    Fixes:          4222609aebc4
    MFH:            2023Q4

 sysutils/cfengine-lts/Makefile             | 1 +
 sysutils/cfengine-masterfiles-lts/Makefile | 1 +
 2 files changed, 2 insertions(+)
Comment 8 commit-hook freebsd_committer freebsd_triage 2023-10-14 00:18:31 UTC
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffe407b2400f45f8fb211e4693da495f4681259e

commit ffe407b2400f45f8fb211e4693da495f4681259e
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-10-13 21:56:41 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-10-13 23:54:34 +0000

    sysutils/cfengine*-lts: Make these ports LTS ports for real

    PKGNAMESUFFIX was missing from the original commit.

    PR:             274453
    Fixes:          4222609aebc4

    (cherry picked from commit df04f6accbc6cd5a1e86c4ea6249b1c02308ad8e)

 sysutils/cfengine-lts/Makefile             | 1 +
 sysutils/cfengine-masterfiles-lts/Makefile | 1 +
 2 files changed, 2 insertions(+)
Comment 9 commit-hook freebsd_committer freebsd_triage 2023-10-14 00:18:32 UTC
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7cb6a013047d17be08f2116207bd5679f01bcd84

commit 7cb6a013047d17be08f2116207bd5679f01bcd84
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-10-13 19:48:44 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-10-13 23:54:34 +0000

    sysutils/cfengine*-lts: New ports tracking cfengine*-lts

    LTS support is documented at:
            https://cfengine.com/supported-versions/

    The sysutils/cfengine-lts and sysutils/cfengine-masterfiles-lts
    will track cfengine's LTS branch simliarly to devel/subversion-lts
    and devel/jenkins-lts tracking their respective upstream LTS
    branches. This port must only be updated in accordance to documentation
    at https://cfengine.com/supported-versions/.

    PR:             274453

    (cherry picked from commit 4222609aebc40b65f8a628e2c434e19dfcf38b89)

 sysutils/Makefile                                | 2 ++
 sysutils/cfengine-lts/Makefile (new)             | 7 +++++++
 sysutils/cfengine-masterfiles-lts/Makefile (new) | 9 +++++++++
 3 files changed, 18 insertions(+)
Comment 10 Cy Schubert freebsd_committer freebsd_triage 2023-10-14 00:20:55 UTC
Fixed.