Revision bump, make the /var/run -> /run move only apply when kernel_linux is on...
authorPatrick McLean <chutzpah@gentoo.org>
Tue, 25 Nov 2014 22:35:51 +0000 (22:35 +0000)
committerPatrick McLean <chutzpah@gentoo.org>
Tue, 25 Nov 2014 22:35:51 +0000 (22:35 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

net-misc/openssh/ChangeLog
net-misc/openssh/Manifest
net-misc/openssh/openssh-6.7_p1-r3.ebuild [new file with mode: 0644]

index e03021b94181f11a31cbf84fadcbe59b4e7f3df5..5322ae94dbbd12ca1e2f03adf4017edc195c2aa2 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.531 2014/11/24 19:18:50 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.532 2014/11/25 22:35:45 chutzpah Exp $
+
+*openssh-6.7_p1-r3 (25 Nov 2014)
+
+  25 Nov 2014; Patrick McLean <chutzpah@gentoo.org> +openssh-6.7_p1-r3.ebuild:
+  Revision bump, make the /var/run -> /run move only apply when kernel_linux is
+  on, /run is a Linux-ism.
 
 *openssh-6.7_p1-r2 (24 Nov 2014)
 
index 75d3b72e70f1eb2e005865bce75b9755da6c2888..facb3328e2ae71d4ddb7c721d7c1b8d2313c18c9 100644 (file)
@@ -37,23 +37,24 @@ EBUILD openssh-6.6.1_p1-r4.ebuild 9995 SHA256 51403706d20087030b45e1cdaa63e45093
 EBUILD openssh-6.6_p1-r1.ebuild 9874 SHA256 223b5e4c5d0d3152e8ffadd20e8bcc391620c779749cf6ff235f0d3a857f7409 SHA512 3104586dedfb189adc780bf56cb030f3a9c2427fe07ce340424ea4e279b6335653b2eb38f9d86a8f6ac76360cd94b87d858863fd79b2054763f72ccb83f1a0ed WHIRLPOOL 1bef688d59baf3cf10ce3ab60f3eeb6e6cf875989ffcf711628f56b34a1344838c3a46ae548399c49f11459e5dd2045fcef810691421e69ef02eb92489c22824
 EBUILD openssh-6.7_p1-r1.ebuild 9890 SHA256 64608df2cff77259d7884ec8995bc3d05ec45b6da1db995899adffb4866de052 SHA512 1ebd67293028c7093c56d52d714b376a51738a24578943461a057b1ba990da3111640738799a762ab6efafb741e032eb3d3370219e0172a2057c25e15bafeb8e WHIRLPOOL 08ac532869b34992d522a15a94f298a54c64c263f04876747202df4aedddbbc2ca6b7d921d880607550e2eb4c8d7fbe9d81c478188a5874e8934f4c8a30c6efd
 EBUILD openssh-6.7_p1-r2.ebuild 9886 SHA256 72cc4af916e7a0126271ceb92e8581c31f92d7e84f7355ae9d0b04af02a9451d SHA512 0e7ad5a4bbce4936c03fe788a51467966191b344aec7e3493a3d939821c4d3e4de2f6e1083014e427067581f76bd4733d4580e15103d8c898279d108373f59dc WHIRLPOOL ca174a953a758915abecbba47490b30ed6e2aeca6ee37192601d883f3e9108eae57dac3f3ae3971ec34fc5b742a84faf5e940a664f832c4f5fa17e33a80e53e2
+EBUILD openssh-6.7_p1-r3.ebuild 9929 SHA256 c00cd60bcb9dd74ba04340b1565b51669823a54f0d6ab0bdd3090d48ff23b72f SHA512 1a3ac4e4dfc1b2b89bb14c7919ac05d327efeda94c7c510995bb58a9d23a8892a1e7a65de189c479c63d045b138ee6642b552940a476d6d1660e24f82a7fe7ba WHIRLPOOL 8b10741ee5eec2ef508caf692dc586b9806a4a010ab3871ef46c9a19ce472808e22fc4415d7af177c8c44992b4d0e8e2d2f58fd9f0b67ebba2c180cec73cb4a7
 EBUILD openssh-6.7_p1.ebuild 9924 SHA256 417439221cbd61ea27bdd22e5359945f72209879677eb2e77e0827d88a3c3ccc SHA512 1c4fd7af4d1a57e22693227a9889588d3377a23e37d447fc6e1b99a2017700b1bbd186b81a3b17677c6e2afa73cd7372cf6f2382da83905815c0c8d98d246f0f WHIRLPOOL 7f18987087f3a64c73476f6a68b26411dd3f102434b78b16739c366e292fd5154efff4326c3703a3007b956a56d993ad80d106aec625a170611138553a4572b6
-MISC ChangeLog 88351 SHA256 52759e687d6ec0f37a73c734503866ff79036c19f2aa466780659a737e3394ac SHA512 7d4951dd7fd3d0a8ba38d62726963fb55a1f09e9bc4a4a1e248f936fc44be2232db3337869a8115e7c3b0591c34f569408a8bf3fde54440cc6dc9edc302607b1 WHIRLPOOL deb229ec6e9d1a0577c4cc5ba54c39eee1bba89bdb0b95865fe99c978ba6e9587035008eb0c075e348af40896c3405b6752197d2ddd6d5a6666a992ab523a88a
+MISC ChangeLog 88572 SHA256 46d7664da514073ef4a30c954faf36c46069a94c9abfaf8e973a7914fc2301ac SHA512 1977067cc86b9e50dba799453e8e3906a74e815429a6ce52cf43ea26bb939aa3cc33a811819d096e95cf89d063823b16a9fac77f8e6f75b3dac5cc63e0f2c29c WHIRLPOOL f529363492e07978484e4fa56a817a4783590bbeef5ebf288f5c98c918d3ea1c994a874093d38d7bf60a9d577a347bae00b32f3af8f971f496f964c7e36450d9
 MISC metadata.xml 1912 SHA256 7b838285f09ad395f237a0d0b9963eee86d0e85b58e6e5b4d5edb093fa888a0a SHA512 e55c10ffd12488720c3da19e55942cfedec63fe767fc1608439b5a3932eeb5488086ad7ef4e1f858c89381e737426f035845ea5e8bede4ed8a0ccabdc656d9b5 WHIRLPOOL 5c07b3dd4a4002cff5df62133ecf570bf79f58e9477d0ad25d60f185ee029183d11118147e3adfec373542659d921e99e787054cfe9284031c974d694de6e9ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUc4ScAAoJEHy/RO9cNQiDF70QAJ3F0Zrxunp8E1f3URM95AUv
-Cyjg8CSKdNnnZxFaU6+rG8SYG9wwX4nM5V3NYq0QaNo4QAZ/ru+Ib/NTMa8khCJl
-U3vdl0F9VY9GyEoj0Jj3L08gTEeXGpiE33/Zwlvxnas7OXJ3F1NTTsYKkWmF8qbq
-JgJYZhHoeLKmAVJXN5r0FfqVZKkNEZQuJKyhT2zMlv5HOfkDWJmRiY+KkTXSMlFp
-dlvW7Z/NujqP83w4fj2XFPq2fP+bFMH+U8bjHMgaElXV/dqruoCpPv22wGqUm12w
-Oz/YZGUaBGiQ5QcT+QzM6nyyAWp4Lj136wepGeAODfb9dicG0/yWuBE93+ylhjWZ
-TyzSfeLcTtpfQrBM4r09WwTDadaYj2FJF/WnbifN91B0r5H7pvWyJF545KhtKdxN
-3Cl21JlhgDpKoeGhk+KfYRMjEPGPmOMBesj3snmncs3atlnavGFwz3GQeXIFxCi0
-YvJBFzAwAx1NARvLrdzK+lyk8Nbrm359dXTyzehhar3upJsV7BP67UTL4Ds75QRD
-OuJMo6fBxJXozOUemhigNfJD20tlkEsQvJ4fz7zAaDVlt6/52ow1UqwNmcgY9vbe
-6fn/RHwFQcPt6sU570KAp4DK/494dqs60zKMTiNTyHxI3hNHxNWkouMe6zqE4SH7
-t+UPmSzLwesUjOJbffO/
-=ztir
+iQIcBAEBCAAGBQJUdQRCAAoJEHy/RO9cNQiDqB8P/jOPu/a6eqUcWAnJ8Pwivfhe
+BXa/8nuKGKWESB9Hw7e+WOB/I9hNIQXTsTW0AnnHjBAlAqeOlbp/426cPkfaQjov
+7MEYC2p2dvnrIqwxfiOttAnzjSRcncv0k/2CmyojPvqBb1DFn2bU8DOeGIWKso02
+fHX/2AOebiVEjw/sHhUbwussVdjUZbMFgt/Or8oUDNXkNN1PkcUq/EzOTPCzOIIi
+X7YgnOPLuMisCUcuLbel/x4B0JPYBvUnh2k++7Gz5NbJ+hw2QeB3G7ps8G1J1/ls
+zBGH0tF40mMdYe0EdVXmVESTaCVykuwqPxQ7hq0O/pR5NTGjZ8RlT0Pgr8c9zFW3
+WLmet6cy0LuVzgk1Wc5fPRu010oxF2M1vl0nOtE9FZe6f5vaS3dHqqqjHNShpnuT
+5D1lzrWLfvs474zKQcu339QKXG5ppRYW5F8Aj22tzvfmODaSVHMFt0iSbO8tx6+K
+3933ryJlMOeQHnRY369YyXZPZgVAWeQM7AKlOhu/zZu0OWCMimRGZgVHYlEiizcr
+/ymkWemnmAgraSzqP0iz3OxsspN/R9brhxpeWHwR2KTmwYVZXpH04s/nLcdG79is
+3GrfLxcwyYh0wBg2TEUboflfA8YSOY0ake0ZJ5lrpbAZ0eoBVV5u65Gz1S8vqepR
+zMRW1yPsDzrmygw/oQxr
+=urzK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-6.7_p1-r3.ebuild b/net-misc/openssh/openssh-6.7_p1-r3.ebuild
new file mode 100644 (file)
index 0000000..4f5fef6
--- /dev/null
@@ -0,0 +1,322 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.7_p1-r3.ebuild,v 1.1 2014/11/25 22:35:45 chutzpah Exp $
+
+EAPI="4"
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PN}-6.7p1-hpnssh14v5.tar.xz"
+LDAP_PATCH="${PN}-lpk-6.7p1-0.3.14.patch.xz"
+X509_VER="8.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+       mirror://gentoo/${P}-sctp.patch.xz
+       ${HPN_PATCH:+hpn? (
+               mirror://gentoo/${HPN_PATCH}
+               http://dev.gentoo.org/~vapier/dist/${HPN_PATCH}
+               mirror://sourceforge/hpnssh/${HPN_PATCH}
+       )}
+       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+       "
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit pam +pie sctp selinux skey static X X509"
+REQUIRED_USE="pie? ( !static )"
+
+LIB_DEPEND="sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+       selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+       skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+       libedit? ( dev-libs/libedit[static-libs(+)] )
+       >=dev-libs/openssl-0.9.6d:0[bindist=]
+       dev-libs/openssl[static-libs(+)]
+       >=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+       !static? (
+               ${LIB_DEPEND//\[static-libs(+)]}
+               ldns? (
+                       !bindist? ( net-libs/ldns[ecdsa,ssl] )
+                       bindist? ( net-libs/ldns[-ecdsa,ssl] )
+               )
+       )
+       pam? ( virtual/pam )
+       kerberos? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+       static? (
+               ${LIB_DEPEND}
+               ldns? (
+                       !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] )
+                       bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] )
+               )
+       )
+       virtual/pkgconfig
+       virtual/os-headers
+       sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+       pam? ( >=sys-auth/pambase-20081028 )
+       userland_GNU? ( virtual/shadow )
+       X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_setup() {
+       # this sucks, but i'd rather have people unable to `emerge -u openssh`
+       # than not be able to log in to their server any more
+       maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+       local fail="
+               $(use X509 && maybe_fail X509 X509_PATCH)
+               $(use ldap && maybe_fail ldap LDAP_PATCH)
+               $(use hpn && maybe_fail hpn HPN_PATCH)
+       "
+       fail=$(echo ${fail})
+       if [[ -n ${fail} ]] ; then
+               eerror "Sorry, but this version does not yet support features"
+               eerror "that you requested:      ${fail}"
+               eerror "Please mask ${PF} for now and check back later:"
+               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+               die "booooo"
+       fi
+}
+
+save_version() {
+       # version.h patch conflict avoidence
+       mv version.h version.h.$1
+       cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+       sed -i \
+               -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+               pathnames.h || die
+       # keep this as we need it to avoid the conflict between LPK and HPN changing
+       # this file.
+       cp version.h version.h.pristine
+
+       # don't break .ssh/authorized_keys2 for fun
+       sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+       epatch "${FILESDIR}"/${PN}-6.7_p1-sshd-gssapi-multihomed.patch #378361
+       if use X509 ; then
+               pushd .. >/dev/null
+               epatch "${FILESDIR}"/${P}-x509-glue.patch
+               epatch "${FILESDIR}"/${P}-sctp-x509-glue.patch
+               popd >/dev/null
+               epatch "${WORKDIR}"/${X509_PATCH%.*}
+               epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch
+               save_version X509
+       fi
+       if ! use X509 ; then
+               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+                       epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+                       save_version LPK
+               fi
+       else
+               use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
+       fi
+       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+       epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+       epatch "${WORKDIR}"/${PN}-6.7_p1-sctp.patch
+       if [[ -n ${HPN_PATCH} ]] && use hpn; then
+               epatch "${WORKDIR}"/${HPN_PATCH%.*}/*
+               save_version HPN
+       fi
+
+       tc-export PKG_CONFIG
+       local sed_args=(
+               -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+               # Disable PATH reset, trust what portage gives us #254615
+               -e 's:^PATH=/:#PATH=/:'
+               # Disable fortify flags ... our gcc does this for us
+               -e 's:-D_FORTIFY_SOURCE=2::'
+       )
+       # The -ftrapv flag ICEs on hppa #505182
+       use hppa && sed_args+=(
+               -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+               -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+       )
+       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
+               macros=()
+               for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+               printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+       ) > version.h
+
+       eautoreconf
+}
+
+static_use_with() {
+       local flag=$1
+       if use static && use ${flag} ; then
+               ewarn "Disabling '${flag}' support because of USE='static'"
+               # rebuild args so that we invert the first one (USE flag)
+               # but otherwise leave everything else working so we can
+               # just leverage use_with
+               shift
+               [[ -z $1 ]] && flag="${flag} ${flag}"
+               set -- !${flag} "$@"
+       fi
+       use_with "$@"
+}
+
+src_configure() {
+       local myconf=()
+       addwrite /dev/ptmx
+       addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+       use static && append-ldflags -static
+
+       # Special settings for Gentoo/FreeBSD 9.0 or later (see bug #391011)
+       if use elibc_FreeBSD && version_is_at_least 9.0 "$(uname -r|sed 's/\(.\..\).*/\1/')" ; then
+               myconf+=( --disable-utmp --disable-wtmp --disable-wtmpx )
+               append-ldflags -lutil
+       fi
+
+       econf \
+               --with-ldflags="${LDFLAGS}" \
+               --disable-strip \
+               --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run \
+               --sysconfdir="${EPREFIX}"/etc/ssh \
+               --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc \
+               --datadir="${EPREFIX}"/usr/share/openssh \
+               --with-privsep-path="${EPREFIX}"/var/empty \
+               --with-privsep-user=sshd \
+               --with-md5-passwords \
+               --with-ssl-engine \
+               $(static_use_with pam) \
+               $(static_use_with kerberos kerberos5 "${EPREFIX}"/usr) \
+               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
+               $(use_with ldns) \
+               $(use_with libedit) \
+               $(use_with pie) \
+               $(use_with sctp) \
+               $(use_with selinux) \
+               $(use_with skey) \
+               "${myconf[@]}"
+}
+
+src_install() {
+       emake install-nokeys DESTDIR="${D}"
+       fperms 600 /etc/ssh/sshd_config
+       dobin contrib/ssh-copy-id
+       newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+       newconfd "${FILESDIR}"/sshd.confd sshd
+       keepdir /var/empty
+
+       # not all openssl installs support ecc, or are functional #352645
+       if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then
+               elog "dev-libs/openssl was built with 'bindist' - disabling ecdsa support"
+               sed -i 's:&& gen_key ecdsa::' "${ED}"/etc/init.d/sshd || die
+       fi
+
+       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+       if use pam ; then
+               sed -i \
+                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
+                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+                       "${ED}"/etc/ssh/sshd_config || die "sed of configuration file failed"
+       fi
+
+       # Gentoo tweaks to default config files
+       cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+       # Allow client to pass locale environment variables #367017
+       AcceptEnv LANG LC_*
+       EOF
+       cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+       # Send locale environment variables #367017
+       SendEnv LANG LC_*
+       EOF
+
+       # This instruction is from the HPN webpage,
+       # Used for the server logging functionality
+       if [[ -n ${HPN_PATCH} ]] && use hpn ; then
+               keepdir /var/empty/dev
+       fi
+
+       if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+               insinto /etc/openldap/schema/
+               newins openssh-lpk_openldap.schema openssh-lpk.schema
+       fi
+
+       doman contrib/ssh-copy-id.1
+       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+       diropts -m 0700
+       dodir /etc/skel/.ssh
+
+       systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+       systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+       local t tests skipped failed passed shell
+       tests="interop-tests compat-tests"
+       skipped=""
+       shell=$(egetshell ${UID})
+       if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+               elog "Running the full OpenSSH testsuite"
+               elog "requires a usable shell for the 'portage'"
+               elog "user, so we will run a subset only."
+               skipped="${skipped} tests"
+       else
+               tests="${tests} tests"
+       fi
+       # It will also attempt to write to the homedir .ssh
+       local sshhome=${T}/homedir
+       mkdir -p "${sshhome}"/.ssh
+       for t in ${tests} ; do
+               # Some tests read from stdin ...
+               HOMEDIR="${sshhome}" \
+               emake -k -j1 ${t} </dev/null \
+                       && passed="${passed}${t} " \
+                       || failed="${failed}${t} "
+       done
+       einfo "Passed tests: ${passed}"
+       ewarn "Skipped tests: ${skipped}"
+       if [[ -n ${failed} ]] ; then
+               ewarn "Failed tests: ${failed}"
+               die "Some tests failed: ${failed}"
+       else
+               einfo "Failed tests: ${failed}"
+               return 0
+       fi
+}
+
+pkg_preinst() {
+       enewgroup sshd 22
+       enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+       if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+               elog "Starting with openssh-5.8p1, the server will default to a newer key"
+               elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+               elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+       fi
+       ewarn "Remember to merge your config files in /etc/ssh/ and then"
+       ewarn "reload sshd: '/etc/init.d/sshd reload'."
+       # This instruction is from the HPN webpage,
+       # Used for the server logging functionality
+       if [[ -n ${HPN_PATCH} ]] && use hpn ; then
+               echo
+               einfo "For the HPN server logging patch, you must ensure that"
+               einfo "your syslog application also listens at /var/empty/dev/log."
+       fi
+}