Also note hosts.allow in the error message #531156#20 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 22 insertions, 18 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e43b7146644c..0f1c3391d404 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.550 2015/03/20 02:35:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.551 2015/03/22 06:54:07 vapier Exp $
+
+  22 Mar 2015; Mike Frysinger <vapier@gentoo.org> openssh-6.8_p1-r1.ebuild:
+  Also note hosts.allow in the error message #531156#20 by Arfrever Frehtes
+  Taifersar Arahesis.
 
   20 Mar 2015; Mike Frysinger <vapier@gentoo.org> openssh-6.8_p1-r1.ebuild:
   Also check /etc/hosts.allow for tcp-wrappers #531156#18 by Martin Mokrejš.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4ae2185aefad..dadc1abea9fe 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -34,24 +34,24 @@ DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc313
 EBUILD openssh-6.7_p1-r3.ebuild 10078 SHA256 1a58e95c28b5b938f2f15b3fec5688dc9509bb038805b0348b11ac31ed3c57e0 SHA512 add8eaebb3c91983a7bac78011700c110917dea6409bf46e784d7e17b1891facb3baacaa0bda71eb2c9b6017fbf1a21b5846434fba8d588724da871e7824f498 WHIRLPOOL 47e04a0644a592e29aaa9ac00b03a377e81cdb1d886119c21a77a0a351c0cea34018a24406449faa814c2f06e1c03b43ac16a78983bb4a9f57c36834ad7babcb
 EBUILD openssh-6.7_p1-r4.ebuild 10138 SHA256 e4f6c4e80485352cc75e62c0212670a0d7f4a19bcf1eed9972bbeaff8b7a2743 SHA512 fdcd7759a85412bdf05be5003d20289a862f13f945e1972e56a36602df426641ef3497399e06ff0da9a51cf2bd54831b6208ac399d42d3ce3e3b1493ffa7655c WHIRLPOOL ae24dbcc182627c356961f4ce290cb1b489e29fa13beaf27212bd4847a36f02af53a8508320cf2a76be88741297ac7533faf53c1d3b15d70299cff536ae8502f
 EBUILD openssh-6.7_p1.ebuild 10067 SHA256 970be3a06c0293262f6c59d068d290cc71935fe91f4295b1352b6c41c46c3bf7 SHA512 f2b689767c8da075f16e9e5d9fe258e22fb4019034539883d63632c1543d3141787883ec7013f87c23d709a554b4f994c4c2f41b1829e5301b55f7a5da3fbf46 WHIRLPOOL 8d70fd99a1f3307b801999a9c80be4bcc603cbc151170160d78a2fa8a50ceb701657cbb0b0eb9ccfe1287bff9299dcffb36f884b860a5ca88ac4a9936b21a574
-EBUILD openssh-6.8_p1-r1.ebuild 10075 SHA256 588b332302cc6c7683e0563dd4ade17bdc122431fa562bca751ae5d0576c660f SHA512 ca51c390b567f59d5320d4c8d97aa50b8513efbe642149045f86b8fbabec3c8de91b4a65dae69f7e43ca070bb3d1ec8401e0a5c889b78856ad7a6ec237c073d3 WHIRLPOOL f206498c8acb35e6c92ff14f6f22161e4e679e0a9c1bcaec5e959df7615f152b533dc49f02fb9d5c911953a0d5c7d28e458ae631a98de5dc8eb15ab8d85bc903
+EBUILD openssh-6.8_p1-r1.ebuild 10083 SHA256 f8de47466df155d5c5932d091adc3bcd8108e10d7bbe470c809b716e2d1a3323 SHA512 237d3694bb07b57b4c5162f4667fc86a86a61a6b8063fb792e1dc6a340e8e5908072b8b3654fa7a470908b7048cb2297ac7a6a5bdf7c02b1b1981b0f0893df29 WHIRLPOOL e0c6e618afdbd912d246eca218b956214040f96bad0c86a758c148140a38d6c97201b1d274d680387e93a0e418e775420d3265d1fff74286a865b001d2430d1e
 EBUILD openssh-6.8_p1.ebuild 10045 SHA256 13378c09cc4ceec7cd1b8c12ad925db87c9d37910edb679eb2404527226ee18d SHA512 daa5ba19f6fbc0ac7104c8c7822b22745736bf864999ade1e205d1b7184e0fd67f997c4635ab2335eafdf2d2917cf677764080d3004b24935f4189fce338010f WHIRLPOOL b8d40e35bf44bf26296c8d87e3b293b31f767920afb288a10deff8a9ceeb1c130b4da2697d7ce970091d0810c5d1e3839640e2ebee2f0d63b8ca5b0f430c0c0c
-MISC ChangeLog 91684 SHA256 f1ed607c266a1cded17ebacb6ddaae23f1fca487d5f42e492f11ac80a479ab48 SHA512 b093c200da8e061e3e902db83da196edd494a997cb8abae1423d236ce7a280d68304f5318ab395440b479f88879743fb03f7ee1c73a6321191d6a23114365c3b WHIRLPOOL 5c9db028c4911b88a2c2616d6b0c5c53d72848d8f2e161b67d6cd34774b75f714891540aa52a63d4592f80cfc0e6f5e17f794c64706e20d05c700ab52b37623d
+MISC ChangeLog 91859 SHA256 dd78f851ee5abb1a5ad501d6b5d7df314bd31894a38aaed2e098e64f6ee9bb16 SHA512 aafe806490d3ce28606618a0ce584c13a136de2e3150fb48a920b01ad977ea5a973c7733d126d9af74dcfa54a4331f9ccdd4fae2f1e86f53cb48098db0d0e2b5 WHIRLPOOL 998d67bd247cb565164751272cb02383443537b11aca56af0892273921393dc366d980ba31a17f2c0a6a541eae7aa6ded6d34c77e8d3cdbfb168df6af1b804e9
 MISC metadata.xml 2049 SHA256 db7830f81086b967b8212af7c318bf27d22ac7db58b1a4d9c80cc86453ff03ab SHA512 3641e38203376c78fddc11b9d5861bdb629a1f9faf2768be5dc35f62ef3d37636a2f9f990e3ade1de2cec45d33a5fcdf7bb0dcd5f4376d40753fe29b354da42e WHIRLPOOL 6a7497491a150ede87bf20f5da5ed9003d545c9c376db7b78a6c1db66b1b90213f5f97d9211fb8b1ab204c1814c1a90d7be77a2d83cc045cf0762b4d2708c56a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVC4dxAAoJEPGu1DbS6WIAQkQP/ApEw7rLZ8Hk5P291WYoPc+v
-zcTQnsfB5rj2WPMOnJntU7whto1MxNssMyM+sFe04NIfpOi3GKVuNaNdeVDLxFBW
-3/3vX1H+qmBO94cIQ2J8jGc2K7H3nTbDt+jHgi/EcW3ZvdQLYlydkOJNGtb23QNO
-tLe3bl9EgO9pyuIVmzaVv3/bFJlJOdWgowrjipEbBOpDZBtgbzXyed0iXwjxE82S
-AS0K1r5IendrIbfg6zj3u0TJz10QKsGNuy/KaZUxviIMrOSK2jAvBVi3X43yuiip
-ultqNEvrdg2EgpX8RjZCwJgvJtWC44fyAeY576QWz+I1zm7s/to7X19LZsnhcPhm
-HBqGRLAihcMJYvrKRRr3OwRUmbI8VZLfx9YduSqQNNUcyOzZ6izhZf7SOlt4Lsb8
-rXIK+OGjrJmwE4z+DUqzfSJYmbnjRfuhxxUfmRNVDG/0CggvnlEdsLFWt2ez3d6W
-CTQnwDAbJ4qH69+PkeKoAn3uOuj20DmvqSAaWAZCBHtfqEhq4D+FnXGTiMb/bZnD
-WX2f25kUyZx8m0IN7b04baAcqEdPlTjKo+6eJN/a0Ev1THR0nzEI1R2rqJWTSgkO
-qrJJ/dKbCsyXMVlAVIuGYF6abBd8rAr7sbYa6ScffQicREqXbIU+FpAqSaprkonA
-0mGaDoXxUrVeSAlZHr1h
-=RCrd
+iQIcBAEBCAAGBQJVDmcSAAoJEPGu1DbS6WIAlXoP/2VOjkPdTyt2oBsx51bHLdwS
+kRXJH6KdlGa1nLjS/s1kwx8MVLRIUNvHI/uR4wzzs5BYHr7Urgmx2ejYfrxgJzOc
+rUS1naUC55cZNqEanmctIXu5bp7IPPl95SUgkBFI0EK2UbSPiTdh81MZ/IIAxnCy
+fj8VbtSJCtVHSvAw2US2m8VGxJRfta/VCf9iRkekjbG6/UfaLzdTz8cuXNQ99VHy
+ZWNLJ2dE3bBSo7huNKNFyK1MiA/HpHL1l+BKvDsOceqCompk8a06gA08NXxd8cES
+k8bF/lUbTug3PAuFZpUWwBT7EWtu17ue1/2eHAKlf2Y9LbA1tmYd6ITQDCGLoorV
+jQz6LiauBEb2NsZk4yJEYKPe9vtcYe7QgMv3OHJjsJPdtZHfniLD8r6gU2i2X+nC
++5zQBt431WFelfm+hxG+eOmRyjJRle2p9MfegnlaA58plyLIdxO0jxB20cXmfhBf
+ehB0JfuJchAPttKcR8igBw2VGjN+TuWLWc/6Rns9fQu7ntoMBFlLr7nIWc5Siu95
+0fWZo6s5hBgQaev8F9v3Td1XaXu0iRwDGzdWgv1FJfGd4FXavoqZzSw2nOQLj9UA
+Q/imiZvwa2gIBe1zd4PS2MCNjJnh0m04OEwsWBWxAx8eLpwR0IEiOKLomxL4FIEV
+xgj/Mi/bjeV/bOJN3H8T
+=S3wT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-6.8_p1-r1.ebuild b/net-misc/openssh/openssh-6.8_p1-r1.ebuild
index 7dcf1c9806fb..15092872f3d6 100644
--- a/net-misc/openssh/openssh-6.8_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.8_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild,v 1.5 2015/03/20 02:35:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r1.ebuild,v 1.6 2015/03/22 06:54:07 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -98,7 +98,7 @@ pkg_setup() {
 	# Make sure people who are using tcp wrappers are notified of its removal. #531156
 	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
 		eerror "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		eerror "you're trying to use it.  Update your ${EROOT}etc/hosts.deny please."
+		eerror "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
 		die "USE=tcpd no longer works"
 	fi
 }