Bug 259909 - security/openssh-portable: 8.8 GSSAPI patch
Summary: security/openssh-portable: 8.8 GSSAPI patch
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: Bryan Drewery
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-11-18 06:21 UTC by david
Modified: 2022-03-03 19:26 UTC (History)
1 user (show)

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

Attachments
Patch to unbreak GSSAPI (1.83 KB, text/plain)
2022-01-25 16:26 UTC, Rick Miller 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description david 2021-11-18 06:21:41 UTC 
Patch available at:
https://sources.debian.org/data/main/o/openssh/1:8.7p1-2/debian/patches/gssapi.patch

Applies cleanly to 8.8; I am using it now!
Comment 1 david 2021-11-18 06:27:35 UTC 
Oops, forgot to mention extra-patch-gssapi-sshconnect2.c is no longer needed; that is now done in the base patch!
Comment 2 Rick Miller 2022-01-25 16:26:02 UTC 
Created attachment 231316 [details]
Patch to unbreak GSSAPI

The GSSAPI patch for OpenSSH-portable 8.7p1 works on OpenSSH-portable 8.8p1. However, the distinfo portion of this patch should not be committed since upstream does not have a GSSAPI patch for 8.8p1 yet (https://sources.debian.org/data/main/o/openssh/)
Comment 3 Rick Miller 2022-01-25 16:31:15 UTC 
Applying the attached patch after cp'ing the GSSAPI patch in distfiles/ to the name expected by the Makefile resulted in the OpenSSH-portable package building. Resulting package was tested successfully. That being said, upstream still does not appear to have an official patch for this release yet. So the distinfo portion of the patch is superfluous since the patch cannot be retrieved from PATCHSITE.
Comment 4 Bryan Drewery freebsd_committer freebsd_triage 2022-03-03 19:26:14 UTC 
Thanks. I ported it forward to 8.9 too just now.
Comment 5 commit-hook freebsd_committer freebsd_triage 2022-03-03 19:26:25 UTC 
A commit in branch main references this bug:

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

commit ae66cffc19f357cbd51d5841c9b110a9ffd63e32
Author:     Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2022-03-03 18:27:34 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2022-03-03 19:25:36 +0000

    security/openssh-portable: Update to 8.9p1

    - Unbreak GSSAPI [1]
    - rc.d/openssh: Allow modifying host key generation [2]

    Changes: https://www.openssh.com/txt/release-8.9
    PR:             259909 [1]
    PR:             202169 [2]
    Submitted by:   Rick Miller [1]
    Submitted by:   Chad Jacob Milios [2]

 security/openssh-portable/Makefile                 |  8 ++---
 security/openssh-portable/distinfo                 |  8 +++--
 .../files/extra-patch-gssapi-auth2-gss.c (new)     | 19 +++++++++++
 .../files/extra-patch-gssapi-sshconnect2.c (gone)  | 12 -------
 security/openssh-portable/files/extra-patch-hpn    | 16 ++++-----
 .../openssh-portable/files/extra-patch-tcpwrappers | 12 +++----
 security/openssh-portable/files/openssh.in         | 39 +++++++++++++++-------
 .../files/patch-platform-tracing.c (gone)          | 25 --------------
 security/openssh-portable/files/patch-ssh-agent.c  | 22 ++++++------
 9 files changed, 80 insertions(+), 81 deletions(-)