464492 – =sys-devel/patch-{2.6.1,2.7.1,2.7.1-r1}

When trying to build net-misc/openssh-6.1p1 with "hpn" enabled part of the HPN patch doesn't apply which results in the built copy of sshd refusing to enable the "none" cipher.
Essentially, patch gets confused part way through one of the patches:
...
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -Nuar --exclude '*.orig' openssh-5.9p1.orig/sshd.c openssh-5.9p1/sshd.c
|--- openssh-5.9p1.orig/sshd.c  2011-06-23 09:45:51.000000000 +0000
|+++ openssh-5.9p1/sshd.c       2011-09-07 06:52:57.697811549 +0000
--------------------------
patching file sshd.c
Using Plan A...
Hunk #1 succeeded at 138.
Hunk #2 succeeded at 423 with fuzz 2 (offset 1 line).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
| 
|@@ -470,6 +473,9 @@
|       }
|       debug("Client protocol version %d.%d; client software version %.100s",
|           remote_major, remote_minor, remote_version);
|+      logit("SSH: Server;Ltype: Version;Remote: %s-%d;Protocol: %d.%d;Client: %.100s",
|+            get_remote_ipaddr(), get_remote_port(),
|+          remote_major, remote_minor, remote_version);
| 
|       compat_datafellows(remote_version);
| 
|@@ -1023,6 +1029,8 @@
|       int ret, listen_sock, on = 1;
|       struct addrinfo *ai;
|       char ntop[NI_MAXHOST], strport[NI_MAXSERV];
|+      int socksize;
|+      int socksizelen = sizeof(int);
...
This can easily be demonstrated clearly by extracting openssh-6.1p1.tar.gz then applying the HPN patch against it.

Reproducible: Always

Steps to Reproduce:
1.tar xzf /usr/portage/distfiles/openssh-6.1p1.tar.gz
2.cd openssh-6.1p1
3.bzcat </usr/portage/distfiles/openssh-6.1p1-hpn13v11.diff.bz2 >/tmp/openssh-6.1p1-hpn13v11.diff
4.patch --verbose --backup -p1 -g0 -E --no-backup-if-mismatch < /tmp/openssh-6.1p1-hpn13v11.diff
Actual Results:  
Note that patch doesn't think it sees the patches beyond the second for sshd.c.  It doesn't apply them and it doesn't leave any rejected patches and it returns a successful exit status.

The ebuild for openssh-6.1p1 succeeds, but the non-patched lines in sshd.c prevent the NONE cipher from working.
For some strange reason this problem doesn't seem to apply to openssh-6.0p1 or 5.9 (the NONE cipher works fine for sshd when I build those).
I ran the ebuilds to the point of "install" for 2.7.1 and 2.7.1-r1 and then ran patch from the tree to test those versions.