summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-10-12 19:09:11 +0000
committerMike Frysinger <vapier@gentoo.org>2012-10-12 19:09:11 +0000
commit72a8b072784dc043686bdcdf3f9db18f72e677a1 (patch)
treeb30a917e443bb7ee23a943bb38d3bd7f062bfab5 /net-misc/openssh
parentStable for amd64, wrt bug #437364 (diff)
downloadhistorical-72a8b072784dc043686bdcdf3f9db18f72e677a1.tar.gz
historical-72a8b072784dc043686bdcdf3f9db18f72e677a1.tar.bz2
historical-72a8b072784dc043686bdcdf3f9db18f72e677a1.zip
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
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/Manifest30
-rw-r--r--net-misc/openssh/openssh-6.1_p1.ebuild3
3 files changed, 22 insertions, 17 deletions
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 \