| 1 |
commit: 5091fd8f2b5a7cb0d3e970df404446d3aef8f3c7 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 6 17:41:43 2018 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 6 17:42:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5091fd8f |
| 7 |
|
| 8 |
net-misc/openssh: Security cleanup |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/664264 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 13 |
|
| 14 |
net-misc/openssh/Manifest | 5 - |
| 15 |
net-misc/openssh/metadata.xml | 2 - |
| 16 |
net-misc/openssh/openssh-7.5_p1-r4.ebuild | 334 ------------------------------ |
| 17 |
3 files changed, 341 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest |
| 20 |
index 73d61beed4a..86994d17c7d 100644 |
| 21 |
--- a/net-misc/openssh/Manifest |
| 22 |
+++ b/net-misc/openssh/Manifest |
| 23 |
@@ -1,7 +1,3 @@ |
| 24 |
-DIST openssh-7.4_p1-sctp.patch.xz 8220 BLAKE2B 2d571cacaab342b7950b42ec826bd896edf78780e9ee73fcd441cbc9764eb59e408e295062862db986918824d10498383bf34ae7c93df0da2c056eaec4d2c031 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4 |
| 25 |
-DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc266d1a450d298563bfc6ce705ec2829b8f9d91af5c5232941d55004b5aea2d3e0fb682a9d4acd9510c9761ba7ede2f2f0e37f SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a |
| 26 |
-DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9 |
| 27 |
-DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81 |
| 28 |
DIST openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz 22060 BLAKE2B 9ee654f689d4b90bd0fe4f71d57b4a8d9d957012be3a23ff2baa6c45ae99e2f1e4daf5de24479a6a3eb761ee6847deb3c6c3021d4cbabc9089f605d8d7270efc SHA512 856d28ac89c14d01c40c7d7e93cfaebd74b091188b5b469550eb62aa5445177aec1a5f47c1e2f7173013712e98e5f9f5e46bbb3dbd4ec7c5ee8256ef45cda0f8 |
| 29 |
DIST openssh-7.7p1-patches-1.2.tar.xz 17584 BLAKE2B 192ec01906c911197abec4606cdf136cf26ac4ab4c405267cd98bafaea409d9d596b2b985eaeda6a1425d587d63b6f403b988f280aff989357586bf232d27712 SHA512 e646ec3674b5ef38abe823406d33c8a47c5f63fa962c41386709a7ad7115d968b70fbcf7a8f3efc67a3e80e0194e8e22a01c2342c830f99970fe02532cdee51b |
| 30 |
DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a3e8d0d059a0435e5beda14c63e444dad8b4357edaccd1cfe446c6268514f152b2bcfa7fa3612f1ae1324a31fecb0e85ac5 SHA512 093605865262a2b972db8c92990a49ed6178ed4567fb2626518c826c8472553d9be99a9e6052a6f5e545d81867b4118e9fd8a2c0c26a2739f1720b0f13282cba |
| 31 |
@@ -12,4 +8,3 @@ DIST openssh-7.8p1-sctp-1.1.patch.xz 7548 BLAKE2B d74010028f097812f554f9e788aa5e |
| 32 |
DIST openssh-7.8p1.tar.gz 1548026 BLAKE2B 938428408596d24d497f245e3662a0cff3d462645683bf75cd29a0ea56fa6c280e7fa866bedf0928dd5bc4085b82d5a4ce74b7eea0b45b86f879b69f74db1642 SHA512 8e5b0c8682a9243e4e8b7c374ec989dccd1a752eb6f84e593b67141e8b23dcc8b9a7322b1f7525d18e2ce8830a767d0d9793f997486339db201a57986b910705 |
| 33 |
DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7 |
| 34 |
DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08 |
| 35 |
-DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b |
| 36 |
|
| 37 |
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml |
| 38 |
index 29134fc060d..ab669d3e59a 100644 |
| 39 |
--- a/net-misc/openssh/metadata.xml |
| 40 |
+++ b/net-misc/openssh/metadata.xml |
| 41 |
@@ -26,10 +26,8 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and |
| 42 |
<use> |
| 43 |
<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag> |
| 44 |
<flag name="hpn">Enable high performance ssh</flag> |
| 45 |
- <flag name="ldap">Add support for storing SSH public keys in LDAP</flag> |
| 46 |
<flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> |
| 47 |
<flag name="livecd">Enable root password logins for live-cd environment.</flag> |
| 48 |
- <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag> |
| 49 |
<flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> |
| 50 |
<flag name="X509">Adds support for X.509 certificate authentication</flag> |
| 51 |
</use> |
| 52 |
|
| 53 |
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild |
| 54 |
deleted file mode 100644 |
| 55 |
index cbe425c4eef..00000000000 |
| 56 |
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,334 +0,0 @@ |
| 59 |
-# Copyright 1999-2018 Gentoo Foundation |
| 60 |
-# Distributed under the terms of the GNU General Public License v2 |
| 61 |
- |
| 62 |
-EAPI="5" |
| 63 |
- |
| 64 |
-inherit eutils user flag-o-matic multilib autotools pam systemd |
| 65 |
- |
| 66 |
-# Make it more portable between straight releases |
| 67 |
-# and _p? releases. |
| 68 |
-PARCH=${P/_} |
| 69 |
- |
| 70 |
-HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" |
| 71 |
-SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz" |
| 72 |
-LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz" |
| 73 |
-X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz" |
| 74 |
- |
| 75 |
-DESCRIPTION="Port of OpenBSD's free SSH release" |
| 76 |
-HOMEPAGE="http://www.openssh.org/" |
| 77 |
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz |
| 78 |
- ${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}} |
| 79 |
- ${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )} |
| 80 |
- ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )} |
| 81 |
- ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} |
| 82 |
- " |
| 83 |
- |
| 84 |
-LICENSE="BSD GPL-2" |
| 85 |
-SLOT="0" |
| 86 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 87 |
-# Probably want to drop ssl defaulting to on in a future version. |
| 88 |
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509" |
| 89 |
-REQUIRED_USE="ldns? ( ssl ) |
| 90 |
- pie? ( !static ) |
| 91 |
- ssh1? ( ssl ) |
| 92 |
- static? ( !kerberos !pam ) |
| 93 |
- X509? ( !ldap !sctp ssl ) |
| 94 |
- test? ( ssl )" |
| 95 |
- |
| 96 |
-LIB_DEPEND=" |
| 97 |
- audit? ( sys-process/audit[static-libs(+)] ) |
| 98 |
- ldns? ( |
| 99 |
- net-libs/ldns[static-libs(+)] |
| 100 |
- !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) |
| 101 |
- bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) |
| 102 |
- ) |
| 103 |
- libedit? ( dev-libs/libedit:=[static-libs(+)] ) |
| 104 |
- sctp? ( net-misc/lksctp-tools[static-libs(+)] ) |
| 105 |
- selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 106 |
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) |
| 107 |
- ssl? ( |
| 108 |
- !libressl? ( |
| 109 |
- >=dev-libs/openssl-1.0.1:0=[bindist=] |
| 110 |
- dev-libs/openssl:0=[static-libs(+)] |
| 111 |
- ) |
| 112 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 113 |
- ) |
| 114 |
- >=sys-libs/zlib-1.2.3:=[static-libs(+)]" |
| 115 |
-RDEPEND=" |
| 116 |
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 117 |
- pam? ( virtual/pam ) |
| 118 |
- kerberos? ( virtual/krb5 ) |
| 119 |
- ldap? ( net-nds/openldap )" |
| 120 |
-DEPEND="${RDEPEND} |
| 121 |
- static? ( ${LIB_DEPEND} ) |
| 122 |
- virtual/pkgconfig |
| 123 |
- virtual/os-headers |
| 124 |
- sys-devel/autoconf" |
| 125 |
-RDEPEND="${RDEPEND} |
| 126 |
- pam? ( >=sys-auth/pambase-20081028 ) |
| 127 |
- userland_GNU? ( virtual/shadow ) |
| 128 |
- X? ( x11-apps/xauth )" |
| 129 |
- |
| 130 |
-S=${WORKDIR}/${PARCH} |
| 131 |
- |
| 132 |
-pkg_pretend() { |
| 133 |
- # this sucks, but i'd rather have people unable to `emerge -u openssh` |
| 134 |
- # than not be able to log in to their server any more |
| 135 |
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } |
| 136 |
- local fail=" |
| 137 |
- $(use X509 && maybe_fail X509 X509_PATCH) |
| 138 |
- $(use ldap && maybe_fail ldap LDAP_PATCH) |
| 139 |
- $(use hpn && maybe_fail hpn HPN_PATCH) |
| 140 |
- " |
| 141 |
- fail=$(echo ${fail}) |
| 142 |
- if [[ -n ${fail} ]] ; then |
| 143 |
- eerror "Sorry, but this version does not yet support features" |
| 144 |
- eerror "that you requested: ${fail}" |
| 145 |
- eerror "Please mask ${PF} for now and check back later:" |
| 146 |
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" |
| 147 |
- die "booooo" |
| 148 |
- fi |
| 149 |
- |
| 150 |
- # Make sure people who are using tcp wrappers are notified of its removal. #531156 |
| 151 |
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then |
| 152 |
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" |
| 153 |
- ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." |
| 154 |
- fi |
| 155 |
-} |
| 156 |
- |
| 157 |
-save_version() { |
| 158 |
- # version.h patch conflict avoidence |
| 159 |
- mv version.h version.h.$1 |
| 160 |
- cp -f version.h.pristine version.h |
| 161 |
-} |
| 162 |
- |
| 163 |
-src_prepare() { |
| 164 |
- sed -i \ |
| 165 |
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ |
| 166 |
- pathnames.h || die |
| 167 |
- # keep this as we need it to avoid the conflict between LPK and HPN changing |
| 168 |
- # this file. |
| 169 |
- cp version.h version.h.pristine |
| 170 |
- |
| 171 |
- # don't break .ssh/authorized_keys2 for fun |
| 172 |
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die |
| 173 |
- |
| 174 |
- if use X509 ; then |
| 175 |
- if use hpn ; then |
| 176 |
- pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null |
| 177 |
- epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch |
| 178 |
- popd >/dev/null |
| 179 |
- fi |
| 180 |
- save_version X509 |
| 181 |
- epatch "${WORKDIR}"/${X509_PATCH%.*} |
| 182 |
- fi |
| 183 |
- |
| 184 |
- if use ldap ; then |
| 185 |
- epatch "${WORKDIR}"/${LDAP_PATCH%.*} |
| 186 |
- save_version LPK |
| 187 |
- fi |
| 188 |
- |
| 189 |
- epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex |
| 190 |
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch |
| 191 |
- epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch |
| 192 |
- epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch |
| 193 |
- epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch |
| 194 |
- use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 |
| 195 |
- use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} |
| 196 |
- use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch |
| 197 |
- use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch |
| 198 |
- |
| 199 |
- if use hpn ; then |
| 200 |
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ |
| 201 |
- EPATCH_MULTI_MSG="Applying HPN patchset ..." \ |
| 202 |
- epatch "${WORKDIR}"/${HPN_PATCH%.*.*} |
| 203 |
- save_version HPN |
| 204 |
- fi |
| 205 |
- |
| 206 |
- tc-export PKG_CONFIG |
| 207 |
- local sed_args=( |
| 208 |
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" |
| 209 |
- # Disable PATH reset, trust what portage gives us #254615 |
| 210 |
- -e 's:^PATH=/:#PATH=/:' |
| 211 |
- # Disable fortify flags ... our gcc does this for us |
| 212 |
- -e 's:-D_FORTIFY_SOURCE=2::' |
| 213 |
- ) |
| 214 |
- # The -ftrapv flag ICEs on hppa #505182 |
| 215 |
- use hppa && sed_args+=( |
| 216 |
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' |
| 217 |
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' |
| 218 |
- ) |
| 219 |
- # _XOPEN_SOURCE causes header conflicts on Solaris |
| 220 |
- [[ ${CHOST} == *-solaris* ]] && sed_args+=( |
| 221 |
- -e 's/-D_XOPEN_SOURCE//' |
| 222 |
- ) |
| 223 |
- sed -i "${sed_args[@]}" configure{.ac,} || die |
| 224 |
- |
| 225 |
- epatch_user #473004 |
| 226 |
- |
| 227 |
- # Now we can build a sane merged version.h |
| 228 |
- ( |
| 229 |
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u |
| 230 |
- macros=() |
| 231 |
- for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done |
| 232 |
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}" |
| 233 |
- ) > version.h |
| 234 |
- |
| 235 |
- eautoreconf |
| 236 |
-} |
| 237 |
- |
| 238 |
-src_configure() { |
| 239 |
- addwrite /dev/ptmx |
| 240 |
- |
| 241 |
- use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG |
| 242 |
- use static && append-ldflags -static |
| 243 |
- |
| 244 |
- local myconf=( |
| 245 |
- --with-ldflags="${LDFLAGS}" |
| 246 |
- --disable-strip |
| 247 |
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run |
| 248 |
- --sysconfdir="${EPREFIX}"/etc/ssh |
| 249 |
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc |
| 250 |
- --datadir="${EPREFIX}"/usr/share/openssh |
| 251 |
- --with-privsep-path="${EPREFIX}"/var/empty |
| 252 |
- --with-privsep-user=sshd |
| 253 |
- $(use_with audit audit linux) |
| 254 |
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr) |
| 255 |
- # We apply the ldap patch conditionally, so can't pass --without-ldap |
| 256 |
- # unconditionally else we get unknown flag warnings. |
| 257 |
- $(use ldap && use_with ldap) |
| 258 |
- $(use_with ldns) |
| 259 |
- $(use_with libedit) |
| 260 |
- $(use_with pam) |
| 261 |
- $(use_with pie) |
| 262 |
- $(use X509 || use_with sctp) |
| 263 |
- $(use_with selinux) |
| 264 |
- $(use_with skey) |
| 265 |
- $(use_with ssh1) |
| 266 |
- $(use_with ssl openssl) |
| 267 |
- $(use_with ssl md5-passwords) |
| 268 |
- $(use_with ssl ssl-engine) |
| 269 |
- ) |
| 270 |
- |
| 271 |
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748 |
| 272 |
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) |
| 273 |
- |
| 274 |
- econf "${myconf[@]}" |
| 275 |
-} |
| 276 |
- |
| 277 |
-src_install() { |
| 278 |
- emake install-nokeys DESTDIR="${D}" |
| 279 |
- fperms 600 /etc/ssh/sshd_config |
| 280 |
- dobin contrib/ssh-copy-id |
| 281 |
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd |
| 282 |
- newconfd "${FILESDIR}"/sshd.confd sshd |
| 283 |
- |
| 284 |
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd |
| 285 |
- if use pam ; then |
| 286 |
- sed -i \ |
| 287 |
- -e "/^#UsePAM /s:.*:UsePAM yes:" \ |
| 288 |
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ |
| 289 |
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \ |
| 290 |
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ |
| 291 |
- "${ED}"/etc/ssh/sshd_config || die |
| 292 |
- fi |
| 293 |
- |
| 294 |
- # Gentoo tweaks to default config files |
| 295 |
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config |
| 296 |
- |
| 297 |
- # Allow client to pass locale environment variables #367017 |
| 298 |
- AcceptEnv LANG LC_* |
| 299 |
- EOF |
| 300 |
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config |
| 301 |
- |
| 302 |
- # Send locale environment variables #367017 |
| 303 |
- SendEnv LANG LC_* |
| 304 |
- EOF |
| 305 |
- |
| 306 |
- if use livecd ; then |
| 307 |
- sed -i \ |
| 308 |
- -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ |
| 309 |
- "${ED}"/etc/ssh/sshd_config || die |
| 310 |
- fi |
| 311 |
- |
| 312 |
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then |
| 313 |
- insinto /etc/openldap/schema/ |
| 314 |
- newins openssh-lpk_openldap.schema openssh-lpk.schema |
| 315 |
- fi |
| 316 |
- |
| 317 |
- doman contrib/ssh-copy-id.1 |
| 318 |
- dodoc CREDITS OVERVIEW README* TODO sshd_config |
| 319 |
- use X509 || dodoc ChangeLog |
| 320 |
- |
| 321 |
- diropts -m 0700 |
| 322 |
- dodir /etc/skel/.ssh |
| 323 |
- |
| 324 |
- systemd_dounit "${FILESDIR}"/sshd.{service,socket} |
| 325 |
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' |
| 326 |
-} |
| 327 |
- |
| 328 |
-src_test() { |
| 329 |
- local t skipped=() failed=() passed=() |
| 330 |
- local tests=( interop-tests compat-tests ) |
| 331 |
- |
| 332 |
- local shell=$(egetshell "${UID}") |
| 333 |
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then |
| 334 |
- elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" |
| 335 |
- elog "user, so we will run a subset only." |
| 336 |
- skipped+=( tests ) |
| 337 |
- else |
| 338 |
- tests+=( tests ) |
| 339 |
- fi |
| 340 |
- |
| 341 |
- # It will also attempt to write to the homedir .ssh. |
| 342 |
- local sshhome=${T}/homedir |
| 343 |
- mkdir -p "${sshhome}"/.ssh |
| 344 |
- for t in "${tests[@]}" ; do |
| 345 |
- # Some tests read from stdin ... |
| 346 |
- HOMEDIR="${sshhome}" HOME="${sshhome}" \ |
| 347 |
- emake -k -j1 ${t} </dev/null \ |
| 348 |
- && passed+=( "${t}" ) \ |
| 349 |
- || failed+=( "${t}" ) |
| 350 |
- done |
| 351 |
- |
| 352 |
- einfo "Passed tests: ${passed[*]}" |
| 353 |
- [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" |
| 354 |
- [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" |
| 355 |
-} |
| 356 |
- |
| 357 |
-pkg_preinst() { |
| 358 |
- enewgroup sshd 22 |
| 359 |
- enewuser sshd 22 -1 /var/empty sshd |
| 360 |
-} |
| 361 |
- |
| 362 |
-pkg_postinst() { |
| 363 |
- if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then |
| 364 |
- elog "Starting with openssh-5.8p1, the server will default to a newer key" |
| 365 |
- elog "algorithm (ECDSA). You are encouraged to manually update your stored" |
| 366 |
- elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." |
| 367 |
- fi |
| 368 |
- if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then |
| 369 |
- elog "Starting with openssh-6.9p1, ssh1 support is disabled by default." |
| 370 |
- fi |
| 371 |
- if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then |
| 372 |
- elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." |
| 373 |
- elog "Make sure to update any configs that you might have. Note that xinetd might" |
| 374 |
- elog "be an alternative for you as it supports USE=tcpd." |
| 375 |
- fi |
| 376 |
- if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518 |
| 377 |
- elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" |
| 378 |
- elog "weak sizes. If you rely on these key types, you can re-enable the key types by" |
| 379 |
- elog "adding to your sshd_config or ~/.ssh/config files:" |
| 380 |
- elog " PubkeyAcceptedKeyTypes=+ssh-dss" |
| 381 |
- elog "You should however generate new keys using rsa or ed25519." |
| 382 |
- |
| 383 |
- elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" |
| 384 |
- elog "to 'prohibit-password'. That means password auth for root users no longer works" |
| 385 |
- elog "out of the box. If you need this, please update your sshd_config explicitly." |
| 386 |
- fi |
| 387 |
- if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then |
| 388 |
- elog "Be aware that by disabling openssl support in openssh, the server and clients" |
| 389 |
- elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" |
| 390 |
- elog "and update all clients/servers that utilize them." |
| 391 |
- fi |
| 392 |
-} |
Archives