Bug 256230 - security/oidentd 2.5.1 released with FreeBSD 13+ fix
Summary: security/oidentd 2.5.1 released with FreeBSD 13+ fix
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: Kevin Bowling
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-05-28 23:56 UTC by Bryan Drewery
Modified: 2021-06-24 16:50 UTC (History)
5 users (show)

See Also:
bugzilla: maintainer-feedback? (oliver)
koobs: merge-quarterly+


Attachments
Patch for oidentd (1.55 KB, patch)
2021-05-31 19:20 UTC, Daniel Engberg
no flags Details | Diff
oidentd.conf.sample (214 bytes, patch)
2021-06-15 14:10 UTC, David M.
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Bryan Drewery freebsd_committer freebsd_triage 2021-05-28 23:56:42 UTC
https://github.com/janikrabe/oidentd/commit/cd763e5aebc7f84fff0acad792d3e2a9b0ecdccb

> FreeBSD 5 introduced the `xucred` struct for external users in commit
> c0511d3b58c985e17c0c23585ea7d16b6f52fe61 to avoid breaking user space
> applications when the `ucred` struct changes.
> 
> oidentd happened to still work after this commit because the EUID it
> reads was stored at the same location in both structures. This is no
> longer the case with FreeBSD 13.
> 
> This commit updates the freebsd5 module to use `xucred` instead of
> `ucred` as the expected return type for getcred calls.

This is the extent of 2.5.0 -> 2.5.1 so the whole release can come in.

A trivial s/2.5.0/2.5.1/ in the Makefile seems enough for me.
Comment 1 Daniel Engberg freebsd_committer freebsd_triage 2021-05-31 19:20:36 UTC
Created attachment 225425 [details]
Patch for oidentd

Modify Makefile to follow Porter's Handbook more closely
Define LICENSE_FILE
Switch to tar.xz release archive
Remove IPV6 option (it's 2021 not 1999)

Compile tested on FreeBSD 13.0-STABLE n245227-5ec4eb443e8 (amd64) (make, make check-plist)
Poudriere testport OK 12.2-RELEASE (amd64)
Poudriere testport OK 11.4-RELEASE (amd64)
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2021-06-15 07:26:52 UTC
Bryan,

Maintainer timeout, something you can have a look at?

Regards,
Daniel
Comment 3 David M. 2021-06-15 14:10:37 UTC
Created attachment 225828 [details]
oidentd.conf.sample

Updated default configuration file to hide root connections.
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-06-23 21:54:09 UTC
A commit in branch main references this bug:

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

commit 8e1bb18dacc94ace7f265dcbef1cd7efc372a803
Author:     Daniel Engberg <daniel.engberg.lists@pyret.net>
AuthorDate: 2021-06-23 21:50:47 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-06-23 21:53:39 +0000

    security/oidentd: Update to 2.5.1

    * FreeBSD 13+ fix
      (https://github.com/janikrabe/oidentd/commit/cd763e5aebc7f84fff0acad792d3e2a9b0ecdccb)
    * Modify Makefile to follow Porter's Handbook more closely
    * Define LICENSE_FILE
    * Switch to tar.xz release archive
    * Remove IPV6 option (it's 2021 not 1999)

    Changes https://github.com/janikrabe/oidentd/blob/v2.5.1/NEWS

    PR:             256230
    Approved by:    maintainer timeout

 security/oidentd/Makefile | 17 +++++------------
 security/oidentd/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 15 deletions(-)
Comment 5 Kevin Bowling freebsd_committer freebsd_triage 2021-06-23 21:58:53 UTC
(In reply to David M. from comment #3)
David please open a new PR with config changes.
Comment 6 Kevin Bowling freebsd_committer freebsd_triage 2021-06-23 21:59:16 UTC
Thanks for the patch!
Comment 7 Kubilay Kocak freebsd_committer freebsd_triage 2021-06-24 02:03:31 UTC
@Reporter is this broken on quarterly as well? If so, we should MFH
Comment 8 commit-hook freebsd_committer freebsd_triage 2021-06-24 16:48:20 UTC
A commit in branch 2021Q2 references this bug:

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

commit 7d1f8cf82032b2ed06fe20f5b0ac40a2673fd424
Author:     Daniel Engberg <daniel.engberg.lists@pyret.net>
AuthorDate: 2021-06-23 21:50:47 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-06-24 16:47:02 +0000

    security/oidentd: Update to 2.5.1

    * FreeBSD 13+ fix
      (https://github.com/janikrabe/oidentd/commit/cd763e5aebc7f84fff0acad792d3e2a9b0ecdccb)
    * Modify Makefile to follow Porter's Handbook more closely
    * Define LICENSE_FILE
    * Switch to tar.xz release archive
    * Remove IPV6 option (it's 2021 not 1999)

    Changes https://github.com/janikrabe/oidentd/blob/v2.5.1/NEWS

    PR:             256230
    Approved by:    maintainer timeout

    (cherry picked from commit 8e1bb18dacc94ace7f265dcbef1cd7efc372a803)

 security/oidentd/Makefile | 17 +++++------------
 security/oidentd/distinfo |  6 +++---
 2 files changed, 8 insertions(+), 15 deletions(-)