Bug 223010

Summary: security/openssh-portable: align with base crypto/openssh
Product: Ports & Packages Reporter: Bernard Spil <brnrd>
Component: Individual Port(s)Assignee: Bryan Drewery <bdrewery>
Status: Closed FIXED    
Severity: Affects Only Me CC: emaste
Priority: --- Flags: bugzilla: maintainer-feedback? (bdrewery)
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
svn diff for security/openssh-portable none

Description Bernard Spil freebsd_committer 2017-10-14 18:52:27 UTC
Created attachment 187172 [details]
svn diff for security/openssh-portable

Updated patches with the changes to 7.5 in the base system.
Comment 1 Bryan Drewery freebsd_committer 2017-10-16 19:47:07 UTC
Index: security/openssh-portable/files/patch-ssh__config.5
What's going on with the naming here? The file is ssh_config.5 not ssh__config.5, nor is it ssh/config.5.
Comment 2 Bernard Spil freebsd_committer 2017-10-17 08:46:34 UTC
I only renamed patches that I touched. I believe the naming is correct.
Default is to convert `_' in filenames to `__'
and to convert `/' in path to '_'

Mk/Scripts/smart_makepatch.sh
> std_patch_filename() {
>    echo patch-$(echo ${raw_name} | sed -e 's|_|&&|g; s|/|_|g')
> }
Comment 3 Bryan Drewery freebsd_committer 2017-10-17 22:46:50 UTC
(In reply to Bernard Spil from comment #2)
> I only renamed patches that I touched. I believe the naming is correct.
> Default is to convert `_' in filenames to `__'
> and to convert `/' in path to '_'

Huh that sounds backwards... I see, I objected to that change in 
https://reviews.freebsd.org/D582; we had it replace / to __ for
9 years (r147554) before it was gratuitously changed in r371776.

> 
> Mk/Scripts/smart_makepatch.sh
> > std_patch_filename() {
> >    echo patch-$(echo ${raw_name} | sed -e 's|_|&&|g; s|/|_|g')
> > }
Comment 4 Bernard Spil freebsd_committer 2017-11-12 12:23:02 UTC
Hi Bryan,

I can revert the filename changes no problem. The other option would be to align to the new standard all at once (renaming patches irks some people too).

Let me know which way you want to go and I'll re-roll the patch.
Comment 5 Ed Maste freebsd_committer 2019-06-09 10:48:57 UTC
Ping?
Comment 6 commit-hook freebsd_committer 2020-11-16 22:26:13 UTC
A commit references this bug:

Author: bdrewery
Date: Mon Nov 16 22:25:29 UTC 2020
New revision: 555518
URL: https://svnweb.freebsd.org/changeset/ports/555518

Log:
  - Slightly reduce diff with base
  - No functional changes.

  PR:		223010
  Submitted by:	brnrd (earlier patch)

Changes:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/patch-auth2.c
  head/security/openssh-portable/files/patch-configure.ac
  head/security/openssh-portable/files/patch-serverloop.c
  head/security/openssh-portable/files/patch-ssh_config.5