Always specify pid-dir to avoid configure script falling back to /etc/ssh on broken systems #435668 by Piotr Karbowski.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 37 insertions, 22 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 71c3e429bdb9..92e73a281823 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -60,14 +60,24 @@ EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc9
 EBUILD dhcp-4.2.3_p1.ebuild 7211 SHA256 663b373b3661a23ae1364ba18a52ade63022aad8229bc1b275cc82d110b07253 SHA512 469187bbf12ab52530e85a9227ae9d52aa617aa9a16732f21cb22e3987e681dd44b69f7c4dd3c5eb9ec207d8ab9ad34d1a61504d8a24c23eb3a494845ae6564d WHIRLPOOL 23a042697190429f090e31daedc663059c00e6228e8b9193e78f30e3799fa24bb7a3e25a3b58bed3e2e70d2ff5d625916a06b91d33580527005d96357082ee18
 EBUILD dhcp-4.2.3_p2.ebuild 7242 SHA256 cb357fc0589a09af61868fedcfc31dad70df8278a5ef78a1cd23ae96170ded9e SHA512 69eefa262861c301d5de344eaf45dfc88d211a1b0434d6898fc8bc802ec8804b7e588d5dec524183c193c2a8d41e95eaa0f2272ba3fb64a37641ce45df3fc86a WHIRLPOOL 5b0263ae207a72874c4d3576845d8f973cb768c22b2b19993b0eaa78f83f20984da74fbb35ec45725fa7f2b56666c26b7c26e39112414da194e640a901f248a1
 EBUILD dhcp-4.2.4_p1.ebuild 7236 SHA256 3d49361c1f952bbc3e14a46b872f33ae6cac102842ea6c6ac2f5ad326dd90da0 SHA512 d00831932a3cfdb7ff0cf451ccb29a22812a79c82800b4faad9d82289002728744bfa58046f60dcaaa08da21657ea10818a8eaf75f7ee24bb8d8d6fac3c136f5 WHIRLPOOL 47259067563ecb691837308974f57c98a4c79339ee19f6f2afc8b18e6d3e20425d70fda4a5ce731680ebc901357607315dfc7e82b6e1e54dfc6c4be0324d02f7
-EBUILD dhcp-4.2.4_p2-r1.ebuild 7459 SHA256 c6eafd4e540351031d403e182d5cf2b47d90034132e6e23ceb9d2bc0033d0680 SHA512 607af624d23431845376663f8881752927bca67060a51d2b6d8099a98c04169455c8e53211215fa1ac3051bd9f021df2f8c23b2987ae0138534e9892e76627aa WHIRLPOOL f74353d7c611744296ebe07465037407a594ba4717a055d54bd84984562ea833a9e6acfaddf6637ddf6d53482963845158a88289a559c9bc2e62716ee50b71b3
+EBUILD dhcp-4.2.4_p2-r1.ebuild 7476 SHA256 dbb2b560cb29ea6fb1991278b1c501e181b7202f9201c3bb3ffffc77c34d2115 SHA512 a13a4b8be38fd23070f00f8dbd227d098f0b4fbb52a511cb5a62a295b05a7af63f0901a6d6677d8a0df7fef57f90902eb4cc1df312ae894f1e3149788f85a36b WHIRLPOOL 7651396aff24754e23707d86f3dc6f5a08358d156218629ebca5cc257605e307cb50700504186a15af05a7faa004f45c2bf0283966afcc89e64345a9579b492b
 EBUILD dhcp-4.2.4_p2.ebuild 7327 SHA256 a1c6c99e971ec6ac0e10853b59923dd4325f2858d52958f372677eb6f02929b2 SHA512 54842b54e87f7e13f52911c04ca9fe78e60b451aec4dcabd2eda970c69e185b692f31d14b19f73bb50a77fee7fcef3553b472419db932e2b68ba3171f573a9c6 WHIRLPOOL 0aa7f7e9be8e5b5a74c5beb622bf7441419035a5e32567680d86e52d9f5ad2a8348f079f93c2cd7381984f1e1e85fa4e646f0a0565652d62a93219dce2ce7d19
-MISC ChangeLog 37700 SHA256 15d28c4458a02d0ef6ebce1ce4ae397177355df1f47cc31a0b366741d8e54ade SHA512 07cb9a7c1661635cf037fbd8c899945c63ed66f991b3b406a0c657b0c1b44cc49fc324682a0c9d531bca2e6a93f64ae4fe3eca72629e954d3c849440d89e0ec5 WHIRLPOOL b7c6112a413ccbb9a68358cfb59ba72426264cfcd573bc7d7fa0d17de135ba6728115a3d93a82023b18a3fa7878d2b173606e5b71ad2e48d4b4dde8664ec1b44
+MISC ChangeLog 37871 SHA256 2782e60e84ce0c1513ac4e9c36228b13b496c07916d5e37e1c08aa0c2a1d60b1 SHA512 60d32e9909df079aacec16275e9c07705158bcb572c616828968cbadce1aa9e9482c8a7d18bee653b32e52413792fa67af373ab0a306c4aaf5d198d4e7f520a3 WHIRLPOOL 857899a023bd7813e4f3ffa58bab8c16a283caf476018ff50d0a385f7bff93d3bec0f0d83fb209956bcfd6be56ad69ff77d8b05ae3046055cd5b4ce33000880f
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB3V/wACgkQl5yvQNBFVTWIOgCfe82Qc14hMqD/MOnkhV6wswTR
-WWAAn3vp1RdYhUqgCHZZMq5aO4g65YXl
-=syy9
+iQIcBAEBCAAGBQJQeGvEAAoJELEHsLL7fEFWEVwQAMDOVS+THL5m+K4GSMwbPAhu
+umiGvxhDlcr2IqVkRx/mDtvAKHAZZR9veVXgzsxKd4fPu0x5rWfzHHrr+dcFO70u
+sZdVh+7Y+fS4o4ZycU01NWyDA+A6SVwIoXUbYfWgclpbgpcEfC6OzRxETqykB1xj
+NUtlWPhoj7WbIUP5grBZOimaPaeHNCNHb9oCIxcWOQJSCRiS/SzwgsMjcseO0u7L
+1Zv8OKUoFMbwTQWFATuXSKSkHNDkttQ+y0ww22I83FlNDxyohw5MNZDDJWFrRWyL
+O7XXeHpvBixbWiVEzUcDQTxoRPKV20Z9PEp8usnkZiTsZ5t1z9IZfdhQp1FiVvH8
+sSur0QYCd1Dn+dDMlRYWA0pcLrCmf7HhN+u+FsCFIx8qCsCEuathr72+oqjLhCrq
+xFoC3hSEaUaYOPDa95BaV1QNvjymT5ncc7kh6zpB9hZWeC64h4CsfpzuHBuB2fj2
+8TXxC8H9ss6oHZ+0NEPlBswr47X0/aTSLyzooH4Y+kkvGsBpDZqP63W89wXmwRca
+/9SnVbt4u688qC3K1h6ukclK39EMosv0DJgRHH/nZAaG+UIJC+cvt3ta+OVl0IpG
+sYELd8F/ZPIcRNAi9B4mUb85uX+8C/735H9yOc6G+w3CANEyoiEDaqU3FHwqLEu2
+VFPndK+Pen7Lgg0sUTZC
+=u9Fs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e7a6b9d96c6a..342b4996d48d 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.452 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.453 2012/10/12 19:09:11 vapier Exp $
+
+  12 Oct 2012; Mike Frysinger <vapier@gentoo.org> openssh-6.1_p1.ebuild:
+  Always specify pid-dir to avoid configure script falling back to /etc/ssh on
+  broken systems #435668 by Piotr Karbowski.
 
   25 Sep 2012; Ulrich Müller <ulm@gentoo.org> openssh-5.5_p1-r2.ebuild,
   openssh-5.6_p1-r2.ebuild, openssh-5.7_p1-r1.ebuild, openssh-5.8_p1-r1.ebuild,
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5606f06802cc..cc2ad44c0bac 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -74,23 +74,23 @@ EBUILD openssh-5.9_p1-r3.ebuild 9132 SHA256 c52e13960dd392e0fbb947bfe20e0b36072f
 EBUILD openssh-5.9_p1-r4.ebuild 9180 SHA256 bfdff99d597f8014087f2a04b4afc590a4dbb4cbafdc493d853ae838f4e180f0 SHA512 df855b7ff0ec9c8e082c58244945205319f410637bc41aff2fcfc6ef3a2e9766c102ca547195a39c96969291eb4366d20026a94212cbf94f22bc66a57e2cb421 WHIRLPOOL a4b130dc031afadcb6cb3ce0d7a7edca140ea13da502598206dd171b9aec25c1087c8cfb45b7e0011d57b4dc42e1c8738a1da5af4b18c83fea520b6a49913e85
 EBUILD openssh-6.0_p1-r1.ebuild 9458 SHA256 713625c67dcf909e83b98f263255e6931daa99f77aaa783df167e4b3742d6534 SHA512 185ef198896ad117f0cba1c70af282f3b71762b9caa72801e8b2063120578b52bda03f4a0e5575c3f9e6938664eea443c5b65803d5bbef69c8ee307c2099a05c WHIRLPOOL 9e45d096b6dacc11ae34673b2053076bea491e1e5798169e0fb9e69bfaeb906df9c7cd38aa80ca205a462ab49e53cd172bc14964b103f03d2c8e781b49b9c0d3
 EBUILD openssh-6.0_p1.ebuild 9454 SHA256 1e4e12e969594055ee1640bafad6429278cbd2d8f3f902685b0c4322953fb27c SHA512 4abcc148aff9dfa4b64753cdffea979a6a59e6d0e3659c738bd8d0f9fe8c2f124d6674c318392f5d8b7d5191d109f3e5ef2efdd783c4c40b556f47c12ad4d6cd WHIRLPOOL 37194b77b01daef50fa6cb6acb711935b03ca09832a6d77a19c0793f6b78cfcbd31c4f408089505a4224db1f32a8de09c914e8087a48a46f9273a2546deeb058
-EBUILD openssh-6.1_p1.ebuild 9403 SHA256 057da9e98656012ce017a512fad101b977c3ff75285a9d036595a4cbacdbcc00 SHA512 47e60fdc80c10acfa85041232cb74e53b50fba55b862bd2b5b36a0cc963b82762478dae2f52bd46aa783d939e3b8b2aca12d79fd967e79f8469d2b459a37c343 WHIRLPOOL 1eace2c0a36f71c2ed409a1befda5449360b898cbc8bc889147e13073cef8a3409efccb2c41827239a85624b404e958aab56e956a1fef3f621ca85adbd192a2a
-MISC ChangeLog 72566 SHA256 5831d408cbf35b361f8a9bc279a78e429f7c323dc84cd6f5cec85dcafd1cc8e2 SHA512 5823551a00fa9ae93c3e99a9605ddad040ed7e0461aca9633eb2a03f44f6e0005324e907af3afb2ca2a3a44401f9b130de436e9a6ff55c389e2addc91bc1853f WHIRLPOOL 8a747509b7f1d5e9370ae913a94a2aafa543c17d13bd9b9105190c43b6ca41b30677db9031248381fd29b8f56c5ca371dadf1ec8d3880c3220fe5a36b7a2203d
+EBUILD openssh-6.1_p1.ebuild 9434 SHA256 cf3893e3a68e906e7e8e3328c3f34aa2e0b326955005fff4a480dcaffd8ba1ec SHA512 e16df39d3a1d2faad21f3fcf2b98a6132ac678975d96666f6a4934885ad3a2361cfb1627835cf3589869151423a7248bfc915e2f1b18845dcc34540c18bece5e WHIRLPOOL cd1c5503612015f199061c5206f4bf14a96dafdff5991fba4f28f3314d9b464828f1c06c1a55f349847625a8898dd0e05b870aa0dbbcdafbe1707986e7109591
+MISC ChangeLog 72767 SHA256 fc4c6edb3bfad8fa1b0836551c40cdfd43e19d9adce2e862a3926376cd5edb79 SHA512 348c47361dbdae009ad99f184d57e27f8297d253741d77977e820a387af45e7cdb63402c7d39247ccfeb908dd8c481a0ee00a725f159911ed365de0ac5930434 WHIRLPOOL 83b940a3790c7299cd3caecc40a9630dcdf08f99555c587730c6dce70b490e788136809d56c2ccbbbc3f0352af29be87f00697d619764ebe9ecfa021a7cbafb8
 MISC metadata.xml 1599 SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86 SHA512 62ff3ab2fc84f7612799080285cba1f26c0b299d4159b15812a4b4349bfa450ac5f4e038b187201a8cba4c169c47dc4c5d9c4dfe881ef15cef82deadb8d63852 WHIRLPOOL f0b8153f49fb357cc8f90dbcb7397b6be3b31987e9bdde375c172ef2f2464a91080bef04f0e050b97852cad0a26ac9b2f634188f7b910e7dfbf738dd06a80223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYaXLAAoJEDxpGckxwJCB1hEQAIj8ujFCy/Mp6jk/KgD2f9gh
-joNVn3QRdiwh3Iu6Fk8je/hDqw5G27tqw1SXN8zu14YU0RsSYhV6ckliMsih2uGO
-pIRnYkhdpmUsqcgOhP+eAwKxOsZ+AH8PefLIUM0nUO5epVvwpbJdbJUxgy8LjoU2
-nEGixC68QEaYRuvHFSniqGmNMO6/PjZj/8FWTE++MR70W6yrYW/9s/mumZkbHQ4v
-z2+jCZzVdTCKU1c4Ear8Azu6qNGUMCEHMhY8eMKfA1UEU1oakQjibLjyoZL8t6x8
-EZr5oCBoWSlwyHSPcSuDRfkYYIrVM6XPxdKerLD4hV+Iq86xFSvnHOd3XIJqB0e9
-fKRt920QNMOMpPbhZjgsFPzlEhZXGRceBMPCVAk+C+HqLzrtAzNM3MmaScWvr1+Q
-3Q3C2rthygBH6+LLUqpcgPuVoeRJkNKPXuLzLuJB/0+++qeDuTayOjgBg/jKNsdP
-NlZwXWsgIocjTuOh9yPETc2IB708696bos7nV6L+s6DHVX6rWXjfYSPEV8lWkYH8
-oyqR8vSgltFj0QaJCgqDUnjabHxjOVX5g6tEGM48FOHYURhlXYdSiscWvZT8gt4Y
-ggl1tfEeR4pV3UWALIvboGagsYyH0AdMrIaVbsM00kUcvbWjF9JbTDuG+1bfevjf
-p9CBxl2NZXQLB5kOvxFm
-=RvFy
+iQIcBAEBCAAGBQJQeGrZAAoJELEHsLL7fEFWSwgP/i2y2c2fKmJUOVkNjW4n0VCO
+coIZsDIaqxNXRMrzEa4nSxYeYKW0P1UuQ+L+3e+ypf5lhMLw/5qhQEefLD7l+1tW
+N0cDFowUFGmvcA8SWPp2COJFHki7E8aBMo6GQyww3KBpUPy3bztecxVDIoYAS9JJ
+visWJXETsz85HH1/u5na8572Z/ZU9nduOSEmxbVOdeJGAc+MO2cyo/Q02MdNpoPy
+Pas4I9TptWQWLMVKP2C3AJdi/uMkOoLZcRNXPPJ81lG/VEQLbtBJDBPH4N+a7J3/
+8BEwDhUH7CVNODr1Y63G7GUqrTVCTU0yeDGtT4aaeGEK+MrOFQOmdjJC+wAfSRSc
+RQEGfD1bMNFT3uJhTxGoTAuKDtSdC0b5bPEdEZK2WRQskiUUz2FKnz95wPbKdrJg
+0XQHavrWAsDdGfd5d67Z7qKY8cwhaXpe/Wi/thKOxVtZp3dlu8T20iIV6uOm9RkK
+fUmm++OCEAwg3+xhuPbSBqV3y11OAq3kO67lP87kTdE1v58dFnYyFhWlsFCKfavP
+/xfVmnT9EV7xKI6YKbLZIpr4sViglopOno7ZBAYUKdCYIhvtrbssiSQ+/u01Tyfu
+mbemu2QKTt9oCpIDo490yP5CEIoEazAECfrmXrrUDg7mOYiNhnBfVYWCPJtYo1AB
+oE5dRW+QmKPWwetvmVK6
+=vbvo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-6.1_p1.ebuild b/net-misc/openssh/openssh-6.1_p1.ebuild
index 691a8a1b1ef5..4e5ac9b05cb9 100644
--- a/net-misc/openssh/openssh-6.1_p1.ebuild
+++ b/net-misc/openssh/openssh-6.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.2 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.3 2012/10/12 19:09:11 vapier Exp $
 
 EAPI="2"
 inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -159,6 +159,7 @@ src_configure() {
 	econf \
 		--with-ldflags="${LDFLAGS}" \
 		--disable-strip \
+		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/ssh \
 		--libexecdir=/usr/$(get_libdir)/misc \
 		--datadir=/usr/share/openssh \