diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-03 06:34:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-03 06:34:08 +0000 |
| commit | d78658e11dfc0ee7a02335fb0fded273924af799 (patch) | |
| tree | 860878b0b5f5814d3b73a86337a1dd468b4ed7a0 /net-misc/openssh | |
| parent | Bump for XCB1.0RC3. (diff) | |
| download | historical-d78658e11dfc0ee7a02335fb0fded273924af799.tar.gz historical-d78658e11dfc0ee7a02335fb0fded273924af799.tar.bz2 historical-d78658e11dfc0ee7a02335fb0fded273924af799.zip | |
touchup glue some more
Package-Manager: portage-2.1.2_rc1-r2
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/Manifest | 14 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch | 38 |
2 files changed, 45 insertions, 7 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 14e9c47eb9d3..29a854a0efea 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -129,10 +129,10 @@ AUX openssh-4.4_p1-ldap-hpn-glue.patch 1538 RMD160 eba0400a328f23b9329429d2da65b MD5 92fc9d4dc7c7dbc67eabe2e98bde325f files/openssh-4.4_p1-ldap-hpn-glue.patch 1538 RMD160 eba0400a328f23b9329429d2da65b80ead546d4d files/openssh-4.4_p1-ldap-hpn-glue.patch 1538 SHA256 63e9f729fbb40babdf5cd2b4d87f4d1cb5a9aaed60bf7a8c072c22f9a6fb36ab files/openssh-4.4_p1-ldap-hpn-glue.patch 1538 -AUX openssh-4.4_p1-x509-hpn-glue.patch 1150 RMD160 2611c11db0da936ec5a0e688f6d765cb4f332a80 SHA1 7adebc924a8ae72e14783f5ca7d77378cd227cb6 SHA256 3020a88840e17a269a6943f9bc5636110248a66c55dd8d7254cc9ed8596ba97f -MD5 a40fa969555fb5713b9b2a14fe46d302 files/openssh-4.4_p1-x509-hpn-glue.patch 1150 -RMD160 2611c11db0da936ec5a0e688f6d765cb4f332a80 files/openssh-4.4_p1-x509-hpn-glue.patch 1150 -SHA256 3020a88840e17a269a6943f9bc5636110248a66c55dd8d7254cc9ed8596ba97f files/openssh-4.4_p1-x509-hpn-glue.patch 1150 +AUX openssh-4.4_p1-x509-hpn-glue.patch 2371 RMD160 e1b6dc359f9852fe149afe185e3f4705576d3332 SHA1 8c801e5aba86b157d00f93d26b51ef3350258511 SHA256 151142fa966108ff5b1bb4ea2c1e1c9bcb5fc305da04c6c7d32a6b7f9abcbda7 +MD5 9a4decc63a1d76da331cbe632aa8c4b3 files/openssh-4.4_p1-x509-hpn-glue.patch 2371 +RMD160 e1b6dc359f9852fe149afe185e3f4705576d3332 files/openssh-4.4_p1-x509-hpn-glue.patch 2371 +SHA256 151142fa966108ff5b1bb4ea2c1e1c9bcb5fc305da04c6c7d32a6b7f9abcbda7 files/openssh-4.4_p1-x509-hpn-glue.patch 2371 AUX openssh-4.4p1-selinux-ac.diff 525 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 SHA1 00798d6db943d92d1839853b53fa25a034945f57 SHA256 fc7d2f252fc19864c1b5b5cb6b506018580495605e36dad7e370fbc16b3f276e MD5 acfb71370d090c620e71fcf7e4ede1c4 files/openssh-4.4p1-selinux-ac.diff 525 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 files/openssh-4.4p1-selinux-ac.diff 525 @@ -277,7 +277,7 @@ SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFSrxwamhnQswr0vIRAlBWAKCuiXtQypeFv0eZzPRhZYHipq5UbgCguSiF -5eiziM+Ufxv4ucTmgUVSVaY= -=SoMa +iD8DBQFFSuL1amhnQswr0vIRAj42AJ9EEX+cCsp7oZlsv61nOIE5ngDIcQCgp8ps +j26hKOrFqmd9ytrga616vlg= +=hZi0 -----END PGP SIGNATURE----- diff --git a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch index e10365e5ec19..e7737066c5ad 100644 --- a/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch +++ b/net-misc/openssh/files/openssh-4.4_p1-x509-hpn-glue.patch @@ -2,6 +2,44 @@ move things around so hpn applies cleanly when using X509 --- servconf.c +++ servconf.c +@@ -106,6 +106,18 @@ + options->log_level = SYSLOG_LEVEL_NOT_SET; + options->rhosts_rsa_authentication = -1; + options->hostbased_authentication = -1; ++ ++ options->hostbased_algorithms = NULL; ++ options->pubkey_algorithms = NULL; ++ ssh_x509flags_initialize(&options->x509flags, 1); ++#ifndef SSH_X509STORE_DISABLED ++ ssh_x509store_initialize(&options->ca); ++#endif /*ndef SSH_X509STORE_DISABLED*/ ++#ifdef SSH_OCSP_ENABLED ++ options->va.type = -1; ++ options->va.certificate_file = NULL; ++ options->va.responder_url = NULL; ++#endif /*def SSH_OCSP_ENABLED*/ + options->hostbased_uses_name_from_packet_only = -1; + options->rsa_authentication = -1; + options->pubkey_authentication = -1; +@@ -146,18 +158,6 @@ + options->permit_tun = -1; + options->num_permitted_opens = -1; + options->adm_forced_command = NULL; +- +- options->hostbased_algorithms = NULL; +- options->pubkey_algorithms = NULL; +- ssh_x509flags_initialize(&options->x509flags, 1); +-#ifndef SSH_X509STORE_DISABLED +- ssh_x509store_initialize(&options->ca); +-#endif /*ndef SSH_X509STORE_DISABLED*/ +-#ifdef SSH_OCSP_ENABLED +- options->va.type = -1; +- options->va.certificate_file = NULL; +- options->va.responder_url = NULL; +-#endif /*def SSH_OCSP_ENABLED*/ + } + + void @@ -329,6 +329,16 @@ /* Portable-specific options */ sUsePAM, |