Accepting request 547161 from home:pcerny:factory

temporarily downgrading to 7.2p2 to run tests on additional 7.2p2 patches

OBS-URL: https://build.opensuse.org/request/show/547161
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=125
This commit is contained in:
Petr Cerny 2017-12-01 15:46:07 +00:00 committed by Git OBS Bridge
parent 56e0af8154
commit 09d123e96c

View File

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent 20564b2e34b780c138dbd876c800dd5f28c91c23 # Parent 1ba8782c9cf18b104779c751839f3a2575c87954
Forward port TCP wrappers support (libwrap) from OpenSSH 6.6p1. Make it Forward port TCP wrappers support (libwrap) from OpenSSH 6.6p1. Make it
run-time switchable through the new UseTCPWrappers option for sshd. run-time switchable through the new UseTCPWrappers option for sshd.
@ -79,7 +79,7 @@ diff --git a/openssh-7.2p2/configure.ac b/openssh-7.2p2/configure.ac
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes" ; then if test "x$withval" != "xyes" ; then
@@ -5159,16 +5215,17 @@ echo " sshd superuser user PATH @@ -5135,16 +5191,17 @@ echo " sshd superuser user PATH
fi fi
echo " Manpage format: $MANTYPE" echo " Manpage format: $MANTYPE"
echo " PAM support: $PAM_MSG" echo " PAM support: $PAM_MSG"
@ -94,9 +94,9 @@ diff --git a/openssh-7.2p2/configure.ac b/openssh-7.2p2/configure.ac
echo " Solaris process contract support: $SPC_MSG" echo " Solaris process contract support: $SPC_MSG"
echo " Solaris project support: $SP_MSG" echo " Solaris project support: $SP_MSG"
echo " Solaris privilege support: $SPP_MSG" echo " Solaris privilege support: $SPP_MSG"
echo " systemd support: $SYSTEMD_MSG"
echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
echo " BSD Auth support: $BSD_AUTH_MSG"
diff --git a/openssh-7.2p2/servconf.c b/openssh-7.2p2/servconf.c diff --git a/openssh-7.2p2/servconf.c b/openssh-7.2p2/servconf.c
--- a/openssh-7.2p2/servconf.c --- a/openssh-7.2p2/servconf.c
+++ b/openssh-7.2p2/servconf.c +++ b/openssh-7.2p2/servconf.c
@ -281,7 +281,7 @@ diff --git a/openssh-7.2p2/sshd.8 b/openssh-7.2p2/sshd.8
diff --git a/openssh-7.2p2/sshd.c b/openssh-7.2p2/sshd.c diff --git a/openssh-7.2p2/sshd.c b/openssh-7.2p2/sshd.c
--- a/openssh-7.2p2/sshd.c --- a/openssh-7.2p2/sshd.c
+++ b/openssh-7.2p2/sshd.c +++ b/openssh-7.2p2/sshd.c
@@ -132,16 +132,23 @@ @@ -128,16 +128,23 @@
#include "ssherr.h" #include "ssherr.h"
#include "fips.h" #include "fips.h"
@ -305,7 +305,7 @@ diff --git a/openssh-7.2p2/sshd.c b/openssh-7.2p2/sshd.c
#define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
#define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2)
#define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) #define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3)
@@ -2298,16 +2305,37 @@ main(int ac, char **av) @@ -2285,16 +2292,37 @@ main(int ac, char **av)
* the socket goes away. * the socket goes away.
*/ */
remote_ip = get_remote_ipaddr(); remote_ip = get_remote_ipaddr();