mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
openssh: update to 10.0p1
Change log: - https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ChangeLog Release notes: - https://www.openssh.com/releasenotes.html#10.0p1 Release notes: - https://www.openssh.com/txt/release-10.0p1
This commit is contained in:
parent
605b689be5
commit
6ca4e62031
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="openssh"
|
PKG_NAME="openssh"
|
||||||
PKG_VERSION="9.9p2"
|
PKG_VERSION="10.0p1"
|
||||||
PKG_SHA256="91aadb603e08cc285eddf965e1199d02585fa94d994d6cae5b41e1721e215673"
|
PKG_SHA256="021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="https://www.openssh.com/"
|
PKG_SITE="https://www.openssh.com/"
|
||||||
PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -u a/configure.ac b/configure.ac
|
diff -u a/configure.ac b/configure.ac
|
||||||
--- a/configure.ac 2018-10-16 20:01:20.000000000 -0400
|
--- a/configure.ac 2018-10-16 20:01:20.000000000 -0400
|
||||||
+++ b/configure.ac 2018-12-06 04:08:42.718993760 -0500
|
+++ b/configure.ac 2018-12-06 04:08:42.718993760 -0500
|
||||||
@@ -5185,6 +5185,19 @@
|
@@ -5355,6 +5355,19 @@
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ diff -u a/configure.ac b/configure.ac
|
|||||||
AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
|
AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
|
||||||
IPV4_IN6_HACK_MSG="no"
|
IPV4_IN6_HACK_MSG="no"
|
||||||
AC_ARG_WITH(4in6,
|
AC_ARG_WITH(4in6,
|
||||||
@@ -5565,6 +5578,7 @@
|
@@ -5754,6 +5767,7 @@
|
||||||
H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}`
|
H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}`
|
||||||
I=`eval echo ${user_path}` ; I=`eval echo ${I}`
|
I=`eval echo ${user_path}` ; I=`eval echo ${I}`
|
||||||
J=`eval echo ${superuser_path}` ; J=`eval echo ${J}`
|
J=`eval echo ${superuser_path}` ; J=`eval echo ${J}`
|
||||||
@ -29,7 +29,7 @@ diff -u a/configure.ac b/configure.ac
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "OpenSSH has been configured with the following options:"
|
echo "OpenSSH has been configured with the following options:"
|
||||||
@@ -5588,6 +5602,9 @@
|
@@ -5777,6 +5791,9 @@
|
||||||
if test ! -z "$superuser_path" ; then
|
if test ! -z "$superuser_path" ; then
|
||||||
echo " sshd superuser user PATH: $J"
|
echo " sshd superuser user PATH: $J"
|
||||||
fi
|
fi
|
||||||
@ -39,14 +39,13 @@ diff -u a/configure.ac b/configure.ac
|
|||||||
echo " Manpage format: $MANTYPE"
|
echo " Manpage format: $MANTYPE"
|
||||||
echo " PAM support: $PAM_MSG"
|
echo " PAM support: $PAM_MSG"
|
||||||
echo " OSF SIA support: $SIA_MSG"
|
echo " OSF SIA support: $SIA_MSG"
|
||||||
Common subdirectories: a/contrib and b/contrib
|
|
||||||
diff -u a/Makefile.in b/Makefile.in
|
diff -u a/Makefile.in b/Makefile.in
|
||||||
--- a/Makefile.in 2018-10-16 20:01:20.000000000 -0400
|
--- a/Makefile.in 2018-10-16 20:01:20.000000000 -0400
|
||||||
+++ b/Makefile.in 2018-12-06 04:00:04.301968236 -0500
|
+++ b/Makefile.in 2018-12-06 04:00:04.301968236 -0500
|
||||||
@@ -32,8 +32,10 @@
|
@@ -33,8 +33,10 @@
|
||||||
STRIP_OPT=@STRIP_OPT@
|
|
||||||
TEST_SHELL=@TEST_SHELL@
|
TEST_SHELL=@TEST_SHELL@
|
||||||
BUILDDIR=@abs_top_builddir@
|
BUILDDIR=@abs_top_builddir@
|
||||||
|
SK_STANDALONE=@SK_STANDALONE@
|
||||||
+KEYDIR=@KEYDIR@
|
+KEYDIR=@KEYDIR@
|
||||||
|
|
||||||
PATHS= -DSSHDIR=\"$(sysconfdir)\" \
|
PATHS= -DSSHDIR=\"$(sysconfdir)\" \
|
||||||
@ -54,7 +53,7 @@ diff -u a/Makefile.in b/Makefile.in
|
|||||||
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
|
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
|
||||||
-D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
|
-D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
|
||||||
-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
|
-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
|
||||||
@@ -168,11 +170,11 @@
|
@@ -192,11 +194,11 @@
|
||||||
-e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
|
-e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
|
||||||
-e 's|/usr/libexec|$(libexecdir)|g' \
|
-e 's|/usr/libexec|$(libexecdir)|g' \
|
||||||
-e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
|
-e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
|
||||||
@ -71,7 +70,6 @@ diff -u a/Makefile.in b/Makefile.in
|
|||||||
-e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
|
-e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
|
||||||
-e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
|
-e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
|
||||||
-e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
|
-e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
|
||||||
Common subdirectories: a/openbsd-compat and b/openbsd-compat
|
|
||||||
diff -u a/pathnames.h b/pathnames.h
|
diff -u a/pathnames.h b/pathnames.h
|
||||||
--- a/pathnames.h 2018-10-16 20:01:20.000000000 -0400
|
--- a/pathnames.h 2018-10-16 20:01:20.000000000 -0400
|
||||||
+++ b/pathnames.h 2018-12-06 04:15:01.286012398 -0500
|
+++ b/pathnames.h 2018-12-06 04:15:01.286012398 -0500
|
||||||
|
Loading…
x
Reference in New Issue
Block a user