polynomial-c 14/03/20 20:42:44 Modified: openssh-6.6_p1-x509-hpn14v4-glue-p2.patch Log: Fixed hpn patch to not add a false patch level to ssh's version string (6.6p2). Committed straight to stable where -r0 was stable (Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path 1.2 net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch?r1=1.1&r2=1.2 Index: openssh-6.6_p1-x509-hpn14v4-glue-p2.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/files/openssh-6.6_p1-x509-hpn14v4-glue-p2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-6.6_p1-x509-hpn14v4-glue-p2.patch 19 Mar 2014 23:40:40 -0000 1.1 +++ openssh-6.6_p1-x509-hpn14v4-glue-p2.patch 20 Mar 2014 20:42:44 -0000 1.2 @@ -2,14 +2,14 @@ --- openssh-6.6p1-hpnssh14v4.diff +++ openssh-6.6p1-hpnssh14v4.diff -@@ -1790,18 +1790,14 @@ +@@ -1742,18 +1742,14 @@ if (options->ip_qos_interactive == -1) options->ip_qos_interactive = IPTOS_LOWDELAY; if (options->ip_qos_bulk == -1) --@@ -348,9 +396,10 @@ typedef enum { -+@@ -348,6 +396,7 @@ typedef enum { +-@@ -345,9 +393,10 @@ ++@@ -345,6 +393,7 @@ sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, sHostCertificate, + sHostCertificate, sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, -+ sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize, ++ sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize, sNoneEnabled, @@ -21,6 +21,6 @@ - } ServerOpCodes; - + sAuthenticationMethods, sHostKeyAgent, - @@ -476,6 +525,10 @@ static struct { + @@ -468,6 +517,10 @@ { "revokedkeys", sRevokedKeys, SSHCFG_ALL }, { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
