From 9eaeea2cf2b6af5f166cfa9ad3c7a90711a147a9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 10 Aug 2014 11:35:05 +1000 Subject: - (djm) [README contrib/caldera/openssh.spec] [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Update versions --- contrib/caldera/openssh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/caldera/openssh.spec') diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 0061fe933..f0a92e758 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -16,7 +16,7 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 -%define version 6.6p1 +%define version 6.7p1 %if %{use_stable} %define cvs %{nil} %define release 1 @@ -363,4 +363,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.83 2014/02/27 23:03:55 djm Exp $ +$Id: openssh.spec,v 1.84 2014/08/10 01:35:34 djm Exp $ -- cgit v1.2.3 From a75aca1bbc989aa9f8b1b08489d37855f3d24d1a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 19 Aug 2014 11:36:07 +1000 Subject: - (djm) [INSTALL contrib/caldera/openssh.spec contrib/cygwin/README] [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Remove mentions of TCP wrappers. --- ChangeLog | 3 +++ INSTALL | 14 +------------- contrib/caldera/openssh.spec | 3 +-- contrib/cygwin/README | 1 - contrib/redhat/openssh.spec | 3 +-- contrib/suse/openssh.spec | 3 --- 6 files changed, 6 insertions(+), 21 deletions(-) (limited to 'contrib/caldera/openssh.spec') diff --git a/ChangeLog b/ChangeLog index 3072f886d..0b327aeff 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 576723048..4e7437fb0 100644 --- a/INSTALL +++ b/INSTALL @@ -55,15 +55,6 @@ passphrase requester. This is maintained separately at: 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 @@ Integration Architecture. The default for OSF1 machines is enable. --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 @@ Please refer to the "reporting bugs" section of the webpage at 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 f0a92e758..0011b4dea 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -178,7 +178,6 @@ by Jim Knoble . 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 @@ fi * 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 2562b6186..dd21493d7 100644 --- a/contrib/cygwin/README +++ b/contrib/cygwin/README @@ -77,7 +77,6 @@ with the aforementioned cygport script: zlib crypt openssl-devel - libwrap-devel libedit-devel libkrb5-devel diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index f66c1f65a..9bdce1e3c 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -86,7 +86,7 @@ PreReq: initscripts >= 5.00 %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 @@ echo K5DIR=$K5DIR --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 0b8b583c3..f87674317 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -28,11 +28,9 @@ Provides: ssh # (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 @@ CFLAGS="$RPM_OPT_FLAGS" \ --mandir=%{_mandir} \ --with-privsep-path=/var/lib/empty \ --with-pam \ - --with-tcp-wrappers \ --libexecdir=%{_libdir}/ssh make -- cgit v1.2.3