openssh @5.9p1 fails to apply patches

[nonstop.server@…]

Installing port openssh with variants +gss_api_trust_dns and +gsskex fails during patch phase.

DEBUG: patch phase started at Mon Apr  9 14:12:14 CEST 2012
DEBUG: Executing org.macports.patch (openssh)
--->  Applying patches to openssh
--->  Applying /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/openssh/files/GSSAPITrustDNS.patch
DEBUG: Environment: CPATH='/opt/local/include' CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/.CC_PRINT_OPTIONS' LIBRARY_PATH='/opt/local/lib' CC_PRINT_OPTIONS='YES' MACOSX_DEPLOYMENT_TARGET='10.5' GI_SCANNER_DISABLE_CACHE='1'
DEBUG: Assembled command: 'cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/openssh-5.9p1" && /usr/bin/patch -p1'
DEBUG: Executing command line:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/openssh-5.9p1" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/openssh/files/GSSAPITrustDNS.patch'
missing header for unified diff at line 8 of patch
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: readconf.c
|===================================================================
|RCS file: /cvs/openssh/readconf.c,v
|retrieving revision 1.135
|diff -u -r1.135 readconf.c
|--- readconf.c	5 Aug 2006 02:39:40 -0000	1.135
|+++ readconf.c	19 Aug 2006 11:59:52 -0000
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
5 out of 5 hunks ignored
missing header for unified diff at line 63 of patch
can't find file to patch at input line 63
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: readconf.h
|===================================================================
|RCS file: /cvs/openssh/readconf.h,v
|retrieving revision 1.63
|diff -u -r1.63 readconf.h
|--- readconf.h	5 Aug 2006 02:39:40 -0000	1.63
|+++ readconf.h	19 Aug 2006 11:59:52 -0000
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 78 of patch
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: ssh_config.5
|===================================================================
|RCS file: /cvs/openssh/ssh_config.5,v
|retrieving revision 1.97
|diff -u -r1.97 ssh_config.5
|--- ssh_config.5	5 Aug 2006 01:34:51 -0000	1.97
|+++ ssh_config.5	19 Aug 2006 11:59:53 -0000
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 103 of patch
can't find file to patch at input line 103
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: sshconnect2.c
|===================================================================
|RCS file: /cvs/openssh/sshconnect2.c,v
|retrieving revision 1.151
|diff -u -r1.151 sshconnect2.c
|--- sshconnect2.c	18 Aug 2006 14:33:34 -0000	1.151
|+++ sshconnect2.c	19 Aug 2006 11:59:53 -0000
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
2 out of 2 hunks ignored
shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/openssh-5.9p1" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/openssh/files/GSSAPITrustDNS.patch'" returned error 1
Error: Target org.macports.patch returned: shell command failed (see log for details)
DEBUG: Backtrace: shell command failed (see log for details)
    while executing
"command_exec patch "" "< '$patch'""
    ("default" arm line 1)
    invoked from within
"switch -- [file extension $patch] {
            .Z -
            .gz {command_exec patch "$gzcat \"$patch\" | (" ")"}
            .bz2 {command_exec p..."
    (procedure "portpatch::patch_main" line 31)
    invoked from within
"$procedure $targetname"

Version Information:

Mac OS Version:
Darwin 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386

Xcode Version:
Xcode 3.1.4
Component versions: DevToolsCore-1204.0; DevToolsSupport-1186.0
BuildVersion: 9M2809

Macports Version:
Version: 2.0.4

[antony.stubbs@…]

Is this need to fix ​https://bugzilla.mindrot.org/show_bug.cgi?id=1991 ? It's pretty critical priority.

[vkuznet (Valentin Kuznetsov)]

I see similar problem, but patched file is different, see below. I manually went into this directory and use -p0 instead of -p1 and the patch was applied cleanly.

:debug:main Executing org.macports.main (openssh)
:debug:main Skipping completed org.macports.archivefetch (openssh)
:debug:main Skipping completed org.macports.fetch (openssh)
:debug:main Skipping completed org.macports.checksum (openssh)
:debug:main Skipping completed org.macports.extract (openssh)
:debug:patch patch phase started at Fri Apr 20 13:00:37 EDT 2012
:debug:patch Executing org.macports.patch (openssh)
:notice:patch --->  Applying patches to openssh
:info:patch --->  Applying /opt/local/var/macports/sources/rsync.macports.org/release/ports/net/openssh/f
iles/launchd.patch
:debug:patch Environment: CPATH='/opt/local/include' CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build
/_opt_local_var_macports_sources_rsync.macports.org_release_ports_net_openssh/openssh/work/.CC_PRINT_OPTI
ONS' LIBRARY_PATH='/opt/local/lib' CC_PRINT_OPTIONS='YES' MACOSX_DEPLOYMENT_TARGET='10.7' GI_SCANNER_DISA
BLE_CACHE='1'
:debug:patch Assembled command: 'cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_net_openssh/openssh/work/openssh-5.9p1" && /usr/bin/patch -p1'
:debug:patch Executing command line:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_net_openssh/openssh/work/openssh-5.9p1" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/net/openssh/files/launchd.patch'
:info:patch missing header for unified diff at line 3 of patch
:info:patch can't find file to patch at input line 3
:info:patch Perhaps you used the wrong -p or --strip option?
:info:patch The text leading up to this was:
:info:patch --------------------------
:info:patch |--- clientloop.c.orig      2011-06-22 15:31:58.000000000 -0700
:info:patch |+++ clientloop.c   2012-04-19 09:15:26.000000000 -0700
:info:patch --------------------------
:info:patch File to patch: 
:info:patch Skip this patch? [y] 

[vkuznet (Valentin Kuznetsov)]

Cc Me!

[conguito.molon@…]

I had a very similar problem. I tried to install openssh@5.9p1 +no_x11 +hpn +gsskex -- -universal.

The patch file "launchd.patch" (and possibly others) does not specify a path to the source file to be modified (clientloop.c). I fixed by just commenting the line 112 of Portfile trunk/dports/net/openssh/Portfile#L112​.

It may also work with: /usr/bin/patch -p0 as said vkuznet@ (thanks!!)

[nonstop.server@…]

Installing openssh @6.0p1 with variants +gss_api_trust_dns +gsskex +ldns fails during the patch phase of the openssh-5.9p1-gsskex-all-20110920.patch.

:info:patch patching file readconf.c
:info:patch Hunk #1 FAILED at 129.
:info:patch Hunk #2 FAILED at 171.
:info:patch Hunk #3 FAILED at 493.
:info:patch Hunk #4 FAILED at 1169.
:info:patch Hunk #5 FAILED at 1274.
:info:patch 5 out of 5 hunks FAILED -- saving rejects to file readconf.c.rej
:info:patch patching file readconf.h
:info:patch Hunk #1 FAILED at 47.
:info:patch 1 out of 1 hunk FAILED -- saving rejects to file readconf.h.rej
:info:patch patching file servconf.c
:info:patch patching file servconf.h
:info:patch patching file ssh-gss.h
:info:patch patching file ssh_config
:info:patch patching file ssh_config.5
:info:patch Hunk #1 FAILED at 527.
:info:patch 1 out of 1 hunk FAILED -- saving rejects to file ssh_config.5.rej
:info:patch patching file sshconnect2.c
:info:patch Hunk #6 FAILED at 688.
:info:patch Hunk #7 succeeded at 815 (offset 6 lines).
:info:patch Hunk #8 succeeded at 926 (offset 6 lines).
:info:patch 1 out of 8 hunks FAILED -- saving rejects to file sshconnect2.c.rej
:info:patch Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/openssh-6.0p1" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/openssh/files/openssh-5.9p1-gsskex-all-20110920.patch'
:info:patch Exit code: 1
:error:patch org.macports.patch for port openssh returned: command execution failed
:debug:patch Error code: CHILDSTATUS 838 1

[ryandesign (Ryan Carsten Schmidt)]

Replying to nonstop.server@…:

Installing port openssh with variants +gss_api_trust_dns and +gsskex fails during patch phase.

The patch failure of the gss_api_trust_dns variant was fixed in r95508. The patch failure of the gsskex variant remains and has duplicate #36038.

[nonstop.server@…]

Replying to ryandesign@…:

After fix r98996 for the gsskex variant provided via ticket #36171 I tried to install openssh again.
Unfortunately the port still fails during the patching phase while patching the openssh-5.9p1-gsskex-all-20110920.patch.
After the failed attempt I was able to install the port with only the +gss_api_trust_dns +ldns variants enabled, so it seems that the gss_api_trust_dns variant was fixed successfully in r95508.
The log file of the failed attempt to install the port with the +gsskex variant enabled is attatched to the ticket as main_r95508_r98996.log.

[nonstop.server@…]

Using variant +gsskex also fails during patch phase when patching openssh @6.2p1.

DEBUG: Executing command line:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_openssh/openssh/work/openssh-6.2p1" && /usr/bin/patch -p1 < '/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/openssh/files/openssh-5.9p1-gsskex-all-20110920.patch'
patching file ChangeLog.gssapi
patching file Makefile.in
Hunk #1 FAILED at 70.
Hunk #2 succeeded at 89 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file Makefile.in.rej

patching file monitor.h
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file monitor.h.rej

[nonstop.server@…]

Using variant +gsskex also fails during patch phase when patching openssh @6.2p2.

patching file Makefile.in
Hunk #1 FAILED at 70.
Hunk #2 succeeded at 89 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file Makefile.in.rej

patching file monitor.h
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file monitor.h.rej

[neverpanic (Clemens Lang)]

Cc Me!

[neverpanic (Clemens Lang)]

+gsskex should be fixed by r108350. Trying +gss_api_trust_dns now.

[neverpanic (Clemens Lang)]

+gss_api_trust_dns seems to be integrated in +gsskex. r108353.

[nonstop.server@…]

Replying to cal@…:

Thank you for fixing this issue!
Patching with the +gsskex variant enabled went fine.