Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssh: Restore "platforms any" to ssh-copy-id subport #26053

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

fhgwright
Copy link
Contributor

The "platforms any" line was inappropriately removed from the 'ssh-copy-id' subport by commit 11c25bb to get rid of a spurious lint warning. But "platforms any" is not the same as "platforms darwin", is not the default, and may be useful for non-Mac installs. The lint warning in this case is just a bug that should be ignored.

This only affects the 'ssh-copy-id' subport, and does not require a revbump.

TESTED:
The spurious lint warning is back as expected, but both ports build successfully on all platforms.

Description

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on
Mac OS X 10.4.11 8S165, PPC, Xcode 2.5 8M2558
Mac OS X 10.4.11 8S2167, i386, Xcode 2.5 8M2558
Mac OS X 10.5.8 9L31a, PPC, Xcode 3.1.4 9M2809
Mac OS X 10.5.8 9L31a, i386, Xcode 3.1.4 9M2809
Mac OS X 10.5.8 9L31a, x86_64, Xcode 3.1.4 9M2809
Mac OS X 10.5.8 9L31a, PPC (i386 Rosetta), Xcode 3.1.4 9M2809
Mac OS X 10.6.8 10K549, i386, Xcode 3.2.6 10M2518
Mac OS X 10.6.8 10K549, x86_64, Xcode 3.2.6 10M2518
Mac OS X 10.6.8 10K549, PPC (i386 Rosetta), Xcode 3.2.6 10M2518
Mac OS X 10.7.5 11G63, x86_64, Xcode 4.6.3 4H1503
OS X 10.8.5 12F2560, x86_64, Xcode 5.1.1 5B1008
OS X 10.9.5 13F1911, x86_64, Xcode 6.2 6C131e
OS X 10.10.5 14F2511, x86_64, Xcode 7.2 7C68
OS X 10.11.6 15G22010, x86_64, Xcode 8.1 8B62
macOS 10.12.6 16G2136, x86_64, Xcode 9.2 9C40b
macOS 10.13.6 17G14042, x86_64, Xcode 10.1 10B61
macOS 10.14.6 18G9323, x86_64, Xcode 11.3.1 11C505
macOS 10.15.7 19H15, x86_64, Xcode 12.4 12D4e
macOS 11.7.10 20G1427, x86_64, Xcode 13.2.1 13C100
macOS 11.7.10 20G1427, arm64, Xcode 13.2.1 13C100
macOS 12.7.6 21H1320, x86_64, Xcode 14.2 14C18
macOS 12.7.6 21H1320, arm64, Xcode 14.2 14C18
macOS 13.7 22H123, arm64, Xcode 15.2 15C500b
macOS 14.7 23H124, arm64, Xcode 16.0 16A242d
macOS 15.0 24A335, arm64, Xcode 16.0 16A242d
Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • [N/A] referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint --nitpick?
  • [NO] tried existing tests with sudo port test? *
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?
    * Tests require a special server setup.

The "platforms any" line was inappropriately removed from the
'ssh-copy-id' subport by commit 11c25bb to get rid of a spurious
lint warning.  But "platforms any" is not the same as "platforms
darwin", is not the default, and may be useful for non-Mac installs.
The lint warning in this case is just a bug that should be ignored.

This only affects the 'ssh-copy-id' subport, and does not require a
revbump.

TESTED:
The spurious lint warning is back as expected, but both ports build
successfully on all platforms.
@macportsbot
Copy link

Notifying maintainers:
@artkiver for port openssh.

@macportsbot macportsbot added type: bugfix maintainer: open Affects an openmaintainer port labels Oct 2, 2024
@artkiver
Copy link
Contributor

artkiver commented Oct 3, 2024

Good catch! That lint warning was a relatively recent change to port lint --nitpick and I guess it doesn't surprise me that attempting to ameliorate it maybe wasn't the wisest move.

@fhgwright
Copy link
Contributor Author

@artkiver

Good catch! That lint warning was a relatively recent change to port lint --nitpick and I guess it doesn't surprise me that attempting to ameliorate it maybe wasn't the wisest move.

Aside from the fact that the warning is bogus in general, it's weird that it only appears when linting the main port and not the subport, even though that line only appears in the subport.

BTW, is it intentional that the main port and subport have different maintainers?

If you approve, you probably need to say so explicitly to get this merged.

@reneeotten reneeotten merged commit 0e07223 into macports:master Oct 3, 2024
3 checks passed
@fhgwright fhgwright deleted the openssh branch October 3, 2024 21:53
@artkiver
Copy link
Contributor

@artkiver

Good catch! That lint warning was a relatively recent change to port lint --nitpick and I guess it doesn't surprise me that attempting to ameliorate it maybe wasn't the wisest move.

Aside from the fact that the warning is bogus in general, it's weird that it only appears when linting the main port and not the subport, even though that line only appears in the subport.

BTW, is it intentional that the main port and subport have different maintainers?

If you approve, you probably need to say so explicitly to get this merged.

Yeah, I decided to ignore the warning with my PR on LibreSSl 4.0.0 just now too, maybe I am being too paranoid?

Regarding the maintainer differences, I don't think that's intentional? The main OpenSSH Portfile portion was just openmaintainer for a while, but since I found myself submitting various update PRs (along with other OpenBSD related projects I have been trying to keep up to date downstream) I decided to add myself along with openmaintainer; the subport maintainer/ssh-copy-id I think was already there and I wasn't involved with MacPorts when OpenSSH and ssh-copy-id were subdivided into subports. Since you're l2dy if you would prefer to co-maintain or remove me as a maintainer, either way is OK by me since I think you were listed in the subport before I added myself to the main portion of the Portfile. ^_^ My apologies if I inadvertently stepped on your toes.

@fhgwright
Copy link
Contributor Author

@artkiver @l2dy

Regarding the maintainer differences, I don't think that's intentional? The main OpenSSH Portfile portion was just openmaintainer for a while, but since I found myself submitting various update PRs (along with other OpenBSD related projects I have been trying to keep up to date downstream) I decided to add myself along with openmaintainer; the subport maintainer/ssh-copy-id I think was already there and I wasn't involved with MacPorts when OpenSSH and ssh-copy-id were subdivided into subports. Since you're l2dy if you would prefer to co-maintain or remove me as a maintainer, either way is OK by me since I think you were listed in the subport before I added myself to the main portion of the Portfile. ^_^ My apologies if I inadvertently stepped on your toes.

I'm not l2dy; I'll let him comment.

@artkiver
Copy link
Contributor

Ah weird. When I went to @ l2dy it GitHub auto-completed to you for some reason.

@fhgwright
Copy link
Contributor Author

@artkiver

Ah weird. When I went to @ l2dy it GitHub auto-completed to you for some reason.

What I see here is that as soon as I enter "@", a suggestion menu pops up with myself as the first (and default) choice, which of course makes no sense when I'm the one that's posting. I'm not sure what GitHub's algorithm is for populating the suggestion menu, but the main thing is to look at what's highlighted before selecting it.

If you literally put a space between the "@" and the "l2dy", that might explain it.

@l2dy
Copy link
Member

l2dy commented Oct 16, 2024

Regarding the maintainer differences, I don't think that's intentional? The main OpenSSH Portfile portion was just openmaintainer for a while, but since I found myself submitting various update PRs (along with other OpenBSD related projects I have been trying to keep up to date downstream) I decided to add myself along with openmaintainer; the subport maintainer/ssh-copy-id I think was already there and I wasn't involved with MacPorts when OpenSSH and ssh-copy-id were subdivided into subports. Since you're l2dy if you would prefer to co-maintain or remove me as a maintainer, either way is OK by me since I think you were listed in the subport before I added myself to the main portion of the Portfile. ^_^ My apologies if I inadvertently stepped on your toes.

@artkiver Feel free to take over maintenance of ssh-copy-id, i.e. delete the line with me as maintainers. The ssh-copy-id port was split out because older version of macOS did not have it bundled, and there were users who need the script but don't want to override the system ssh. I refrained from maintaining the main openssh port because there were several feature patches that takes a significant effort to maintain on each upgrade.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintainer: open Affects an openmaintainer port type: bugfix
Development

Successfully merging this pull request may close these issues.

5 participants