Call epatch_user #473004 by Jan Pobrislo.

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

6 files changed, 35 insertions, 23 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 76e246c92258..a21c5c1a561e 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # 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.471 2013/06/09 23:01:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.472 2013/06/19 02:57:15 vapier Exp $
+
+  19 Jun 2013; Mike Frysinger <vapier@gentoo.org> openssh-5.9_p1-r4.ebuild,
+  openssh-6.0_p1-r1.ebuild, openssh-6.1_p1-r1.ebuild, openssh-6.2_p1.ebuild:
+  Call epatch_user #473004 by Jan Pobrislo.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index d78fb2c05037..0d6b25623f05 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -51,28 +51,28 @@ DIST openssh-6.2p1.tar.gz 1182181 SHA256 58690267d7455f444e87c2f8cd9be91fc686ffc
 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
-EBUILD openssh-5.9_p1-r4.ebuild 9210 SHA256 efed8260b1799d44b3d313539c7f88761761e665ab38b2740895d6a99405152c SHA512 e9344b99a24fce4c3f2c186108443079fc66b410373170e57d3be04a74678579fd2dcf136344ca820b8b7f75121ef924c4b36e6a2dfa11dc298dabcd8d91fb98 WHIRLPOOL 9add398de7095604a716a2b76f3bd5ce7cd8035304efaaa1a6a60557804c5714160d582a6f768a2024d8f466db31aca10b4028746d450f09c9b6874e893d6442
-EBUILD openssh-6.0_p1-r1.ebuild 9488 SHA256 f99e6f51f5fc1809cc093e84834699097802d92f8aee712ffcdf1b8548698c08 SHA512 10b19d45b60658e3c61fb74a4c6d4ae1341b4d1129faaa08ec3b655a64f1dc3625ffbe363add33c8e31ac5ebf66cd24415c2324bd5c8d23fad4191e431143be3 WHIRLPOOL 0c35ba4608a5a4fd6c65bfed0f3cde8e8cd7067a94bacf41104c2f0105146a5c79bdec873c2c3a6086637359805ecbb353a2abc9c6e0f2a93a409650aadfff78
+EBUILD openssh-5.9_p1-r4.ebuild 9231 SHA256 7ea0413a7f640b262017ff6958c5a7ff0080ba30ef13a584d71bd0d99863404d SHA512 02057684f6fbd5d0d03e2e6aa4ca75210bc3a15e0854583a9e30f42c14159cbf1e683cc183a8b76ff8a37d9e013de1725cd6632358d164aa68bef62bfdbb047d WHIRLPOOL 8e809f7dd31f9d9ade8e75231f99a4cc08620bc0932371828af29a9d8a2d8ab5272beeef646281f509e16b2c80948584e833db47a7cb5508ef335bb96ad3ca66
+EBUILD openssh-6.0_p1-r1.ebuild 9509 SHA256 1ba812b3a355e66e528f33217d7b6a7e0fbaff06bfc056aee9cfb61571860b14 SHA512 6cc85ba1e2f945384c84768bcee9114b7169fa55ad73b5c361b74b6fa981125d59bf555132366ed4d4ff2cc1fd05b0289c04940db06a1777d72303414c065482 WHIRLPOOL 0e8e9357134d8e64827c3e8e2cf0e0cdb327813f5436e1b9bcae68a3aeea7826f433f150131cdd08526928bab200ab9b218a7dfc9b1a8f36fa87a5c6c3d56e47
 EBUILD openssh-6.0_p1.ebuild 9485 SHA256 32c4280a8babafa169543a919f4cf31231c3d759a7c116b42e3c3981242c0d59 SHA512 bae20dfbea14cfc30f16c7619d63a4a4cb2546d9d5e903e93e3c4d18745c1398d42ab6580a3e10609d81e1020b8f54c35b6413e168775efd3cb8fab064d67f8a WHIRLPOOL 24d16d37714e69a0d4593b745feeb54853e8d7b2de799be8ed76c0e09fe9459da8a3bfbb67b36f120345fc24fdc307a346c4fcb79b95fd8831e8944383f36759
-EBUILD openssh-6.1_p1-r1.ebuild 10236 SHA256 575cedb9ed947517d8c934658bb87e37a9d09b986f76c94b937ef5922d861c17 SHA512 04b8f3b995ece67ae6d2a0f1f8c8fda93e408a7f351884cbe89b91470e5d82fbf469184f66cf2db6e11f6e40cbbae049276995e112428da424dcd8e93ecf9444 WHIRLPOOL efb7dc795f7060407843e266f69150ea44f98d3198941f7d21b9bed7e58f697a9c524fcd9b2851af11e119d1e9594e91845d05684c62bce61ba878230c56d250
+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 10222 SHA256 c44948364b250c4ac1c59368500f60cee3dd89d05e1271727ab978066512fa4e SHA512 db0c93ef3d2f001ed3e0b8ebc074ce7eaf9b4530a55d2c4afa55975811e1d0af8b45c0692a95c4cd1df3490e6f5ca203bff97e3adb2568b981357d433246a087 WHIRLPOOL dea3ecf1f4a539e23d8a447f7493703653d28793b2dd403a8f3c31aab587839188f30417899ed045ebd8ca9afa4ebadc488fd0bf3aa85c48ea46a4055bf1fc23
-MISC ChangeLog 76707 SHA256 319a7b794608d2fa93275c72589fc7bc7b927eb3e2cf035663b4022da40f7df8 SHA512 149909c8e30651e6040e033248ade23f679756081358b5df931820ac23ed08678407335defd299dea74a366b18d74ab0bb6dfdd8457422fb6fcdf2ed1f20208c WHIRLPOOL 82d6d264244fdee32e0860abbb50002923da182c4d1b798c4dbda6a899bc5be7e8c33799d6b3d5c9c9e7363a8d34acc884ca7060c091e7631c2a75c446e88abc
+EBUILD openssh-6.2_p1.ebuild 10241 SHA256 dfdd6d956fce1cdc4bf3aecc5950d5dfa7adec57560b1fc5aa7d2e412b9a0edf SHA512 331c2b4a8eca84e96057f06df5ca0f3f7b7d80aa3eb04892c491d6cf593f5c51e96751dcc6c9e29ed92b5448cf205b5d9640415a9c345e8adf215eedbaa95ec4 WHIRLPOOL 9204f2a7a117017d7acec3d2b3633d8068baba7b33f2acaf2168aa8e20e1f10b8cfc87fe342ea60d892a8edf9bf46a8a7c450c293fac3693c5e832706c3374b7
+MISC ChangeLog 76905 SHA256 a9076eb1b46b5697643d8988baf4a769cdce634b252ad86923b431fa0116b3d9 SHA512 b537703d648354000541ad58e394b2eec09cd3b77563fddf0673f2a37e37cf27591d259fa214a359f0ab58c44d6d035f3513caaede74245322fe52eb6cedab0b WHIRLPOOL b55dc9e5ef1b53d8869c9eccf93ab17a419df5a814bdd2d46cf0d726750c8bb5b552d40b952895f69807b3dca791e732466cfdfdff72c0036ecf761e85ec749f
 MISC metadata.xml 1837 SHA256 5f8be0245926a5dc8007dd78594febffc68bbcb45306630d027666872e664050 SHA512 76e044611e16ede9bb9697c0ad448c149131f1f20b84ef1000fb77d6cec954abd48542fd26299a372b4411aa0ecb161ed38396b2c3b5c11c71a4bc247e0b23ed WHIRLPOOL 46c8b0f7911fec3ca086e1601cfab5d03e01a7d8cd2069460975545438f6fa5964f138d19a70ec7db7f1f8c9c0fbb48dcec6ee8269fa9d7b432214e9e3e46806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQlYAAoJELEHsLL7fEFWUiwP/RI6HI6zAAxHhV0IRxbDykYV
-ybFZgitgEMrawSz2+kk4mO1R4tEksJFJLwgpzf8zftJ0D3ktHVa4irtZjzG80wTc
-H+x5tug2fdwDv+h0GF2qqJNlNiqRa5IQtrqra8SWWz8qY0Vj65ON0cYzGswh9cwY
-kDxzWgidp5++PuMVfRVg1cAzwbNtYMAj3+LWD9kZVx8wVPaOytQRgg8buSJwWeLa
-YDtaen4WoYclDYIbrzMpSvA9mxsiEBvj0n0Wt06qIKcfMrSMz04vnPUut0Mv8uyH
-3CvOY/LcLGP7NDElE7M1TLHMWTrGVmWpnMehqzmlB2AJfktwdH3HcoBH//zMcdTA
-ugs/8UO+cJPN74qgkglitkojx53QalDyqxFqJGrG8I2D97+y4Zfh0f58OTdHsmnM
-HTKwt8M7uupVwcTxwzqdedfnncOrIJvJ3kP2ye2A3S8yG+2WXVQKhHaJCP/mxc82
-w+VgWQKxHXfOH/DCK95EsJeHJhNgzU+D+boAZWMS3E0372SW8+fXRP9TEha+u+CL
-B0vV1bkzxSLp1142BQZYQSMM7/0hz9SAt1B7grpOHPQ6vLWJa4ezbA4r0VqPi+3A
-UZ9d7X+0NCyfh/35Aqqg6fR/NzQjkjwqclHZ589XXPYPEsbeatZDCH8R3kT4JuW7
-aFl60+IPKzPZC0T8ZsVg
-=QU5s
+iQIcBAEBCAAGBQJRwR4UAAoJELEHsLL7fEFWFdIQAJuqWvteU/cavmMvoqYesaxV
+gbxVm89bvxSG5Ifwrc6vJyXTDvX9IXTs+yFe7yovTgECTSjXNClaainDfSn1hG3C
+5tRVbjYxIqIJfvUBEYQZPzYyMiVXMKTnrIJr+46u8JMR4uoFEzUHtOTal7ksRERj
+GE0VUqznyyYE3HVlMeYUL3evaLaIy8xSOkilAeu/vXyExvNd7xX410YjxR1ZFi5a
+x24lc8NqRZgzGqZGgrOQB2PoVbRysdeX2D7RYCYi1f5gCyc6pP6n0CLwOvdl6ENa
+g3PfmQ1KXXa8uESELjkGFyjTd/7HkoHMyT/ZJMvPgMLa+4jw9g3jwf458VyU9b9c
+c4JUWZPxbLMpKUAApKbSY6wH+uAV725Vy42CbmuYEJPqA6xRO4OcG0sQeTNOlTN4
+DkMiYVXuLsfSzAt0twF1kxz41HRu8Xj4k8kiHbrDOQ5aok/Wd8CrGNNetJ9m16cM
+9EgBVZpavpwJlra5SdAM1CY+dNfau00xpRz0NeSQEc7XjBzQEp1kdILVMaGdrpGl
+vUm8lKcyGpU8KAIVxPE1RC+8shwCkD3Ni6ieUK0s3dJgIr64pGsM/bwFpqDL7dXr
+d/PQKW4kuZR6kh9rEA5o0Kbjp1N9ThyID0q9tgH9wU3IiZN2xPl94sPeVv5hj6oj
+l8uiQ6kh49JfLp7dYMp1
+=3om1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-5.9_p1-r4.ebuild b/net-misc/openssh/openssh-5.9_p1-r4.ebuild
index c8718324d824..2383abf227e0 100644
--- a/net-misc/openssh/openssh-5.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r4.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-5.9_p1-r4.ebuild,v 1.14 2013/01/18 01:14:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r4.ebuild,v 1.15 2013/06/19 02:57:15 vapier Exp $
 
 EAPI="2"
 inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -123,6 +123,8 @@ src_prepare() {
 	# Disable PATH reset, trust what portage gives us. bug 254615
 	sed -i -e 's:^PATH=/:#PATH=/:' configure || die
 
+	epatch_user #473004
+
 	# Now we can build a sane merged version.h
 	(
 		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
diff --git a/net-misc/openssh/openssh-6.0_p1-r1.ebuild b/net-misc/openssh/openssh-6.0_p1-r1.ebuild
index cb4ec8d2c046..697678c89750 100644
--- a/net-misc/openssh/openssh-6.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.0_p1-r1.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.0_p1-r1.ebuild,v 1.5 2013/01/18 01:14:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1-r1.ebuild,v 1.6 2013/06/19 02:57:15 vapier Exp $
 
 EAPI="2"
 inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -126,6 +126,8 @@ src_prepare() {
 	# Disable PATH reset, trust what portage gives us. bug 254615
 	sed -i -e 's:^PATH=/:#PATH=/:' configure || die
 
+	epatch_user #473004
+
 	# Now we can build a sane merged version.h
 	(
 		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
diff --git a/net-misc/openssh/openssh-6.1_p1-r1.ebuild b/net-misc/openssh/openssh-6.1_p1-r1.ebuild
index 711aa7772584..023a1c3829a4 100644
--- a/net-misc/openssh/openssh-6.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.1_p1-r1.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.1_p1-r1.ebuild,v 1.5 2013/02/21 05:30:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1-r1.ebuild,v 1.6 2013/06/19 02:57:15 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -142,6 +142,8 @@ src_prepare() {
 	# Disable PATH reset, trust what portage gives us. bug 254615
 	sed -i -e 's:^PATH=/:#PATH=/:' configure || die
 
+	epatch_user #473004
+
 	# Now we can build a sane merged version.h
 	(
 		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
diff --git a/net-misc/openssh/openssh-6.2_p1.ebuild b/net-misc/openssh/openssh-6.2_p1.ebuild
index 95c6cf1dc3c4..cbe4f9a7ed52 100644
--- a/net-misc/openssh/openssh-6.2_p1.ebuild
+++ b/net-misc/openssh/openssh-6.2_p1.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.2 2013/03/30 04:29:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p1.ebuild,v 1.3 2013/06/19 02:57:15 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -145,6 +145,8 @@ src_prepare() {
 	)
 	sed -i "${sed_args[@]}" configure{,.ac} || die
 
+	epatch_user #473004
+
 	# Now we can build a sane merged version.h
 	(
 		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u