Update hpn and x509 patches #135691 by Scott Jones.

(Portage version: 2.1_rc4-r3)

4 files changed, 119 insertions, 1 deletions

diff --git a/net-misc/openssh/files/digest-openssh-4.2_p1-r1 b/net-misc/openssh/files/digest-openssh-4.2_p1-r1
index f18dee7ee02f..0a6a607a2b73 100644
--- a/net-misc/openssh/files/digest-openssh-4.2_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-4.2_p1-r1
@@ -1,5 +1,7 @@
 MD5 6c89525f43b93fb2671af345dd85783b openssh-4.2p1+SecurID_v1.3.2.patch 616248
-MD5 bd234f201844fac2c4c44ffadd396741 openssh-4.2p1+x509-5.3.diff.gz 128507
+MD5 f2317f7a413f1d132a37e036166975b1 openssh-4.2p1+x509-5.5.diff.gz 133405
+RMD160 fba6bc99857d890cda0e5a88bf195b7e327f0aff openssh-4.2p1+x509-5.5.diff.gz 133405
+SHA256 42509cdd9edce6e6f2cb635cb480bfc0e3c0f26a0747760559742355a8b1ddce openssh-4.2p1+x509-5.5.diff.gz 133405
 MD5 4b8f0befa09f234d6e7f1a5849b86197 openssh-4.2p1-hpn11.diff 14765
 MD5 df899194a340c933944b193477c628fa openssh-4.2p1.tar.gz 914165
 MD5 b779906d657d63794144cabe2bf978b8 openssh-lpk-4.1p1-0.3.6.patch 60312
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2-r2 b/net-misc/openssh/files/digest-openssh-4.3_p2-r2
new file mode 100644
index 000000000000..d3a4d9bcd77b
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.3_p2-r2
@@ -0,0 +1,11 @@
+MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
+MD5 bc93a31436941ae32e7f9d20c592eca7 openssh-4.3p2+x509-5.5.diff.gz 136017
+RMD160 21069550bbb05ea22870da853f68ee9910b2b71e openssh-4.3p2+x509-5.5.diff.gz 136017
+SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad openssh-4.3p2+x509-5.5.diff.gz 136017
+MD5 5ade4be51e0d49c18f4107013c60ac14 openssh-4.3p2-hpn12.diff.gz 14806
+RMD160 38ca2a73a3ff9aae8c6b9eba6c07eb962b4beb71 openssh-4.3p2-hpn12.diff.gz 14806
+SHA256 d98d8a016d6b7a83c9c821339e6d01b8d67a7607ec7ace11a72b347689411a74 openssh-4.3p2-hpn12.diff.gz 14806
+MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
+RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
+SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
+MD5 d9eacb819a73daddb3d21ca7aa8e5c25 openssh-lpk-4.3p1-0.3.7.patch 60451
diff --git a/net-misc/openssh/files/openssh-4.3_p2-securid-hpn-glue.patch b/net-misc/openssh/files/openssh-4.3_p2-securid-hpn-glue.patch
new file mode 100644
index 000000000000..01f11970b35f
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.3_p2-securid-hpn-glue.patch
@@ -0,0 +1,69 @@
+tweak the secure id code a little so hpn patches cleanly
+
+--- servconf.c
++++ servconf.c
+@@ -643,6 +643,32 @@
+ 			*intptr = value;
+ 		break;
+ 
++#ifdef SECURID
++	case sSecurIDAuthentication:
++		intptr = &options->securid_authentication;
++		goto parse_flag;
++
++	case sSecurIDFallBack:
++		intptr = &options->securid_fallback;
++		goto parse_flag;
++
++	case sAllowNonSecurID:
++		intptr = &options->allow_nonsecurid;
++		goto parse_flag;
++
++	case sNegateSecurIDUsers:
++		intptr = &options->negate_securid_users;
++		goto parse_flag;
++
++	case sSecurIDUsersFile:
++		charptr = &options->securid_usersfile;
++		goto parse_filename;
++
++	case sSecurIDIgnoreShell:
++		intptr = &options->securid_ignore_shell;
++		goto parse_flag;
++#endif
++
+ 	case sIgnoreRhosts:
+ 		intptr = &options->ignore_rhosts;
+ parse_flag:
+@@ -662,31 +688,6 @@
+ 			*intptr = value;
+ 		break;
+ 
+-#ifdef SECURID
+-        case sSecurIDAuthentication:
+-                intptr = &options->securid_authentication;
+-                goto parse_flag;
+-
+-        case sSecurIDFallBack:
+-                intptr = &options->securid_fallback;
+-                goto parse_flag;
+-
+-        case sAllowNonSecurID:
+-                intptr = &options->allow_nonsecurid;
+-                goto parse_flag;
+-
+-        case sNegateSecurIDUsers:
+-                intptr = &options->negate_securid_users;
+-                goto parse_flag;
+-
+-        case sSecurIDUsersFile:
+-                charptr = &options->securid_usersfile;
+-                goto parse_filename;
+-
+-        case sSecurIDIgnoreShell:
+-                intptr = &options->securid_ignore_shell;
+-                goto parse_flag;
+-#endif
+ 	case sIgnoreUserKnownHosts:
+ 		intptr = &options->ignore_user_known_hosts;
+ 		goto parse_flag;
diff --git a/net-misc/openssh/files/openssh-4.3_p2-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.3_p2-x509-hpn-glue.patch
new file mode 100644
index 000000000000..6b027da99afc
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.3_p2-x509-hpn-glue.patch
@@ -0,0 +1,36 @@
+tweak the x509 code a little so hpn patches cleanly
+
+--- servconf.c
++++ servconf.c
+@@ -335,6 +335,7 @@
+ 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
+ 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
+ 	sUsePrivilegeSeparation,
++	sDeprecated, sUnsupported
+ 	sHostbasedAlgorithms,
+ 	sPubkeyAlgorithms,
+ 	sX509KeyAlgorithm,
+@@ -345,7 +346,6 @@
+ 	sCAldapVersion, sCAldapURL,
+ 	sVAType, sVACertificateFile,
+ 	sVAOCSPResponderURL,
+-	sDeprecated, sUnsupported
+ } ServerOpCodes;
+ 
+ /* Textual representation of the tokens. */
+@@ -446,6 +446,7 @@
+ 	{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
+ 	{ "useprivilegeseparation", sUsePrivilegeSeparation},
+ 	{ "acceptenv", sAcceptEnv },
++	{ "permittunnel", sPermitTunnel },
+ 	{ "hostbasedalgorithms", sHostbasedAlgorithms },
+ 	{ "pubkeyalgorithms", sPubkeyAlgorithms },
+ 	{ "x509rsasigtype", sDeprecated },
+@@ -462,7 +463,6 @@
+ 	{ "vatype", sVAType },
+ 	{ "vacertificatefile", sVACertificateFile },
+ 	{ "vaocspresponderurl", sVAOCSPResponderURL },
+-	{ "permittunnel", sPermitTunnel },
+ 	{ NULL, sBadOption }
+ };
+