diff options
Diffstat (limited to 'net-misc/openssh/files')
5 files changed, 0 insertions, 244 deletions
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch deleted file mode 100644 index 2ed6a7b54a66..000000000000 --- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:02:11.850912525 -0700 -+++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:35:06.223424844 -0700 -@@ -907,9 +907,9 @@ - @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1) - { - /* Send our own protocol version identification. */ -- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); -+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", -+- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); -++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); - if (atomicio(vwrite, connection_out, client_version_string, - strlen(client_version_string)) != strlen(client_version_string)) - fatal("write: %.100s", strerror(errno)); -@@ -918,11 +918,11 @@ - --- a/sshd.c - +++ b/sshd.c - @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) -- char remote_version[256]; /* Must be at least as big as buf. */ -+ } - -- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, -+ xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n", -+- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment, -++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment, - *options.version_addendum == '\0' ? "" : " ", - options.version_addendum); - -@@ -982,13 +982,14 @@ - index e093f623..83f0932d 100644 - --- a/version.h - +++ b/version.h --@@ -3,4 +3,5 @@ -+@@ -3,3 +3,6 @@ - #define SSH_VERSION "OpenSSH_7.6" - -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE -+-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" -++#define SSH_PORTABLE "p1" - +#define SSH_HPN "-hpn14v12" -++#define SSH_X509 "-PKIXSSH-11.0" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN -++#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN - -- - 2.14.2 - diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch deleted file mode 100644 index 9d8f9a6cdef3..000000000000 --- a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/openssh-7.6p1+x509-11.2.diff 2018-03-13 10:48:08.755434051 -0700 -+++ b/openssh-7.6p1+x509-11.2.diff 2018-03-13 10:51:27.217980071 -0700 -@@ -29025,13 +29025,6 @@ - diff -ruN openssh-7.6p1/servconf.c openssh-7.6p1+x509-11.2/servconf.c - --- openssh-7.6p1/servconf.c 2017-10-02 22:34:26.000000000 +0300 - +++ openssh-7.6p1+x509-11.2/servconf.c 2018-02-11 12:07:01.000000000 +0200 --@@ -1,5 +1,5 @@ -- ---/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */ --+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */ -- /* -- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland -- * All rights reserved - @@ -9,6 +9,29 @@ - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be -@@ -29467,27 +29460,6 @@ - case sAllowUsers: - while ((arg = strdelim(&cp)) && *arg != '\0') { - if (options->num_allow_users >= MAX_ALLOW_USERS) --@@ -1663,9 +1931,9 @@ -- if (!arg || *arg == '\0') -- fatal("%s line %d: missing PermitOpen specification", -- filename, linenum); --- i = options->num_permitted_opens; /* modified later */ --+ value = options->num_permitted_opens; /* modified later */ -- if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { --- if (*activep && i == 0) { --+ if (*activep && value == 0) { -- options->num_permitted_opens = 1; -- options->permitted_opens = xcalloc(1, -- sizeof(*options->permitted_opens)); --@@ -1683,7 +1951,7 @@ -- if (arg == NULL || ((port = permitopen_port(arg)) < 0)) -- fatal("%s line %d: bad port number in " -- "PermitOpen", filename, linenum); --- if (*activep && i == 0) { --+ if (*activep && value == 0) { -- options->permitted_opens = xrecallocarray( -- options->permitted_opens, -- options->num_permitted_opens, - @@ -1885,11 +2153,20 @@ - - case sDeprecated: diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch deleted file mode 100644 index 5dc96d4d0a37..000000000000 --- a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 69bda0228861f3dacd4fb3d28b60ce9d103d254b Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" <djm@openbsd.org> -Date: Wed, 4 Oct 2017 18:49:30 +0000 -Subject: [PATCH] upstream commit - -fix (another) problem in PermitOpen introduced during the -channels.c refactor: the third and subsequent arguments to PermitOpen were -being silently ignored; ok markus@ - -Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd ---- - servconf.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/servconf.c b/servconf.c -index 2c321a4a..95686295 100644 ---- a/servconf.c -+++ b/servconf.c -@@ -1,5 +1,5 @@ - --/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */ -+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */ - /* - * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland - * All rights reserved -@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line, - if (!arg || *arg == '\0') - fatal("%s line %d: missing PermitOpen specification", - filename, linenum); -- i = options->num_permitted_opens; /* modified later */ -+ value = options->num_permitted_opens; /* modified later */ - if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { -- if (*activep && i == 0) { -+ if (*activep && value == 0) { - options->num_permitted_opens = 1; - options->permitted_opens = xcalloc(1, - sizeof(*options->permitted_opens)); -@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line, - if (arg == NULL || ((port = permitopen_port(arg)) < 0)) - fatal("%s line %d: bad port number in " - "PermitOpen", filename, linenum); -- if (*activep && i == 0) { -+ if (*activep && value == 0) { - options->permitted_opens = xrecallocarray( - options->permitted_opens, - options->num_permitted_opens, --- -2.16.1 - diff --git a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch b/net-misc/openssh/files/openssh-7.6_p1-warnings.patch deleted file mode 100644 index 5843dd162cd9..000000000000 --- a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/openbsd-compat/freezero.c b/openbsd-compat/freezero.c -index 3af8f4a7..7f6bc7fa 100644 ---- a/openbsd-compat/freezero.c -+++ b/openbsd-compat/freezero.c -@@ -14,6 +14,7 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include <string.h> - #include "includes.h" - - #ifndef HAVE_FREEZERO diff --git a/net-misc/openssh/files/sshd.rc6.5 b/net-misc/openssh/files/sshd.rc6.5 deleted file mode 100644 index 044cbe7268f2..000000000000 --- a/net-misc/openssh/files/sshd.rc6.5 +++ /dev/null @@ -1,89 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# 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 --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() { - # If this isn't a restart, 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). - # - # If, on the other hand, this *is* a restart, then the stop_pre - # action will have ensured that the config is usable and we don't - # need to do that again. - if [ "${RC_CMD}" != "restart" ] ; then - checkconfig || return $? - fi -} - -stop_pre() { - # If this is a restart, check to make sure the user's config - # isn't busted before we stop the running daemon. - if [ "${RC_CMD}" = "restart" ] ; then - checkconfig || return $? - fi -} - -reload() { - checkconfig || return $? - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} |