Fixed mistakenly replaced @ char (bug #519076)

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 29 insertions, 22 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 3972f13f5dfd..336f783b3eb8 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.521 2014/04/25 07:11:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.522 2014/08/04 19:35:53 polynomial-c Exp $
+
+*openssh-6.6.1_p1-r1 (04 Aug 2014)
+
+  04 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -openssh-6.6.1_p1.ebuild,
+  +openssh-6.6.1_p1-r1.ebuild, files/openssh-6.6.1_p1.patch:
+  Fixed mistakenly replaced @ char. Thanks to Luis Ressel for reporting this in
+  bug #519076.
 
 *openssh-6.6.1_p1 (25 Apr 2014)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index c7f0bdaee2c7..f6d919ddc561 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,7 +7,7 @@ AUX openssh-6.3_p1-x509-glue.patch 555 SHA256 1166dba2fe590dfee70119ce6dd79f535d
 AUX openssh-6.3_p1-x509-hpn14v2-glue.patch 1451 SHA256 d7179b3c16edd065977aaf56a410e2b9b237206fb619474f312972b430b73c8d SHA512 02577e3f718ff994bb4e962189f17048b4c03104d0a1981683f3c6a1d6d30701db368e132102c8396da2c0f5eb2f6602b26f32f74d19382af34bd9a93fc508f3 WHIRLPOOL b7d224d71634f380bd31b3a1dd3e588a29582255f717a6a308738ad58b485b693d827a53704479995ec2ebca53c9dc9b2113d8de52a1336b67ce83943f946b77
 AUX openssh-6.5_p1-hpn-cipher-align.patch 3024 SHA256 c79e3a201b2150e2fbc1e869233bac6acc27b2b126d4539cc09aa651fb2e60af SHA512 6efc2fa5f0e9b508e162bf20ab21d2c639888250387fa58ec0d812c7b1db125d8c654a0286a8ffc0d5530e5f0ec0ed723f3a5c0b7bd593b356aee2e811a1f4ec WHIRLPOOL 729c14b8d6f55d789ae2ea0e9cb2e0a4caba62dffced273de5c7254732e94673c1dc2d9e260d56e3a641e03ebab55d61c8ab7541fbf75957855b811def115677
 AUX openssh-6.6.1_p1-x509-hpn14v4-glue-p2.patch 1003 SHA256 e22812a235d2d9ad5bfe0e92dce104429031c8c7d3cfd1bef271e68dd30545c7 SHA512 16dacf6caa5bd622274b08d643a55fbb47f234481a72e4de6989355fd8580cde3d55e2039fab925e72c9f5a7fcf8de7c2f1c5281454df1cb190c966bc1a06ced WHIRLPOOL 093386515423ef78ea39de1657b2b8688e51147172457ea3253fd469b3b3d9f364565a21f979cf99876a3de75cdc5e9a97f743fdedca429e4181f021a7dac224
-AUX openssh-6.6.1_p1.patch 5817 SHA256 94304e311d7e290d97ba017d07fc89ba7de46af9f9918b5594bcaf8f25567661 SHA512 0cd29a21beb038d1f4093d0872ad477942113e9c991153d3c80ee8aa02c1e7c7108c6c8f85bb097bc0f9f46ef6e05f7ce4c6ee1a55cda1ee39886a5d0304f606 WHIRLPOOL b464f6e93b4036ec87652e3489b45fc15a821264a7458177091637fd0195ffbe36abff4da3afc84927dd73773402a0e7b1c2c4af2532b1d710d820247526c635
+AUX openssh-6.6.1_p1.patch 5808 SHA256 de51ab9b8e7454223961487e07aecd82c59d3aa53f6cd47802089b4531674b2d SHA512 dbb00268579a067f835af83f77301ff3758e0cf63bf173073ceca7457e22635e9ca9482955cab21327894e390a8608e6f2463dfc658f8e75f36bba893d8bfe62 WHIRLPOOL 59cd55d08e32cd98db3f4721e09578a64c724b1bee7945dcdb6381fdf70d0b95c5a98977f2624a86eccf96cc9edca0fb13183571b539c4b3feb7e4fb1be3609a
 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 999 SHA256 748f7caa953028da111d6f18ba91652a4821bc9bca60f5d4a90a6501c0098853 SHA512 d1b3790fc164c803e81c803b9e19e0bc351d2b9f353edb1d3531139898b372731b46fab5974a084830b2bab889b06fa33ce23b7d941f7d61da073c1bbfc5ff51 WHIRLPOOL c1d674b8e1cdc48dd0d8b2e7c8bf8e68cec757578f1217555e37eda8723e83e93b2ce183462499ad2165723eca2350544f810a1d6ec95ce4537a527f7918f117
@@ -22,24 +22,24 @@ DIST openssh-6.6p1+x509-7.9.diff.gz 224691 SHA256 463473f75c1dc250ea4eda21f2c79d
 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-6.5p1-0.3.14.patch.gz 18217 SHA256 ad678f366dd7ef63ee164e29b59a4a4d264de9ddf9ad2c1d59178779e83539f3 SHA512 16f0053663ffc9a0670dbf8956dc070e6891e1e47cb1fbbea9567a6a4368c5500bf7e2ff7a2eb7208e651a0121088c271fb0a6ece62b98d103b3337866374610 WHIRLPOOL 34ee5a67e4cb0eb5d8126fde5469b73e0c81d4a7795cd9849c671922227eb8a6767cecf3097acbff338a47c3a7930b285fa4ecf2ebe74cb2e9186f93ec70c40c
-EBUILD openssh-6.6.1_p1.ebuild 9942 SHA256 e22a5d870c7df47061d0afbac2c0c5f11d015a51aad6e7ca6b6f5337e72b97c9 SHA512 1d83572bf34d95687a9c36d2680e3e888d1286762a5300b06d5f81d741802364c056d3b879c79ccb26517d2aec59435a99ba22051aef3e379824b79ee2fe9bcf WHIRLPOOL 29828c94bcdea63fece0a2e7a00ab5594e85cb052cf1177ff9353c5986f494f51b98aae44d1bf9754869a765131b4a74a3f2e2fb20a1e6c93bb293e4d50aa675
+EBUILD openssh-6.6.1_p1-r1.ebuild 9945 SHA256 021930efcc3ac7f6ff43420f93095a27cd376cbca738c5c1507416c17d3e3737 SHA512 b0b9bd5a9f72de313bd071f52bcd2c8596d11a486ae20e9cb61f6322867bd5351cf5219e7ce7f8f8039422e669c36143e38e073be6f9dea9841cc1b88b7d8a1d WHIRLPOOL 5166181979597e9271911d13a8e5b5fe4bd79baeb50d748a9c77a5c282f711c92e81eda4753feca54faff7b1c5df6768cc538a1f45b1ad5b78dd9bd68d3d2869
 EBUILD openssh-6.6_p1-r1.ebuild 9874 SHA256 223b5e4c5d0d3152e8ffadd20e8bcc391620c779749cf6ff235f0d3a857f7409 SHA512 3104586dedfb189adc780bf56cb030f3a9c2427fe07ce340424ea4e279b6335653b2eb38f9d86a8f6ac76360cd94b87d858863fd79b2054763f72ccb83f1a0ed WHIRLPOOL 1bef688d59baf3cf10ce3ab60f3eeb6e6cf875989ffcf711628f56b34a1344838c3a46ae548399c49f11459e5dd2045fcef810691421e69ef02eb92489c22824
-MISC ChangeLog 86087 SHA256 d228fa486b75ec96ff621d7092a8985963c513a063013c486d66cd999bdf25f6 SHA512 f5bfd7c52aeb31646d0664179210523f02ea72e976c76b9695b17bd32137380465c5b4dc2e469e17ad5e3f02542555748e4aad42d54a56f57699ee36b3858456 WHIRLPOOL 5932b005760a1f9c4695a7493154e1eb0aeab5c5df423229e735d0513699e6a9d1838f87ca89b74bcbda353534ebe30171c257ee6731ccaa0ccd2cf6b78096c7
+MISC ChangeLog 86360 SHA256 578ac652191db2a7c59cc0d6fedc360b7a7c057de440719aa5d73322ebe1b114 SHA512 220510b2441d274f2f68a6f23a4f5f3a6bd017578ef20870f13261e99cfba4a2dd39029d57938fd0bf7c54bdda0183da7979c0e22c416efd2bdd029d9aaa10e9 WHIRLPOOL b66386f6ffc81201b6600557c24ecf95221a1cde68738a1c84bf08c0c49151ab79fb4dbc2bdbaa6f5951d85e73506df12a42717bc173948112cc298de1d6e9a2
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTWgrAAAoJEPiazRVxLXTFdIkQAIOF7SLpIDS02wx0TP7zs6rv
-GLj+3H3PwTN8CteRmm12jUYWZ5xQE2VRdE+l0lbNFhMS3DXkXJjmYSLe41m7iHY4
-RrfN9JNXzxOczj2IOOeCU+NYxvCooDVDV59U7zuOGc2jwf/Nfp/DhWETsLXlFnWg
-VUE9NmWkVt8e8+RKisHUabBeTKWnQWMSbHx5dFL5C/jTgv4fNqN0132VBYBYc0cO
-a1BufvLt+p6mKHt/Q03Qz0HjrI+IuUupsBVpGukS19A6tMJDJVaBtHclvK5bwsi2
-CIV73dDFU6VqVN+YalhOhFkf6pBmUpdVjsSSQfnzvrQV/dZDZtZ0Pt+VgHsomCoq
-2GPpTcyBZXV/HVxUXblhI0zjYFUtmQonO9tsGEd3VDQxTfZaqJmDcRJCI8ok4FoG
-BSM//TUnwMhygdQyF2QacWbxI5ONQM6eUd5/KGwcULzcs5wqYjSZWIwTUq/I7Sqj
-7ZYcd8oAtwpV8OiOrjs6B7znn/rBR8lBRPDJjeAqtlfAk9Lc8RCoWuNaOkaGsSyI
-rgAR1zWjafgokEIKf56b9ZbIgJGO37v6AIdJiPR3OrKGfbx/r3NtgSWPgfHfmzoj
-g2G2OkGu5VKOL1j6MiZeSjxnFgCZCKo9ZYM1SqPaX+P/Py6f9u9iCuAh1wqEVatR
-5apVyMiMls/63DWB9U0a
-=szWn
+iQIcBAEBCAAGBQJT3+CaAAoJEPiazRVxLXTF/eMQAMib5wBNnhodGt3xC7lfzbsY
+Er1uYV+R3TQsC/b5ewIy0wqXEGJdg7crb43xsw4Y/I5jErPVcjJ58BGNBWQ8Xz1z
+YdHsuUx3rXXmPxEubCEiT3Kfe3w7X3Y8OjNzG7MEPQV13jci7ebc8dNfVuwQYwNn
+QfONlk62NcrQMER5eXBTIjNhHC9XWroFAQpDNZGVRhCkVVf6Fdb9CThC6qnAIO0S
+Z+AovX3pDkxU19DHROUSjjksmjhoXf8nwbF9SYnXa46/L3W7D8S00HIOsTjMThrb
+KiBDwoXejlmJQgigoQdQl1Ex+UIWz4R1mS7gYAcVdP6VWZE57Ef9sAMZ8dANT5DK
+cjiPt1orMVn+zKT4ON7DMxyiGQPqJZu7wGIZSvTYmJYqJWHYInorRxwmE++4NFLH
+fUt2SYaLS5ER7mS46hexbh1y7R041/u3pfaStvxeYVPZIbTw/Muw0XpJgcfJKPok
+fspqsS8Q2ZCBVICyuux+4L/oXBJaOO5ncDbyMT1jGiuktA3BMul3w+Z4bOFeDybp
+ZbZgLzCKcjmKUgh+Uw28rK/JsnkN4GmuIe1JkRGNeUVSHOucJRRNyHZUpl8MxS67
+TrIx/v0m/OBAdziwAFxFjhsV1izwR7ytQ/Y8auU26aiAN2VQK0WDhEpZWMtadFfF
+KCsWZ5wSQq2cg6lhbPA+
+=5v/p
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-6.6.1_p1.patch b/net-misc/openssh/files/openssh-6.6.1_p1.patch
index b11f6fb1a75e..2a8a87cd5276 100644
--- a/net-misc/openssh/files/openssh-6.6.1_p1.patch
+++ b/net-misc/openssh/files/openssh-6.6.1_p1.patch
@@ -75,7 +75,7 @@ diff -u -p -r1.82 -r1.85
 +	if (!(datafellows & SSH_BUG_CURVE25519PAD))
 +		return kex_prop;
 +	debug2("%s: original KEX proposal: %s", __func__, kex_prop);
-+	kex_prop = filter_proposal(kex_prop, "curve25519-sha256 at libssh.org");
++	kex_prop = filter_proposal(kex_prop, "curve25519-sha256@libssh.org");
 +	debug2("%s: compat KEX proposal: %s", __func__, kex_prop);
 +	if (*kex_prop == '\0')
 +		fatal("No supported key exchange algorithms found");
@@ -153,8 +153,8 @@ diff -u -p -r1.62 -r1.63
 -/* $OpenBSD: bufaux.c,v 1.56 2014/02/02 03:44:31 djm Exp $ */
 +/* $OpenBSD: bufaux.c,v 1.57 2014/04/16 23:22:45 djm Exp $ */
  /*
-  * Author: Tatu Ylonen <ylo at cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
+  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
 @@ -372,6 +372,9 @@ buffer_put_bignum2_from_string(Buffer *b
  
  	if (l > 8 * 1024)
diff --git a/net-misc/openssh/openssh-6.6.1_p1.ebuild b/net-misc/openssh/openssh-6.6.1_p1-r1.ebuild
index 50c2d746c73d..70d238c20871 100644
--- a/net-misc/openssh/openssh-6.6.1_p1.ebuild
+++ b/net-misc/openssh/openssh-6.6.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6.1_p1.ebuild,v 1.1 2014/04/25 07:11:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6.1_p1-r1.ebuild,v 1.1 2014/08/04 19:35:53 polynomial-c Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator