Opened 10 years ago

Closed 9 years ago

#45323 closed update (fixed)

openssh 6.7p1

Reported by: Schamschula (Marius Schamschula) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 2.3.1
Keywords: haspatch Cc: cooljeanius (Eric Gallager), mlindgren@…, neverpanic (Clemens Lang), ryandesign (Ryan Carsten Schmidt), Ionic (Mihai Moldovan)
Port: openssh

Description

openssh has been updated to version 6.7p1: http://www.openssh.com/txt/release-6.7

Attachments (2)

Portfile-openssh.diff (1.3 KB) - added by Schamschula (Marius Schamschula) 10 years ago.
0003-Apple-keychain-integration-other-changes.patch (65.6 KB) - added by neverpanic (Clemens Lang) 9 years ago.
Keychain integration patch without the additional creation of .orig files

Download all attachments as: .zip

Change History (11)

Changed 10 years ago by Schamschula (Marius Schamschula)

Attachment: Portfile-openssh.diff added

comment:1 Changed 10 years ago by cooljeanius (Eric Gallager)

Cc: egall@… added

Cc Me!

comment:2 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)

Do the patches in the variants need to be updated?

comment:3 Changed 10 years ago by Schamschula (Marius Schamschula)

Ryan,

I built the default variant (+kerberos +xauth) w/o any issues.

I had not tested the other variants, but I just tried +gsskex and +hpn, and both showed several patch failures.

comment:4 Changed 10 years ago by me@…

I believe I've corrected the keychain patch: https://gist.github.com/akerl/a347acb4b923a673bfc1

comment:5 Changed 9 years ago by mlindgren@…

Cc: mlindgren@… added

Cc Me!

Changed 9 years ago by neverpanic (Clemens Lang)

Keychain integration patch without the additional creation of .orig files

comment:6 Changed 9 years ago by neverpanic (Clemens Lang)

Here's the patch from the gist, but without the superfluous .orig files. It applies fine, but the gsskex patch doesn't. We could drop +hpn, move the keychain integration out of the variant (it's really a good thing on OS X in general, just in the otherwise uncorrelated +gsskex variant because it conflicted with +hpn) and leave the +gsskex variant broken until somebody turns up that wants to maintain the patch.

comment:7 Changed 9 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: cal@… ryandesign@… added

For now I updated to 6.7p1 in r129476 without addressing the patch failures in the variants.

I assume that attachment:0003-Apple-keychain-integration-other-changes.patch should actually have been named 0002-Apple-keychain-integration-other-changes.patch and should replace the existing patch of that name?

comment:8 in reply to:  7 Changed 9 years ago by mlindgren@…

Replying to ryandesign@…:

For now I updated to 6.7p1 in r129476 without addressing the patch failures in the variants.

I assume that attachment:0003-Apple-keychain-integration-other-changes.patch should actually have been named 0002-Apple-keychain-integration-other-changes.patch and should replace the existing patch of that name?

I am unable to load ssh-agent after upgrading to 6.7. I thought this was unrelated to +gsskex? Is anyone else having the same problem? I simply changed the plist to reflect the macport path and loaded the plist with -S Aqua as I have been doing in the past (actually didn't make any changes to my config, just rebooted after upgrading to 6.7)

comment:9 Changed 9 years ago by Ionic (Mihai Moldovan)

Cc: ionic@… added
Resolution: fixed
Status: newclosed

r129548 for keychain integration, r129549 for gsskex part.

Note: See TracTickets for help on using tickets.