Version bump #470222 by Jason A. Donenfeld.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 45 insertions, 36 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index f6cf4b8d6773..f60c4388a1e8 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.473 2013/06/23 08:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.474 2013/06/24 16:48:35 vapier Exp $
+
+*openssh-6.2_p2 (24 Jun 2013)
+
+  24 Jun 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-6.2_p2-x509-glue.patch,
+  +files/openssh-6.2_p2-x509-hpn-glue.patch, +openssh-6.2_p2.ebuild,
+  -files/openssh-6.2_p1-x509-glue.patch,
+  -files/openssh-6.2_p1-x509-hpn-glue.patch, -openssh-6.2_p1.ebuild:
+  Version bump #470222 by Jason A. Donenfeld.
 
   23 Jun 2013; Mike Frysinger <vapier@gentoo.org> openssh-6.2_p1.ebuild:
   Move into ~arch w/hpn disabled as it randomly hangs.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4d33cc69fd68..aac73088af7a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -22,8 +22,8 @@ AUX openssh-6.0_p1-x509-glue.patch 569 SHA256 8c9048a33036a93f56e254cfd53b183136
 AUX openssh-6.0_p1-x509-hpn-glue.patch 1774 SHA256 b2dcff21652eea92d2ff2640a568070a944e7bfb2bd3217c433e6383a64b0970 SHA512 82793502b8c943f0bd69019ea1cf1172f9579dc6a8f6c91f6aba9a9d743384d5ac84f7a49df07165e252b4ef4fc06b745463bdc58d06da2aca3c7acbb3dd8623 WHIRLPOOL ffd01827dbf8162359cf7a278020f2bfa7ed1ee1051774522623bcf448ffc8a3e28ecff2de5733b352beef5722a9dec2e9bb25fabc7edca615a774f65f756246
 AUX openssh-6.1_p1-x509-glue.patch 573 SHA256 e51aa53e9e0336606fc36af237d50338347b845ee56a66d01f86829c4b46feb6 SHA512 bac2971b6435433d6ac88fb127c178e678fe805f51260454d9d0b631ef52dbafc08343fb307a74a116691545a82f5369dc014e71a7c8c65ba41699b31e1dfb6f WHIRLPOOL dd514ce502f7c7968e8fa526b1b2f7d7945f2d5b5f1f013e54f7513a7c7bf6025dbdeabe566958018db8f7442c9611f7efd435501b4b965b0fe7594e24ee20fc
 AUX openssh-6.1_p1-x509-hpn-glue.patch 1491 SHA256 28c5000f7c8b23afc363d066cf96d39c00882274f227b7743b1e376df8b61a2e SHA512 0d6bab08cc400b81d936883bf39f5a461799874f6ea3dcf55c083372ed379bc0066b913646f7a0e32167079ba85409c272b258de179d55660739df4bbbf30e5b WHIRLPOOL dbfbf8eb0312ae119421e45efd8243b089ab2d3c2bc1f7b7cbd5b56f86844dfe42b27952e4ed88653679ec036f70b8edd3e00f17ae097241fbc88567bab38505
-AUX openssh-6.2_p1-x509-glue.patch 559 SHA256 e5dea315ad07777e6dec1990a3b66aa2d910ed37446066ef03187042d5e420b1 SHA512 44b55b095bdd8046972aee1d3944d88f6169b170772de379fff93cd5d1aab93ca0d4c4c7607834c694a5f9b3be8628d4005ad34e169816f52f93644593de6cc6 WHIRLPOOL 2076061586c5f20d172b5019c870f65d5fe21aa23785c888298fd8db2514928d07bf2c427dc16d16f7c40fe6c107a38be91ac04aed4fa4d85b45b3fea0cf38f0
-AUX openssh-6.2_p1-x509-hpn-glue.patch 1451 SHA256 b82ec8baea4b045b00e78ce88f3c5ca72868df05c4ee80414123576c9fb3ad1b SHA512 cba0265fda915e6e01c929d788990b87f1f449b36bea39f33f076493bed5e5ae81f03e99fff7eb27075cf9c09df02cfdfe8daf20c26cbff0a3a57621f83b087b WHIRLPOOL 02ba57ff6edec1245d08518692ced4264e20dd2801c4a182478ff5122c69b0d35fc5d7f16effb0bb372729f8dc609e21f7f1c68c145aa73fd708457de4ddc781
+AUX openssh-6.2_p2-x509-glue.patch 555 SHA256 e0aa2310ffd1c4e1bd6663d1e9420e42ce9fce0096ca263b63d6a8fe34de91c7 SHA512 002d67109b116abb465c06c0f6ca6e431654bfc924864ffe4563afe91fba723dc3c0c484032205cadd6da4dcbe6a79ad31c83d0d2018adb22d0940ba35f531d4 WHIRLPOOL 8484c826e7c9aad0bd6a2f1779fff798573786c5b264c4a98e1c88db5b8b107ca9b5f573d3f240b8ecfa7fdf2a87e41cd174263804d29007093ae246ce034237
+AUX openssh-6.2_p2-x509-hpn-glue.patch 1451 SHA256 4e61991619cef00a09951ceea68fdd5c3e9d947031d5dfef2e054d0254ef606c SHA512 37d15f3014c45804436b804489b8a7473189867c71e5d6cce8d666b1556cfd5b89ef8ed143b7d81ca5d61ff03e6485dd1a096e9571a49ac9ad2d3ca5a1963d20 WHIRLPOOL 8b79e621fc9dd28e40c8544235e5ca44eb98f5987bd8024e8ae25f99fbfe468c7995814bae7ca207cae83dbfd5cccfa37a19f07049e5555b65fd9cdf9f30bd8b
 AUX sshd.confd 396 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 WHIRLPOOL 69f43e6192e009a4663d130f7e40ee8b13c6eb9cc7d960b5e0e22f5d477649c88806a9d219efef211f4346582c2bb51e40d230a8191e5953dbe08bfff976ae53
 AUX sshd.pam 294 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f SHA512 3268dc826978fbb205968744d83c6f1c838c9c73bf9c4ceee709c5b4168b4aaf06bcde47a32808571fa71cbc5a6bfdb98406995b2b28c9e633ce392a53932d64 WHIRLPOOL fff8966d66d75cd4d70607585b5de063f225a776b73b8b0f8146c5eed6c8ffd2ca38c46f86fa4e2ca8caafcde7797a3f0b177e60baa6fa0642064080883fa68a
 AUX sshd.pam_include.2 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
@@ -45,8 +45,8 @@ DIST openssh-6.0p1.tar.gz 1126034 SHA256 589d48e952d6c017e667873486b5df63222f913
 DIST openssh-6.1p1+x509-7.2.1.diff.gz 208071 SHA256 02d3703d419fc72be819a4e7fc8cbbb269182862465b6a99cc7b2af32d75a181 SHA512 6c1786c2c32d884e7b8f15e39912ca1d8fb54b1132ffae6d8d4f262356a16267a8e549a822911d0f40eabe49015080ae35fdec521f90e0ef4d05554339f35fa0 WHIRLPOOL 7f260caebdc58fe415b3cb93b08600942a6b171b45df8ff1279d4280930a7103cbefac63ec7f32fdbf9bdcf64278c39bfd55c2dcb41ea5c4934574930494df67
 DIST openssh-6.1p1-hpn13v11.diff.bz2 19999 SHA256 08bfc1f3c582f23b3ce386e78baf37be4af03645fc6eef87f1ef819cc273ecc7 SHA512 4e21384ef4d0b7539c9b7aecb158748b959db7ec84fa023f7969c2db50794e1f68bab375cdea9c2ae8fe16b759650e250aa21d6b8772a1c671d2e1e59adef08a WHIRLPOOL 3918c2c118908e67de4523c8d1f142ca4b2d2d7c045c2337b2f7914096108cf1a138009a838519d292e53fec454ced3a9590bbddf93096bd377196bd7d73ed55
 DIST openssh-6.1p1.tar.gz 1134820 SHA256 d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411 SHA512 1cd58f18b047fa92a3155fa215d69c04e1f03914488a21bcda5434899df6055567e59f77063f0080b0cb437bb2396d3bf4050ed0c5ea2d1dc20d6fd928d5a76c WHIRLPOOL a1ecf33e8c4048c59e55d38cc8bb3f89357ac8fb74fdbb57e24e111e1749620fe6f7e329a744e3cfc9ced3e445539ce85926c7877a0f12475ccf14f124f9234b
-DIST openssh-6.2p1+x509-7.4.1.diff.gz 215496 SHA256 cdfa0ac38184062de7e0af36eeda7713095fbcffffb598d785047f6f47e48eae SHA512 b82d57f3f408dcbd825d4d6173de7f0b629fd18268cc68b1e08c42e8d96a41596b765617ff9cc7896323f483e91e8f34ed4899fafd82e673131075fac392b631 WHIRLPOOL 72e97a1d3a79c81d791e7953d9a7dc5a454c390786753a7c72fad5062c9695f11f05f50b070031f7c55138f7a7b28bde4cf01db896313de62b99b318738abeb3
-DIST openssh-6.2p1.tar.gz 1182181 SHA256 58690267d7455f444e87c2f8cd9be91fc686ffc0c02d1ebd0be2ab68149f7160 SHA512 ffc866110f8e6c53581186f73593489fc54d75b5d193f9e9589ec484b541efa23d8ee48b28e3a0a3a0d7f8183d5de00c416c2217938a5e47211c49da7bc7a7e7 WHIRLPOOL 29049819284779d833aad4c9b94db89be9620c19a6893a0c57f1697945dc9815befebff16cdb8bf2e4e8b6f1acce04bf5beb1efb1896c562bd9cb3642597ab8a
+DIST openssh-6.2p2+x509-7.5.diff.gz 218099 SHA256 bde2471a22f3ddee86a2c176fe30321b73d68a0097aaaa554f59c96fc58e9019 SHA512 a48c4b3563de94b5ce86b8f6b5c0bf7ee5f4ab43e917fd37fdbe75aa21901073dfa4e96f158449d7ea47916d70cface8215f369f5fe3c700008d2c72d91afdc6 WHIRLPOOL 2acc67c150657cda93c4a982f35a7ed88a5e268e9b980e3f9e9aee8333899f88cc63a24e3a463dd3d2c95d35a5d3a8f8fdad087ae2f16b295c42a566524554b2
+DIST openssh-6.2p2.tar.gz 1182922 SHA256 7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b SHA512 80c8fb6bb25e86e8261cc7c6671773cdc0d9b0da9c9ebca33b3d5278c44197734fe32e878e1f444b693c4b49b0a525458aa07e57c231cefafc23a9c6975b05df WHIRLPOOL 84cca243e84548cf0cf1880e89c8d41745cde9c58fb7c153a5f0e1670bc6e251b385e44e5d05f9f2043044f81fc2904484320ab24ef142aadd5f696ee7880855
 DIST openssh-lpk-5.9p1-0.3.14.patch.gz 18335 SHA256 1a922d57a2e7020bf597135437a57080d7d046c9f41a7a53559945ddddbe0892 SHA512 eb4641d30e221eaa409d22ab423e38c1a31dd9dfeacbf978c94827194cb838cc0f832bf96aa4c494a71a5d5d1b90fc6789e8469e35d82ffcaf54305f07ccdb9b WHIRLPOOL 6748426d6d0cda07729744d8993d96a762134a61acf757afc1618ada5cbd9752d9211a89be831e5a4f1744f70cc4fc643b5f745d1f785b53a4e1dbf9d7c92680
 DIST openssh-lpk-6.0p1-0.3.14.patch.gz 18401 SHA256 d0f3d55fd92ecc45aa6120d6ea919c903e4828ce0c2b07612c742a2aa7648beb SHA512 ebf680b90bc289c0d69c22fd6fd666032cdcf4c3850ecdf03e264200d60c50a12f4a5254907c6ab850727216e7837176be5564ae22b68d9b80a67c62f372a9dd WHIRLPOOL 4f8b32c77fc2a9205d283109ccd787a3f37757c18060da39c63147ff09f6b922f4a57ca1ba8d0cdc692f3f1eaba3e5e88eb4287f728ddaaf544d2d425c0cca91
 DIST openssh-lpk-6.1p1-0.3.14.patch.gz 18458 SHA256 2d0e40116e021913668519a42743f89b8fb77f8d5beed863d620cc79999b0b79 SHA512 9cfd83e650cedbc3950b8cf80d0b36fbb7dff8fbe7d017378f9a2ae18189fa6e459e323dae6cd1fa1d82ff948f628563892d0a0f30113b3a8ba5269fe051e784 WHIRLPOOL c1ee5570f0bfb3191c602d575e0e05cabe7d42183bd78c07cac19a2743a59f110728e309fcee6f0b6abc7b141ae8c701d92d010d2b7737739b4cac92406552fa
@@ -55,23 +55,23 @@ EBUILD openssh-6.0_p1-r1.ebuild 9509 SHA256 1ba812b3a355e66e528f33217d7b6a7e0fba
 EBUILD openssh-6.0_p1.ebuild 9485 SHA256 32c4280a8babafa169543a919f4cf31231c3d759a7c116b42e3c3981242c0d59 SHA512 bae20dfbea14cfc30f16c7619d63a4a4cb2546d9d5e903e93e3c4d18745c1398d42ab6580a3e10609d81e1020b8f54c35b6413e168775efd3cb8fab064d67f8a WHIRLPOOL 24d16d37714e69a0d4593b745feeb54853e8d7b2de799be8ed76c0e09fe9459da8a3bfbb67b36f120345fc24fdc307a346c4fcb79b95fd8831e8944383f36759
 EBUILD openssh-6.1_p1-r1.ebuild 10257 SHA256 fa9ff7a800f65c5805ec7a59009e2effc1c5aff97c0b127d7a6bbd08f6d628c2 SHA512 1401d434f483b724e68f9d1698b2b0db1f15237da1d2f427c8f2c263d74fd50f60904fbf88b7231e212cd95e8d23b10b68c968a4db4296aa2ce198418c1a60e8 WHIRLPOOL e1814e33caa938e0182eaaa5c1863daf90b548fc9ae4179afd8a92a0a5bd2bd4fa773c5b4707c1a7300d8489ed49cdc89d69bdd9446b5e4aa8fbe6f52da2cc48
 EBUILD openssh-6.1_p1.ebuild 9582 SHA256 e4e060b08be1ae2238889463ad257e6d3b60ccc33c0bd6e5f73e63155795b2cc SHA512 dc3376d4317fe4692b0e3a62acfe7307df0208744dfd35f585eee9768e16493b81dc1ac854f32050dc21470cf1e7681a71c463c4e15a86d8a4b1c99dfdbc83fd WHIRLPOOL d2e7fe4d73ee58318b2b3099d18596db58d2d988e26a1792b9d68dadd3a0fbcda20bf52faf8006913614c995cd7cb7a2e69492c12ede66016639466206fbbc98
-EBUILD openssh-6.2_p1.ebuild 10241 SHA256 cdf4ae5ce9a15a2af5989f955b5c801738c86ca4576ef8a0f9aac14ca39dad40 SHA512 d715101cfeeb6c401bb43c610b42f09206601dbf7d2bbcb85a57871aad7f27572c6e2e68f1fa3a4420149d21150403c2e34a4af01d16ad984b47fe02f70f67ce WHIRLPOOL 5fcc09a85d9524f4800a66a1a02d14cec9e2c9c62798e45dfd1bf9fae587cb7412a90d5ce8891947c07991523f29640811cbf3bb41a5fca1c1aa5824789d919e
-MISC ChangeLog 77034 SHA256 db35b947da38c246d959866b87f0c5387d3e2c2145489b1518a3fb343cb66d59 SHA512 edac2c311d7726a3229230d0718dd9830559e34876fc12ef3badf66c70ea96ded03380f0bfbe249610776242f7e7435151c269e5fe40fc0551032d71d125a64d WHIRLPOOL 1e752605bd488f0ae147e7aea0c3356072f13bfe844bed9e278ff585ce279eee0a241d3af66cc5cb065af1e99b690d6f2c1003174997194501337d56f378ade2
+EBUILD openssh-6.2_p2.ebuild 10239 SHA256 a552035e3bca39c6b7e1bb5db09978a31b545d2b5c0e85bb74a7d5d966c04235 SHA512 13aa2648dfe7b148cd748da49b27a72361081d8db1d4441a8b5551708c98fe77a67fff71748db38bcbdefa1cebb077b00070387857f4f7e2cab5213064be336c WHIRLPOOL a575479e0b84db1dcb4e46f9198a1ef0d710ddd68650c027010f65abc6019e1449cb3cdcbaa7f1611838bfb8e1c0ddf979e7bcb8e874066de2625d7aa654313b
+MISC ChangeLog 77382 SHA256 cd4ecc84f8cc82222414f33c22072bfdc6e02388c42d67dcee09388001fdacc6 SHA512 2e176ebd753855a7d03fed4743fe610f3be13280c43ae9ecdcb13b1652b4cbe9484197d37669aa8ad45a89ebe0f0fefe081eabc9488a61ceef0bd68af0e66406 WHIRLPOOL 43b62c5fe2cff1b3b3566c23fbbf69c0920e69c96f246cd4dd738d1840b2270c89918836d31cc2c7453d324a217d923c8ebd8e37f670ba573c7e90374d81a41c
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRxreYAAoJELEHsLL7fEFWgHYP/iqIJL5VByByNSSlVn3FuXFt
-6O2K2WZkY9YdrkrYRDURqbvxBu7QWtPHoJ9pdPhIwhXCltnfgmSg0tkZFrGh0mCS
-syrvBppfod0pR/qhwMDBm2c3A50UQBbLT5hZRQ1YPLDM28laqJxVGtyv+lFB+EJ+
-tEUEtardTCbynl9FfPDij07QQ+YIGQHOx31h2S4Gcf4qtyscPpUkcJ/dqA9OoRUd
-T7z8E0LKOVR9inKJM/PIOo03p9gff3MjMe548T54K9qrDbYPVIfTdDIL3wyB+4Lk
-1lvlN8ZhBUNtKK6i6ms6upOajuQSJFimVfrRi+zj2YzTS+wm6+1KAfFvJlpGPlfU
-D1CttO2M1pTU067MyPQllKF28L4MnDEUJCib6cgKyAGifF7r66Y1uGZiiQpgz+6x
-t/4GLeVBmRLdYE4oMcpMts/AQj1DR345o/7KEY0DjodiPH6TLaLcQh3EcmHZ6SiS
-fakhCed4j091yr8IivBLa56HWljFp1zxuwU1Z0U9rXRxyKOi2hE2dU9OOvBiY+bM
-0hbxHouLyuP5S/MUOlbzixZekKfJigSdchBc1I3dNgYCJRzLcYxJCulCSM7BVBDz
-T2po/shA9aCCdnzfQBmIKOuPqN1C5ndSC0jnDJl4Gn+g1ObXlTUr0WJDLaS1oOsZ
-WSRPtPkFZwEGsrDLZWzk
-=uiwq
+iQIcBAEBCAAGBQJRyHhlAAoJELEHsLL7fEFWIi8QAJWP4x0CYW2XNZxIMy/H2WSj
+t9tRXfYW1Q+3WbLd/HhlzKvMPCihN/r2G4q7EZwxXvJi6+SKgSY0d/tXZMs6YDQ9
+ICGj9o6puzC94BmYkPco9dZMXiYuhZ1HfMzmmnuEzhFyvHU0Kxuhngn8TbAA+BKE
+RVdTgZQ9V+y16YIoV6f8eFiCfGFScH6+DLi3hIKmrEmRukv6F9FYnNpmJb59wVqJ
+VNWtDrYQMBtElrtUkGG6l/vdDJq98uof5nRktnWCqisUMjOg9bTYc9a5Fjh+rCYS
+XsNaIOW99ICSBi9wPYB7EZGPe9DwbhrTcaMwdVkjxeKadvTEN4/odAOw6rX1peac
+z8Aj7ujg/Q9du5/IwYNvoqM1HnjoXUTmpIFn1Cg74duAljeA1Xgfj4fedrP7PnSt
+sZWj88H3iSCYYmjNOC5iBdmecsRCvUkIXVEddm5mVK+EJz7nO1tFXaPb/Ej4vNP2
+r0oAjs6QJifcKVip8mJlIfxiEwI7ZWDctnXwoBUiByTGWOb+KmQXQRP8hkhzOUtS
+C8v8sSK9TTdjZCNu4zujOaFNg8zyHiyHHaQrluJIrpc35Z/WpSXhofzG8dJB8l30
+7smUgh3ASZR0tGN223bHWHgeB+0oqV3X4SW/S/olrWbYZb6i6oh1es6jnP9GoNl0
+EkZbfB1idwfLNPtF3NAq
+=PFfI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
index 2c174298d881..f405d7d1c293 100644
--- a/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch
+++ b/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
@@ -1,7 +1,7 @@
 make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
 
---- openssh-6.2p1+x509-7.4.1.diff
-+++ openssh-6.2p1+x509-7.4.1.diff
+--- openssh-6.2p2+x509-7.5.diff
++++ openssh-6.2p2+x509-7.5.diff
 @@ -14571,10 +14571,9 @@
   .It Cm ChallengeResponseAuthentication
   Specifies whether challenge-response authentication is allowed (e.g. via
diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
index 22b9764a4d59..89d3d66e5775 100644
--- a/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch
+++ b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
@@ -1,5 +1,5 @@
---- openssh-6.2p1/Makefile.in
-+++ openssh-6.2p1/Makefile.in
+--- openssh-6.2p2/Makefile.in
++++ openssh-6.2p2/Makefile.in
 @@ -45,7 +45,7 @@
  CC=@CC@
  LD=@LD@
@@ -17,8 +17,8 @@
  AR=@AR@
  AWK=@AWK@
  RANLIB=@RANLIB@
---- openssh-6.2p1/sshconnect.c
-+++ openssh-6.2p1/sshconnect.c
+--- openssh-6.2p2/sshconnect.c
++++ openssh-6.2p2/sshconnect.c
 @@ -458,7 +458,7 @@
  {
  	/* Send our own protocol version identification. */
@@ -28,8 +28,8 @@
  		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
  	} else {
  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
---- openssh-6.2p1/sshd.c
-+++ openssh-6.2p1/sshd.c
+--- openssh-6.2p2/sshd.c
++++ openssh-6.2p2/sshd.c
 @@ -466,8 +466,8 @@
  		comment = "";
  	}
@@ -41,11 +41,11 @@
  	    *options.version_addendum == '\0' ? "" : " ",
  	    options.version_addendum, newline);
  
---- openssh-6.2p1/version.h
-+++ openssh-6.2p1/version.h
+--- openssh-6.2p2/version.h
++++ openssh-6.2p2/version.h
 @@ -3,4 +3,5 @@
  #define SSH_VERSION	"OpenSSH_6.2"
  
- #define SSH_PORTABLE	"p1"
+ #define SSH_PORTABLE	"p2"
 +#define SSH_X509	" PKIX"
  #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/openssh-6.2_p1.ebuild b/net-misc/openssh/openssh-6.2_p2.ebuild
index d33365fc08f1..70186f6847b1 100644
--- a/net-misc/openssh/openssh-6.2_p1.ebuild
+++ b/net-misc/openssh/openssh-6.2_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p1.ebuild,v 1.4 2013/06/23 08:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p2.ebuild,v 1.1 2013/06/24 16:48:35 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -11,7 +11,7 @@ PARCH=${P/_}
 
 #HPN_PATCH="${PARCH/6.2/6.1}-hpn13v14.diff.bz2"
 #LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz"
-X509_VER="7.4.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="7.5" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
@@ -65,7 +65,7 @@ S=${WORKDIR}/${PARCH}
 pkg_setup() {
 	# this sucks, but i'd rather have people unable to `emerge -u openssh`
 	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo ${1} ; }
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
 	local fail="
 		$(use X509 && maybe_fail X509 X509_PATCH)
 		$(use ldap && maybe_fail ldap LDAP_PATCH)
@@ -101,10 +101,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361
 	if use X509 ; then
 		pushd .. >/dev/null
-		epatch "${FILESDIR}"/${PN}-6.2_p1-x509-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.2_p2-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
-		epatch "${FILESDIR}"/${PN}-6.2_p1-x509-hpn-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.2_p2-x509-hpn-glue.patch
 		save_version X509
 	fi
 	if ! use X509 ; then