diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2021-06-17 22:08:15 +0200 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-06-17 22:32:00 +0200 |
commit | 08ab771b7280edd7adfc6ae3b2289bc0f4fc09b1 (patch) | |
tree | f2fff5cb9b7a7ec027d7916f093275f066ce2fd1 /net-misc | |
parent | net-misc/curl: Fix MissingUseDepDefault for dev-libs/openssl[bindist] (diff) | |
download | gentoo-08ab771b7280edd7adfc6ae3b2289bc0f4fc09b1.tar.gz gentoo-08ab771b7280edd7adfc6ae3b2289bc0f4fc09b1.tar.bz2 gentoo-08ab771b7280edd7adfc6ae3b2289bc0f4fc09b1.zip |
net-misc/openssh: Fix MissingUseDepDefault for dev-libs/openssl[bindist]
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openssh/files/sshd-r2.initd | 100 | ||||
-rw-r--r-- | net-misc/openssh/openssh-8.5_p1-r1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/openssh/openssh-8.6_p1-r1.ebuild | 6 |
3 files changed, 106 insertions, 6 deletions
diff --git a/net-misc/openssh/files/sshd-r2.initd b/net-misc/openssh/files/sshd-r2.initd new file mode 100644 index 000000000000..3381fb965dd8 --- /dev/null +++ b/net-misc/openssh/files/sshd-r2.initd @@ -0,0 +1,100 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="checkconfig" +extra_started_commands="reload" + +: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh} +: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} +: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid} +: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd} +: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen} + +command="${SSHD_BINARY}" +pidfile="${SSHD_PIDFILE}" +command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}" + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress (bug 617596). +: ${SSHD_SSD_OPTS:=--wait 1000} +start_stop_daemon_args="${SSHD_SSD_OPTS}" + +depend() { + # Entropy can be used by ssh-keygen, among other things, but + # is not strictly required (bug 470020). + use logger dns entropy + if [ "${rc_need+set}" = "set" ] ; then + : # Do nothing, the user has explicitly set rc_need + else + local x warn_addr + for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do + case "${x}" in + 0.0.0.0|0.0.0.0:*) ;; + ::|\[::\]*) ;; + *) warn_addr="${warn_addr} ${x}" ;; + esac + done + if [ -n "${warn_addr}" ] ; then + need net + ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" + ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd" + ewarn "where FOO is the interface(s) providing the following address(es):" + ewarn "${warn_addr}" + fi + fi +} + +checkconfig() { + checkpath --mode 0755 --directory "${RC_PREFIX%/}/var/empty" + + if [ ! -e "${SSHD_CONFIG}" ] ; then + eerror "You need an ${SSHD_CONFIG} file to run sshd" + eerror "There is a sample file in /usr/share/doc/openssh" + return 1 + fi + + ${SSHD_KEYGEN_BINARY} -A || return 2 + + "${command}" -t ${command_args} || return 3 +} + +start_pre() { + # Make sure that the user's config isn't busted before we try + # to start the daemon (this will produce better error messages + # than if we just try to start it blindly). + # + # We always need to call checkconfig because this function will + # also generate any missing host key and you can start a + # non-running service with "restart" argument. + checkconfig || return $? +} + +stop_pre() { + if [ "${RC_CMD}" = "restart" ] ; then + # If this is a restart, check to make sure the user's config + # isn't busted before we stop the running daemon. + checkconfig || return $? + elif yesno "${RC_GOINGDOWN}" && [ -s "${pidfile}" ] && hash pgrep 2>/dev/null ; then + # Disconnect any clients before killing the master process + local pid=$(cat "${pidfile}" 2>/dev/null) + if [ -n "${pid}" ] ; then + local ssh_session_pattern='sshd: \S.*@pts/[0-9]+' + + IFS="${IFS}@" + local daemon pid pty user + pgrep -a -P ${pid} -f "$ssh_session_pattern" | while read pid daemon user pty ; do + ewarn "Found ${daemon%:} session ${pid} on ${pty}; sending SIGTERM ..." + kill "${pid}" || true + done + fi + fi +} + +reload() { + checkconfig || return $? + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild index 8aea025ac78a..96e4f161abd5 100644 --- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild @@ -61,10 +61,10 @@ LIB_DEPEND=" ssl? ( || ( ( - >=dev-libs/openssl-1.0.1:0[bindist=] - <dev-libs/openssl-1.1.0:0[bindist=] + >=dev-libs/openssl-1.0.1:0[bindist(-)=] + <dev-libs/openssl-1.1.0:0[bindist(-)=] ) - >=dev-libs/openssl-1.1.0g:0[bindist=] + >=dev-libs/openssl-1.1.0g:0[bindist(-)=] ) dev-libs/openssl:0=[static-libs(+)] ) diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild index 0e9654a50441..f896a51951ac 100644 --- a/net-misc/openssh/openssh-8.6_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild @@ -66,10 +66,10 @@ LIB_DEPEND=" ssl? ( || ( ( - >=dev-libs/openssl-1.0.1:0[bindist=] - <dev-libs/openssl-1.1.0:0[bindist=] + >=dev-libs/openssl-1.0.1:0[bindist(-)=] + <dev-libs/openssl-1.1.0:0[bindist(-)=] ) - >=dev-libs/openssl-1.1.0g:0[bindist=] + >=dev-libs/openssl-1.1.0g:0[bindist(-)=] ) dev-libs/openssl:0=[static-libs(+)] ) |