- (djm) [INSTALL contrib/caldera/openssh.spec contrib/cygwin/README]
[contrib/redhat/openssh.spec contrib/suse/openssh.spec] Remove mentions
of TCP wrappers.
diff --git a/ChangeLog b/ChangeLog
index 3072f88..0b327ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
- (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC.
- (djm) [ssh-dss.c] Include openssl/dsa.h for DSA_SIG
+ - (djm) [INSTALL contrib/caldera/openssh.spec contrib/cygwin/README]
+ [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Remove mentions
+ of TCP wrappers.
20140811
- (djm) [myproposal.h] Make curve25519 KEX dependent on
diff --git a/INSTALL b/INSTALL
index 5767230..4e7437f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -55,15 +55,6 @@
http://www.jmknoble.net/software/x11-ssh-askpass/
-TCP Wrappers:
-
-If you wish to use the TCP wrappers functionality you will need at least
-tcpd.h and libwrap.a, either in the standard include and library paths,
-or in the directory specified by --with-tcp-wrappers. Version 7.6 is
-known to work.
-
-http://ftp.porcupine.org/pub/security/index.html
-
S/Key Libraries:
If you wish to use --with-skey then you will need the library below
@@ -180,9 +171,6 @@
--with-skey=PATH will enable S/Key one time password support. You will
need the S/Key libraries and header files installed for this to work.
---with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny)
-support.
-
--with-md5-passwords will enable the use of MD5 passwords. Enable this
if your operating system uses MD5 passwords and the system crypt() does
not support them directly (see the crypt(3/3c) man page). If enabled, the
@@ -266,4 +254,4 @@
http://www.openssh.com/
-$Id: INSTALL,v 1.88 2013/03/07 01:33:35 dtucker Exp $
+$Id: INSTALL,v 1.89 2014/08/19 01:36:08 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index f0a92e7..0011b4d 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -178,7 +178,6 @@
CFLAGS="$RPM_OPT_FLAGS" \
%configure \
--with-pam \
- --with-tcp-wrappers \
--with-privsep-path=%{_var}/empty/sshd \
#leave this line for easy edits.
@@ -363,4 +362,4 @@
* Mon Jan 01 1998 ...
Template Version: 1.31
-$Id: openssh.spec,v 1.84 2014/08/10 01:35:34 djm Exp $
+$Id: openssh.spec,v 1.85 2014/08/19 01:36:08 djm Exp $
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 2562b61..dd21493 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -77,7 +77,6 @@
zlib
crypt
openssl-devel
- libwrap-devel
libedit-devel
libkrb5-devel
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f66c1f6..9bdce1e 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -86,7 +86,7 @@
%else
Requires: initscripts >= 5.20
%endif
-BuildRequires: perl, openssl-devel, tcp_wrappers
+BuildRequires: perl, openssl-devel
BuildRequires: /bin/login
%if ! %{build6x}
BuildPreReq: glibc-devel, pam
@@ -192,7 +192,6 @@
--sysconfdir=%{_sysconfdir}/ssh \
--libexecdir=%{_libexecdir}/openssh \
--datadir=%{_datadir}/openssh \
- --with-tcp-wrappers \
--with-rsh=%{_bindir}/rsh \
--with-default-path=/usr/local/bin:/bin:/usr/bin \
--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 0b8b583..f876743 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -28,11 +28,9 @@
# (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.)
# building prerequisites -- stuff for
# OpenSSL (openssl-devel),
-# TCP Wrappers (tcpd-devel),
# and Gnome (glibdev, gtkdev, and gnlibsd)
#
BuildPrereq: openssl
-BuildPrereq: tcpd-devel
BuildPrereq: zlib-devel
#BuildPrereq: glibdev
#BuildPrereq: gtkdev
@@ -140,7 +138,6 @@
--mandir=%{_mandir} \
--with-privsep-path=/var/lib/empty \
--with-pam \
- --with-tcp-wrappers \
--libexecdir=%{_libdir}/ssh
make