summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-22 06:54:07 +0000
committerMike Frysinger <vapier@gentoo.org>2015-03-22 06:54:07 +0000
commit464260c050548c87e89efe9bf96fc2e2c75ae88e (patch)
treef4a975d04d706e974615f2c4bb66c51ceb2355ee /net-misc/openssh
parentSpecify X useflag for kwindowsystem dependency (bug #543708) (diff)
downloadgentoo-2-464260c050548c87e89efe9bf96fc2e2c75ae88e.tar.gz
gentoo-2-464260c050548c87e89efe9bf96fc2e2c75ae88e.tar.bz2
gentoo-2-464260c050548c87e89efe9bf96fc2e2c75ae88e.zip
Also note hosts.allow in the error message #531156#20 by Arfrever Frehtes Taifersar Arahesis.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-6.8_p1-r1.ebuild4
2 files changed, 7 insertions, 3 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/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
}