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)

1 files changed, 17 insertions, 17 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 81f2fe81c8ed..61be1a456fb0 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -26,7 +26,7 @@ AUX openssh-6.4_p1-x509-glue.patch 1445 SHA256 cf18f17b12514692a4e33d5fb995f5ba1
 AUX openssh-6.5_p1-hpn-cipher-align.patch 3024 SHA256 c79e3a201b2150e2fbc1e869233bac6acc27b2b126d4539cc09aa651fb2e60af SHA512 6efc2fa5f0e9b508e162bf20ab21d2c639888250387fa58ec0d812c7b1db125d8c654a0286a8ffc0d5530e5f0ec0ed723f3a5c0b7bd593b356aee2e811a1f4ec WHIRLPOOL 729c14b8d6f55d789ae2ea0e9cb2e0a4caba62dffced273de5c7254732e94673c1dc2d9e260d56e3a641e03ebab55d61c8ab7541fbf75957855b811def115677
 AUX openssh-6.6_p1-openssl-ignore-status.patch 741 SHA256 604b0a5365c1b01c9ab26bf1a60acfe43246e1e44e2f0e78d7ec1e47856599e4 SHA512 578afe9ddb836d16d90eb8b0cf10e9282d9c5c5e639962034490cec0aab1bf98cae9b46fe7850446d0cdd93e848d98ca7ed0bdf2bfec6aad418f4c962d4ea08d WHIRLPOOL d30c079eee59281aa87935ad948c59a4c01f858b88d701575d58737cfe555a5229a5f921bfebe34a69dcd15d2dc5efc062050d183ad5a90180aed4e5b3cdadf4
 AUX openssh-6.6_p1-x509-glue.patch 556 SHA256 b37b83b058ff9fb25742d202e0169afc204f135012624bb2811dcacfa9fb346b SHA512 e9535477fe4b0232d2a06edb9f73d8c50baa77ddcffd166624ea8352f298ad119622347c62c1d1e555318e9e6c7d981d2e9b03c388281b6347943861e8813aea WHIRLPOOL 4f01d975e598ce0fe2160e52dbd8251fd5cdf95880d1ef09b730457620f48038156d4bf21c0810978bfc65c9feb90cdfed97aa20018bc175759096dcd3a044d0
-AUX openssh-6.6_p1-x509-hpn14v4-glue-p2.patch 1083 SHA256 9a831e866d37baea39b3ab6192e88fac06375113c71982dea896f9e23ec5f055 SHA512 d568e298a704dd104b66fcf110bee88d36f0f75bd5f3124251a74adad76da2638ab6b53f2836c38a174d33f7ff9f401794b2d76681203a05a18a57dd4bd90948 WHIRLPOOL f0edd7fa5cde127707168bc2356a069979ee519cf8dadb783f85b635b94fd2e6d921d6c720355126e17acb6cde51bab0c8ce4ae5c5963b64393e7ccffbd4857c
+AUX openssh-6.6_p1-x509-hpn14v4-glue-p2.patch 999 SHA256 748f7caa953028da111d6f18ba91652a4821bc9bca60f5d4a90a6501c0098853 SHA512 d1b3790fc164c803e81c803b9e19e0bc351d2b9f353edb1d3531139898b372731b46fab5974a084830b2bab889b06fa33ce23b7d941f7d61da073c1bbfc5ff51 WHIRLPOOL c1d674b8e1cdc48dd0d8b2e7c8bf8e68cec757578f1217555e37eda8723e83e93b2ce183462499ad2165723eca2350544f810a1d6ec95ce4537a527f7918f117
 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
@@ -56,7 +56,7 @@ DIST openssh-6.3p1.tar.gz 1201101 SHA256 aea575ededd3ebd45c05d42d0a87af22c79131a
 DIST openssh-6.4p1+x509-7.7.diff.gz 220934 SHA256 8b490a9ce1afcaedf12c5b16f83147a6dda68213f498aaccd3f970cee6a1fb7d SHA512 e56c0567d836b2dd0a21cfac7e4fa46f2eb1d6a3c3fc831da7f1fddf9b365a9e851469bf5b79556b397e698477e597add10930ef11429554b83e7727555247c4 WHIRLPOOL f025f23b76c0c1eeadd065c03118c32c425e0ad390ec65c73736e1f611a5fd110bcab83109cc69533aac544035388946f2ac7ba70fe0c8f36c5dc8c265c521a0
 DIST openssh-6.4p1.tar.gz 1201402 SHA256 5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2 SHA512 f87b3e1d3110b87c1dfff729459ff26024863480c8eb4449b9e3b0b750d187acdfedb199ca4ea133b5dfa436bed0e2eea7607392d451b18c626c4dc1d38bb52a WHIRLPOOL 3737ec70c724a240b8eefb34a5c01974a9c3a8ca0f20b52d52f106b066f298119404b1f5a324c2347d3d8bdcb2cd1cc06e4f0c5b6c7c895d1d394a97cc591f72
 DIST openssh-6.6p1+x509-7.9.diff.gz 224691 SHA256 463473f75c1dc250ea4eda21f2c79df6f0b479ea499d044cb51d73073881ca34 SHA512 dc9ee7f0589aa0ba8d3c1c40c505f99a811845d8952bf6bf6b8bd3a00ef4813f3b71db32aadf252d7a320a8bf9cdcdf30b71292869d7830cc42f15ce3d1f3c49 WHIRLPOOL 61158e0dac934d375758904382882e7cd276d076a95ba2be32d03f4a7c7969943bd8d63c269ff16ab78928d7c97465f6e417730be14b5efacf64a029e2f950d7
-DIST openssh-6.6p1-hpnssh14v4.diff.gz 24541 SHA256 3f51997dcb48777d1c66054c718a2b1b9bdaed23c3481ccc680695e3d0e8cf8e SHA512 f2cebd401618ea6e23c9d74fc77c31c1176e0849811a578af3368f3b101b5b5ef443c310ee10b815874d1a83467654daff641549cbb550790bdb723ac3e7d188 WHIRLPOOL dfff921c7be8f5519d4a087187c0d5e0a2bbef2d4183848a7327b5e8314294a499abbcd8db8bf8bf592c1272095040319b43cca03ab5c4876aa4e84cd91289f2
+DIST openssh-6.6p1-hpnssh14v4.diff.xz 20932 SHA256 16dcc68c399990ec0c801d421d022ceeae0e3aec1e6ffd3fecc5e2f4768cc91b SHA512 7900ccf5ba5fcef5e6f3ed1b3263ad348a4bf63879905bbf9ce5212af64c7f4dae396989c67361ef1b5dfaf97a2d340b3bf75bf37f206b9a18ebee5d84044e2d WHIRLPOOL 163ce9e319cef4dcaf6f38f42afc3b75c6e89c38b43c04189c64c72b4b58bc3f9d7042c7b67243879c87cbe410a607296917e94ff042df2c0a29f2ef82792774
 DIST openssh-6.6p1.tar.gz 1282502 SHA256 48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb SHA512 3d3566ed87649882702cad52db1adefebfb3ef788c9f77a493f99db7e9ca2e8edcde793dd426df7df0aed72a42a31c20a63ef51506111369d3a7c49e0bf6c82b WHIRLPOOL 8630c81481a813a92da9c302d22135fe519fcc4826a892080e5a15368d13a6b47947ef47d53aad0a34e6ea49ce4caccc8f06e8afc2c90db0402fbcc2184efe89
 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
@@ -70,23 +70,23 @@ EBUILD openssh-6.1_p1-r1.ebuild 10300 SHA256 898f55671d0726c3b9c4abccf82311a68ec
 EBUILD openssh-6.2_p2-r5.ebuild 9454 SHA256 ed6988f5eaa2242f3344c7aa72bf76d83443881d88cd53b0bd4db7a7384a07cb SHA512 d0ccc242efeae257bffd53af70629c508e948835526496c95428be210f4e9c5ad4508f0198db6406cd3bee13da584faba3ee6677e1e79303d281ba4842fc1cc4 WHIRLPOOL 052e89e2eb50b35f73a13a34e6b67aa19750f883781fb7f4fc2234f8ec7df514308c3583e4afa29d3481bd47a20da0e6c87ea806534b23a6a628ef4b64f80493
 EBUILD openssh-6.3_p1-r1.ebuild 9457 SHA256 d6c073899d89a323598e5745cb8f10868eda0a89466e7ee1f2fa04b075d62cc3 SHA512 45a18e1a9b931c7be5d938745ce05de893959f20ef528aebc318491ab840a6aecf304df4e4333f2d900d714b0d5a9a869b668b8cfc649034af3c1c29014df916 WHIRLPOOL 6b0141bcc54178f0577d6d0dad6813560b2a94f1ab389e5ac3e06b019b499ac717ec2e9a9e97f91a1c655fbd251b262ad8990b7504f76649ecbb36de97fb786e
 EBUILD openssh-6.4_p1-r1.ebuild 9388 SHA256 504efacf3283016b3db83ce84bc083e300e510d041dc6fa9e41f01564a3dc580 SHA512 2455f68a46403649e401fdbcdeb9e6108f1f16df130240bb256fb96f7395dfe9861c725f02b3b8c709256a2187ec1363d1faae9f21f59b55add0161e96f90de2 WHIRLPOOL 6a59666b7a676f42db67063679d7d68e725dd87d67a8033880fa1605683d45540120a08eb6dd9cd37917e6eb99100e38010754da4c72adeb48b6664da89d5192
-EBUILD openssh-6.6_p1.ebuild 9607 SHA256 b76e0a3ec5572e47df9025d22ceb4096d5eb0113661cb4c8062968f831973ebc SHA512 1a75b0aa88a54c62163f306f405090472c1733c6a7c7b8d329f8e03dd4e679a3881560939d8dfbc4a3c43b774c2a6593f77db0dac5e148bf1a9c91b6de668ce0 WHIRLPOOL 4918a736ac165befc0fc803175f7fd79c651b632450ca7e180e89fcd1cc9394d4db2810138fbd8060561e3faa130770c2b96386f2c8e349b79e4fc4f1e64dc8d
-MISC ChangeLog 83175 SHA256 4e23bd28b6d5ae002450d393daebc15a06bf955635c41a2d361a389ec3dde015 SHA512 6aec3d00f6071d5e30301e7fcfbc1c76a225c6374a2797b5bd9786d8d247cac20a509b86f95d839772b8a2d177f7ad21ab2948cf86f974d5ac622a8418068ef8 WHIRLPOOL 44bb7abbb0b8c80a7cdda0dc7cd6e0b71b2d94f458d35e39c4994856f6568c22f5355b218aa6662db8df945759a9ce55c42238566ac091e0e0fcc1b1744b0b01
+EBUILD openssh-6.6_p1-r1.ebuild 9737 SHA256 a3026bfb4f46f9b3bbeb4c07d729e88626f6df5d07e8979a2c9aa0788e0b73b5 SHA512 cbefe5c068251d22b33a3fab3686a1cc0b3d67e7feea17ebe58c565809370cb2d34d9e97c1eda59efd1cba874012f0e5cd765493853d0e602dfd0836332b079f WHIRLPOOL 9635ee10a6e6f4008a912fec2209d2fbae3a2b562b161a4dd49afacc221fb0efe89cd1981f029290ce0ec6ec90d5445a068152df64008dd89a06d4e030849576
+MISC ChangeLog 83461 SHA256 89787e9df6dcda7b4fb83b41ef10cd81a101e1e34363199d1093ad1b6238ec78 SHA512 700e74627081aa7981ba0e1a6caa0c0cbb6f6b2ad297eecc0ebb1085d0cde15519b802b32b571ab12eb52a532b81cb1973d7eba486783c3b549514a49c1679c7 WHIRLPOOL 750008f5eaf846fede9c00150354dfb686561c911b21f7bba9538ee1c9b5221ffc29682e75239cb242c3058e0f1b636017c913a6cf5476184472f9997bc4f3a6
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKzDMAAoJELp701BxlEWfqI8QALiAAoaxgDShU853a9EX+XME
-a3hhCeqhbWTqf10EQj5Y2DPUEV4vbNhjUyHcTNQ0ecGtjZqdaGaZvPGk81cLdUNE
-gWoub8/254UWN1Mvs8EpFaOUWirmYoku3f5hENAOJfty3TzsfUyw7khUq+T08++L
-pNWJDDJ3pp9B3y41XKCh32JAOlPst1XdhkGHGJTUuvNcXKjDcg02Oi7cjkL7e4uH
-s6Zd69a3Mq4F23NiXH52eQ1u7sd55yD+8i9z4ktcfT+z34mv9HDALg57aPBgoT4r
-ZnvevxOI2XtlrjeiD1wB0Vg99FrtxlHs75msk4KyErQTWLoeaqW9nQT3/Uy6cpSM
-Jkj2NzmsSwM8UAUDM8t3Z95IZftACeDT3Z17wUSA2PCo4gSxe70QRHBE+967DQ82
-Ze4P2dhLe3WcGLxaVjjXgU/lXY8QMbRuM7WgWe2jQJgIT3Fo2cpXxfCMk2/97XCI
-syDmYbfIU/3PN1PdBlOaQWDywhbUUHuxtzRoSuK6PMcTQlFuuppK73BS7nXj5fLK
-EdnA72GMGiDHEZNOcQO3LIXtWe5QKOssb0aonFcQRUvoO2/aM/USm3x6U2SZWVZ4
-eUuhgv31raWrUZHAEpH8AzyiPeZNp3/ZlTHc7juCG0/yScvBX0V4cTAmc7XP0sOc
-UqSfOWKhiWv6EoiA3HUp
-=dsB4
+iQIcBAEBCAAGBQJTK1LFAAoJEPiazRVxLXTFJzQQANd8RHzgSEhgkZ0nfTwyRy69
+tfgUQMwjHlx2SbYs/f8Q1FgloP7V4BLDAeJ1VABKOTwXaNu2iVOiAmaBKdK6d+gH
+RYvDbhGFBGYJUarLxMCham9DT+SpaZK9fKgpuNyKzRNlh59Z36zVuWdGDNI0VRhS
+9Txx/tdkrQSrBBqiwHD6TEVqHK+1uIBMzuhI8gp2o7O0gex0e5xODD2nH6G6I0cv
+NNCMnxysU/LArOtIy8+09WMGcDx2x44vF6WpQaFGAoALmypFPhmsuNRjBnlynT9G
+hB2J0v01cN/IpQkBaQsJTIrYM6rxiHTm6j1RoAdj52HB9FMCTeCm8j5F9r/uUmLH
+SU2sVs7eKLMmrNDZJv9nxhzpJuwSc9VEkn6npy5nc9m34iKfkJCFFiPLPF7eSy0K
+oogWN73mbj1qQ1Dl1GSRvdzr2C0JWgCELJT8K2aihqN6+HI1obhGc42unzWwvQnT
+srakZaABm+pz7Fggg+a37AHOKBe0Td+cNigBIao5+pPrcZNZaOrWvQv4go4XXY+M
+IvatLbgYdoaHy/cS+Y/C0Rx4cHmrQ8BTpRtTDFJRaaQLagx2iz++NCAAmB3ZP6VG
+3F9W33c7fmj9lp06CVmPekwIXkRCYOjesIQvRZh6PNtXP1Qt9OPMNgf2yZ930Sfj
+6u8c/Q21QVETqMOKLqnW
+=5rjA
 -----END PGP SIGNATURE-----