summaryrefslogtreecommitdiff
path: root/source/n/openssh/openssh.tcp_wrappers.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-08-27 20:27:22 +0000
committerEric Hameleers <alien@slackware.com>2018-08-28 09:00:35 +0200
commitb70192b9212452c9cca2049c9e718ea7d88dd765 (patch)
tree9144e8186e09d92f269b5bb49a5579e297857730 /source/n/openssh/openssh.tcp_wrappers.diff
parent0cb1f4c725ab13afe5aa3c1f488d665e4db1a304 (diff)
downloadcurrent-b70192b9212452c9cca2049c9e718ea7d88dd765.tar.gz
Mon Aug 27 20:27:22 UTC 201820180827202722
a/kernel-firmware-20180825_fea76a0-noarch-1.txz: Upgraded. ap/vim-8.1.0328-x86_64-1.txz: Upgraded. d/meson-0.47.2-x86_64-1.txz: Upgraded. d/python-setuptools-40.2.0-x86_64-1.txz: Upgraded. l/python-certifi-2018.8.24-x86_64-1.txz: Upgraded. l/python-idna-2.7-x86_64-1.txz: Upgraded. l/python-packaging-17.1-x86_64-1.txz: Upgraded. l/python-pillow-5.2.0-x86_64-1.txz: Upgraded. l/python-requests-2.19.1-x86_64-1.txz: Upgraded. l/python-urllib3-1.23-x86_64-1.txz: Upgraded. l/talloc-2.1.14-x86_64-1.txz: Upgraded. l/tdb-1.3.16-x86_64-1.txz: Upgraded. l/tevent-0.9.37-x86_64-1.txz: Upgraded. n/ethtool-4.18-x86_64-1.txz: Upgraded. n/openssh-7.8p1-x86_64-1.txz: Upgraded. n/samba-4.8.5-x86_64-1.txz: Upgraded. x/xauth-1.0.10-x86_64-3.txz: Rebuilt. Patched to fix a bug where changing the hostname caused X access to be lost. Thanks to TurboBlaze. xap/vim-gvim-8.1.0328-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/openssh/openssh.tcp_wrappers.diff')
-rw-r--r--source/n/openssh/openssh.tcp_wrappers.diff69
1 files changed, 33 insertions, 36 deletions
diff --git a/source/n/openssh/openssh.tcp_wrappers.diff b/source/n/openssh/openssh.tcp_wrappers.diff
index b0a1c4ce..24a259c7 100644
--- a/source/n/openssh/openssh.tcp_wrappers.diff
+++ b/source/n/openssh/openssh.tcp_wrappers.diff
@@ -1,9 +1,8 @@
-diff -uprN openssh-7.7p1.orig/configure.ac openssh-7.7p1/configure.ac
---- openssh-7.7p1.orig/configure.ac 2018-04-02 14:38:28.000000000 +0900
-+++ openssh-7.7p1/configure.ac 2018-04-04 17:46:13.798168547 +0900
-@@ -1542,6 +1542,62 @@ AC_ARG_WITH([skey],
- ]
- )
+--- ./configure.ac.orig 2018-08-23 00:41:42.000000000 -0500
++++ ./configure.ac 2018-08-25 19:14:10.706002529 -0500
+@@ -1502,6 +1502,62 @@
+ AC_MSG_RESULT([no])
+ fi
+# Check whether user wants TCP wrappers support
+TCPW_MSG="no"
@@ -64,41 +63,16 @@ diff -uprN openssh-7.7p1.orig/configure.ac openssh-7.7p1/configure.ac
# Check whether user wants to use ldns
LDNS_MSG="no"
AC_ARG_WITH(ldns,
-@@ -5216,6 +5272,7 @@ echo " OSF SIA support
+@@ -5177,6 +5233,7 @@
+ echo " OSF SIA support: $SIA_MSG"
echo " KerberosV support: $KRB5_MSG"
echo " SELinux support: $SELINUX_MSG"
- echo " S/KEY support: $SKEY_MSG"
+echo " TCP Wrappers support: $TCPW_MSG"
echo " MD5 password support: $MD5_MSG"
echo " libedit support: $LIBEDIT_MSG"
echo " libldns support: $LDNS_MSG"
-diff -uprN openssh-7.7p1.orig/sshd.8 openssh-7.7p1/sshd.8
---- openssh-7.7p1.orig/sshd.8 2018-04-02 14:38:28.000000000 +0900
-+++ openssh-7.7p1/sshd.8 2018-04-04 17:46:13.799168500 +0900
-@@ -845,6 +845,12 @@ the user's home directory becomes access
- This file should be writable only by the user, and need not be
- readable by anyone else.
- .Pp
-+.It Pa /etc/hosts.allow
-+.It Pa /etc/hosts.deny
-+Access controls that should be enforced by tcp-wrappers are defined here.
-+Further details are described in
-+.Xr hosts_access 5 .
-+.Pp
- .It Pa /etc/hosts.equiv
- This file is for host-based authentication (see
- .Xr ssh 1 ) .
-@@ -947,6 +953,7 @@ The content of this file is not sensitiv
- .Xr ssh-keygen 1 ,
- .Xr ssh-keyscan 1 ,
- .Xr chroot 2 ,
-+.Xr hosts_access 5 ,
- .Xr login.conf 5 ,
- .Xr moduli 5 ,
- .Xr sshd_config 5 ,
-diff -uprN openssh-7.7p1.orig/sshd.c openssh-7.7p1/sshd.c
---- openssh-7.7p1.orig/sshd.c 2018-04-02 14:38:28.000000000 +0900
-+++ openssh-7.7p1/sshd.c 2018-04-04 18:24:08.499515628 +0900
+--- ./sshd.c.orig 2018-08-23 00:41:42.000000000 -0500
++++ ./sshd.c 2018-08-25 19:12:52.901002527 -0500
@@ -122,6 +122,12 @@
#include "auth-options.h"
#include "version.h"
@@ -112,7 +86,7 @@ diff -uprN openssh-7.7p1.orig/sshd.c openssh-7.7p1/sshd.c
/* Re-exec fds */
#define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
-@@ -2005,6 +2011,26 @@ main(int ac, char **av)
+@@ -2063,6 +2069,26 @@
packet_set_server();
ssh = active_state; /* XXX */
@@ -139,3 +113,26 @@ diff -uprN openssh-7.7p1.orig/sshd.c openssh-7.7p1/sshd.c
check_ip_options(ssh);
/* Prepare the channels layer */
+--- ./sshd.8.orig 2018-08-23 00:41:42.000000000 -0500
++++ ./sshd.8 2018-08-25 19:12:52.899002527 -0500
+@@ -873,6 +873,12 @@
+ This file should be writable only by the user, and need not be
+ readable by anyone else.
+ .Pp
++.It Pa /etc/hosts.allow
++.It Pa /etc/hosts.deny
++Access controls that should be enforced by tcp-wrappers are defined here.
++Further details are described in
++.Xr hosts_access 5 .
++.Pp
+ .It Pa /etc/hosts.equiv
+ This file is for host-based authentication (see
+ .Xr ssh 1 ) .
+@@ -975,6 +981,7 @@
+ .Xr ssh-keygen 1 ,
+ .Xr ssh-keyscan 1 ,
+ .Xr chroot 2 ,
++.Xr hosts_access 5 ,
+ .Xr login.conf 5 ,
+ .Xr moduli 5 ,
+ .Xr sshd_config 5 ,