Bug 282021 - sysutils/s6: some notification-fd values are mistakenly invalid on FreeBSD (regression)
Summary: sysutils/s6: some notification-fd values are mistakenly invalid on FreeBSD (r...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Robert Clausecker
URL:
Keywords:
Depends on: 283100
Blocks:
  Show dependency treegraph
 
Reported: 2024-10-12 04:20 UTC by Saj Goonatilleke
Modified: 2024-12-10 09:21 UTC (History)
3 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Saj Goonatilleke 2024-10-12 04:20:12 UTC
Hello,

#279116 bumped sysutils/s6 from 2.11.3.2 to 2.12.0.4.  Unfortunately, this pulled in a new upstream bug that manifests on FreeBSD but not on (most?) other contemporary Unices -- and so it slipped through the cracks.  Briefly, some notification-fd values that were valid in s6 2.11.3.2 became invalid in 2.12.0.4 by mistake.  Users with an impacted configuration would observe a complete failure of their supervision trees.

More details can be found in the upstream bug report.
https://skarnet.org/lists/supervision/3171.html

----
# cat log/notification-fd 
6
# cat log/run
#!/bin/sh
exec s6-log -d 6 n2 s16384 t ./data
----

The configuration above reproduces the problem on s6 2.12.0.4 for me.

This problem was addressed in the latest respective releases of s6 and skalibs.  Upstream cut releases earlier this week.

If you would prefer to backport a minimal patch, I think this should do it:
https://git.skarnet.org/cgi-bin/cgit.cgi/skalibs/commit/?id=a7973043c92dc0f9d083e600142a47ce6dd1c9f6

(This is technically a bug in devel/skalibs, though I figured any interested users would search for sysutils/s6 in bugzilla.)

Many thanks.
Comment 1 jyoung15 2024-12-02 15:57:57 UTC
In addition to the previously mentioned bug, there is also a bug when using a lock-fd file that affects version 2.12.0.4.

The commit/patch is listed here:
https://git.skarnet.org/cgi-bin/cgit.cgi/s6/commit/?id=2ff7dfc857e7362d14522ca176e983ec2d6a15e7

This is fixed in the current s6 release (v2.13.1.0).
Comment 2 crest 2024-12-04 12:56:02 UTC
The skaware port updates in PR #283100 should resolve this.
Comment 3 Robert Clausecker freebsd_committer freebsd_triage 2024-12-09 10:09:42 UTC
Will be fixed when I commit the patch in bug #283100.
Comment 4 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:07:52 UTC
A commit in branch main references this bug:

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

commit 67a5a85b3e6717e1cf14cca34998bddeda4c1860
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 17:58:27 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 08:51:36 +0000

    sysutils/s6-rc: Update to version 0.5.5.0

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4

 sysutils/s6-rc/Makefile  | 16 ++++++++--------
 sysutils/s6-rc/distinfo  |  6 +++---
 sysutils/s6-rc/pkg-plist |  6 ++++--
 3 files changed, 15 insertions(+), 13 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:07:54 UTC
A commit in branch main references this bug:

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

commit 00547944126e6bbcea8cd6760586610c69170af5
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 15:42:55 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 08:51:35 +0000

    lang/execline: Update to version 2.9.6.1

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/execline/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4

 lang/execline/Makefile  | 6 +++---
 lang/execline/distinfo  | 6 +++---
 lang/execline/pkg-plist | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:07:55 UTC
A commit in branch main references this bug:

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

commit 5a326a79614f751c7bee8e43c107027f3d57bbae
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 16:33:16 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 08:51:36 +0000

    sysutils/s6: Update to version 2.13.1.0

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/s6/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4
    Reported by:    Saj Goonatilleke <sg@redu.cx>

 sysutils/s6/Makefile  |  8 ++++----
 sysutils/s6/distinfo  |  6 +++---
 sysutils/s6/pkg-plist | 16 ++++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:07:56 UTC
A commit in branch main references this bug:

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

commit d866f8bfec4b780b2fe0c9b1d4f90508b7c99862
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 14:48:53 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 08:51:35 +0000

    devel/skalibs: Update to version 2.14.3.0

    Upstream changes:

     - Important bugfixes for some of the software stack.
     - New function: fork_newpid(), forking a process in a new pid
       namespace on Linux (and returning -1 ENOSYS on other systems).
     - QoL: IOPAUSE_EXCEPT will now always trigger IOPAUSE_READ or
       IOPAUSE_WRITE as well, which means error handling before the IO
       primitive is now unnecessary.

    PR:             283100, 282021
    MFH:            2024Q4

 devel/skalibs/Makefile  | 2 +-
 devel/skalibs/distinfo  | 6 +++---
 devel/skalibs/pkg-plist | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:10:00 UTC
A commit in branch 2024Q4 references this bug:

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

commit f7ed942b22f39617c58a3e7a6855d14a7449eb4e
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 17:58:27 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:09:12 +0000

    sysutils/s6-rc: Update to version 0.5.5.0

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4
    (cherry picked from commit 67a5a85b3e6717e1cf14cca34998bddeda4c1860)

 sysutils/s6-rc/Makefile  | 16 ++++++++--------
 sysutils/s6-rc/distinfo  |  6 +++---
 sysutils/s6-rc/pkg-plist |  6 ++++--
 3 files changed, 15 insertions(+), 13 deletions(-)
Comment 9 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:10:01 UTC
A commit in branch 2024Q4 references this bug:

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

commit f4604bc95f5bb5ba55df45f14cf377f6240ad430
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 16:33:16 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:09:12 +0000

    sysutils/s6: Update to version 2.13.1.0

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/s6/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4
    Reported by:    Saj Goonatilleke <sg@redu.cx>

    (cherry picked from commit 5a326a79614f751c7bee8e43c107027f3d57bbae)

 sysutils/s6/Makefile  |  8 ++++----
 sysutils/s6/distinfo  |  6 +++---
 sysutils/s6/pkg-plist | 16 ++++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:10:02 UTC
A commit in branch 2024Q4 references this bug:

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

commit 234be95b762489b14d702c4a90377a504c0f93b7
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 15:42:55 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:09:12 +0000

    lang/execline: Update to version 2.9.6.1

    Changelog: https://git.skarnet.org/cgi-bin/cgit.cgi/execline/plain/NEWS

    PR:             283100, 282021
    MFH:            2024Q4
    (cherry picked from commit 00547944126e6bbcea8cd6760586610c69170af5)

 lang/execline/Makefile  | 6 +++---
 lang/execline/distinfo  | 6 +++---
 lang/execline/pkg-plist | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2024-12-10 09:10:04 UTC
A commit in branch 2024Q4 references this bug:

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

commit 24d93475a168bb1d620e28d67852d7449d9c108d
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-12-03 14:48:53 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:09:11 +0000

    devel/skalibs: Update to version 2.14.3.0

    Upstream changes:

     - Important bugfixes for some of the software stack.
     - New function: fork_newpid(), forking a process in a new pid
       namespace on Linux (and returning -1 ENOSYS on other systems).
     - QoL: IOPAUSE_EXCEPT will now always trigger IOPAUSE_READ or
       IOPAUSE_WRITE as well, which means error handling before the IO
       primitive is now unnecessary.

    PR:             283100, 282021
    MFH:            2024Q4
    (cherry picked from commit d866f8bfec4b780b2fe0c9b1d4f90508b7c99862)

 devel/skalibs/Makefile  | 2 +-
 devel/skalibs/distinfo  | 6 +++---
 devel/skalibs/pkg-plist | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)
Comment 12 Robert Clausecker freebsd_committer freebsd_triage 2024-12-10 09:21:26 UTC
Tank you for your report.