Opened 11 years ago

Closed 11 years ago

#42479 closed defect (fixed)

OpenSSH fails to build on OS X 10.9.1

Reported by: jchauvel@… Owned by: neverpanic (Clemens Lang)
Priority: Normal Milestone:
Component: ports Version: 2.2.1
Keywords: Cc: ksze (Kal Sze), mlindgren@…, mcg@…
Port: openssh

Description

I have currently installed openssh @6.4p1_1+gsskex+kerberos5+ldns+no_x11 and tried to upgrade it to 6.5p1_3 but in doing so the build process failed while trying to patch the 0002-Apple-keychain-integration-other-changes.patch patch file (log included).

Attachments (3)

main.log​ (35.8 KB) - added by jchauvel@… 11 years ago.
6.5p1-gsskex-combined.patch​ (918.7 KB) - added by mlindgren@… 11 years ago.
Hand-created patch
kennys_patches.txt​ (9.4 KB) - added by mlindgren@… 11 years ago.
errors when applying patches

Download all attachments as: .zip

Change History (17)

Changed 11 years ago by jchauvel@…

Attachment: main.log​ added

comment:1 Changed 11 years ago by jchauvel@…

Err pardon my editing. What I tried to say was that I currently have that version installed on my system.

comment:2 Changed 11 years ago by jchauvel@…

I forgot to add a CC to the maintainer. Please add nomaintainer@… to this ticket.

comment:3 Changed 11 years ago by mf2k (Frank Schima)

Keywords: patching removed

comment:4 Changed 11 years ago by mf2k (Frank Schima)

​nomaintainer@… is not a valid email address.

comment:5 Changed 11 years ago by neverpanic (Clemens Lang)

Cc: cal@… added

I guess the keychain integration isn't compatible with the new version. Somebody needs to take a look and port the patch to the new version of openssh. :/

comment:6 Changed 11 years ago by ksze (Kal Sze)

Cc: swordangel@… added

Cc Me!

Changed 11 years ago by mlindgren@…

Attachment: 6.5p1-gsskex-combined.patch​ added

Hand-created patch

comment:7 in reply to:  5 Changed 11 years ago by mlindgren@…

Replying to cal@…:

I guess the keychain integration isn't compatible with the new version. Somebody needs to take a look and port the patch to the new version of openssh. :/

I uploaded a patch which patches cleanly against the 6.5 source tree, and it builds. However I think I'm running into issues with other patches from the Portfile overwriting changes.

This patch replaces the two existing patches for the gsskex variant.

Last edited 11 years ago by mlindgren@… (previous) (diff)

comment:8 Changed 11 years ago by mlindgren@…

Cc: mlindgren@… added

Cc Me!

comment:10 in reply to:  9 Changed 11 years ago by mlindgren@…

Replying to kenny@…:

I brought the patches up to 6.5p1 a couple days ago and haven't had any issues with other patches conflicting:

Apple Keychain: ​https://gist.github.com/kruton/8951373/raw/a05b4a2d50bbac68e97d4747c1a34b53b9a941c4/openssh-6.5p1-apple-keychain.patch

GSSKEX patch: ​https://gist.github.com/kruton/8951366/raw/6b488018a76aa341a1f74e618663a1c52328bb12/openssh-6.5p1-gsskex-all-20130920.patch

Certainly seems like you did a better job than I did. I'll test your patches right now.

comment:11 Changed 11 years ago by mlindgren@…

Having similar problem with Kenny's patches, have attached the job log.

Changed 11 years ago by mlindgren@…

Attachment: kennys_patches.txt​ added

errors when applying patches

comment:12 Changed 11 years ago by mcg@…

Cc: mcg@… added

Cc Me!

comment:13 Changed 11 years ago by neverpanic (Clemens Lang)

Cc: cal@… removed
Owner: changed from macports-tickets@… to cal@…
Status: new → assigned

Duplicate of #42523, which has the patches I committed in r117112.

comment:14 Changed 11 years ago by neverpanic (Clemens Lang)

Resolution: → fixed
Status: assigned → closed
Note: See TracTickets for help on using tickets.