- (djm) [INSTALL contrib/caldera/openssh.spec contrib/cygwin/README]

[contrib/redhat/openssh.spec contrib/suse/openssh.spec] Remove mentions
   of TCP wrappers.
This commit is contained in:
Damien Miller 2014-08-19 11:36:07 +10:00
parent 3f022b5a94
commit a75aca1bbc
6 changed files with 6 additions and 21 deletions

View File

@ -2,6 +2,9 @@
- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
- (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC. - (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC.
- (djm) [ssh-dss.c] Include openssl/dsa.h for DSA_SIG - (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 20140811
- (djm) [myproposal.h] Make curve25519 KEX dependent on - (djm) [myproposal.h] Make curve25519 KEX dependent on

14
INSTALL
View File

@ -55,15 +55,6 @@ passphrase requester. This is maintained separately at:
http://www.jmknoble.net/software/x11-ssh-askpass/ 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: S/Key Libraries:
If you wish to use --with-skey then you will need the library below If you wish to use --with-skey then you will need the library below
@ -180,9 +171,6 @@ Integration Architecture. The default for OSF1 machines is enable.
--with-skey=PATH will enable S/Key one time password support. You will --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. 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 --with-md5-passwords will enable the use of MD5 passwords. Enable this
if your operating system uses MD5 passwords and the system crypt() does 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 not support them directly (see the crypt(3/3c) man page). If enabled, the
@ -266,4 +254,4 @@ Please refer to the "reporting bugs" section of the webpage at
http://www.openssh.com/ 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 $

View File

@ -178,7 +178,6 @@ by Jim Knoble <jmknoble@pobox.com>.
CFLAGS="$RPM_OPT_FLAGS" \ CFLAGS="$RPM_OPT_FLAGS" \
%configure \ %configure \
--with-pam \ --with-pam \
--with-tcp-wrappers \
--with-privsep-path=%{_var}/empty/sshd \ --with-privsep-path=%{_var}/empty/sshd \
#leave this line for easy edits. #leave this line for easy edits.
@ -363,4 +362,4 @@ fi
* Mon Jan 01 1998 ... * Mon Jan 01 1998 ...
Template Version: 1.31 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 $

View File

@ -77,7 +77,6 @@ with the aforementioned cygport script:
zlib zlib
crypt crypt
openssl-devel openssl-devel
libwrap-devel
libedit-devel libedit-devel
libkrb5-devel libkrb5-devel

View File

@ -86,7 +86,7 @@ PreReq: initscripts >= 5.00
%else %else
Requires: initscripts >= 5.20 Requires: initscripts >= 5.20
%endif %endif
BuildRequires: perl, openssl-devel, tcp_wrappers BuildRequires: perl, openssl-devel
BuildRequires: /bin/login BuildRequires: /bin/login
%if ! %{build6x} %if ! %{build6x}
BuildPreReq: glibc-devel, pam BuildPreReq: glibc-devel, pam
@ -192,7 +192,6 @@ echo K5DIR=$K5DIR
--sysconfdir=%{_sysconfdir}/ssh \ --sysconfdir=%{_sysconfdir}/ssh \
--libexecdir=%{_libexecdir}/openssh \ --libexecdir=%{_libexecdir}/openssh \
--datadir=%{_datadir}/openssh \ --datadir=%{_datadir}/openssh \
--with-tcp-wrappers \
--with-rsh=%{_bindir}/rsh \ --with-rsh=%{_bindir}/rsh \
--with-default-path=/usr/local/bin:/bin:/usr/bin \ --with-default-path=/usr/local/bin:/bin:/usr/bin \
--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \

View File

@ -28,11 +28,9 @@ Provides: ssh
# (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) # (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.)
# building prerequisites -- stuff for # building prerequisites -- stuff for
# OpenSSL (openssl-devel), # OpenSSL (openssl-devel),
# TCP Wrappers (tcpd-devel),
# and Gnome (glibdev, gtkdev, and gnlibsd) # and Gnome (glibdev, gtkdev, and gnlibsd)
# #
BuildPrereq: openssl BuildPrereq: openssl
BuildPrereq: tcpd-devel
BuildPrereq: zlib-devel BuildPrereq: zlib-devel
#BuildPrereq: glibdev #BuildPrereq: glibdev
#BuildPrereq: gtkdev #BuildPrereq: gtkdev
@ -140,7 +138,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-privsep-path=/var/lib/empty \ --with-privsep-path=/var/lib/empty \
--with-pam \ --with-pam \
--with-tcp-wrappers \
--libexecdir=%{_libdir}/ssh --libexecdir=%{_libdir}/ssh
make make