diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/caldera/openssh.spec | 3 | ||||
-rw-r--r-- | contrib/cygwin/README | 1 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 3 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 3 |
4 files changed, 2 insertions, 8 deletions
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 <jmknoble@pobox.com>. | |||
178 | CFLAGS="$RPM_OPT_FLAGS" \ | 178 | CFLAGS="$RPM_OPT_FLAGS" \ |
179 | %configure \ | 179 | %configure \ |
180 | --with-pam \ | 180 | --with-pam \ |
181 | --with-tcp-wrappers \ | ||
182 | --with-privsep-path=%{_var}/empty/sshd \ | 181 | --with-privsep-path=%{_var}/empty/sshd \ |
183 | #leave this line for easy edits. | 182 | #leave this line for easy edits. |
184 | 183 | ||
@@ -363,4 +362,4 @@ fi | |||
363 | * Mon Jan 01 1998 ... | 362 | * Mon Jan 01 1998 ... |
364 | Template Version: 1.31 | 363 | Template Version: 1.31 |
365 | 364 | ||
366 | $Id: openssh.spec,v 1.84 2014/08/10 01:35:34 djm Exp $ | 365 | $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: | |||
77 | zlib | 77 | zlib |
78 | crypt | 78 | crypt |
79 | openssl-devel | 79 | openssl-devel |
80 | libwrap-devel | ||
81 | libedit-devel | 80 | libedit-devel |
82 | libkrb5-devel | 81 | libkrb5-devel |
83 | 82 | ||
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 | |||
86 | %else | 86 | %else |
87 | Requires: initscripts >= 5.20 | 87 | Requires: initscripts >= 5.20 |
88 | %endif | 88 | %endif |
89 | BuildRequires: perl, openssl-devel, tcp_wrappers | 89 | BuildRequires: perl, openssl-devel |
90 | BuildRequires: /bin/login | 90 | BuildRequires: /bin/login |
91 | %if ! %{build6x} | 91 | %if ! %{build6x} |
92 | BuildPreReq: glibc-devel, pam | 92 | BuildPreReq: glibc-devel, pam |
@@ -192,7 +192,6 @@ echo K5DIR=$K5DIR | |||
192 | --sysconfdir=%{_sysconfdir}/ssh \ | 192 | --sysconfdir=%{_sysconfdir}/ssh \ |
193 | --libexecdir=%{_libexecdir}/openssh \ | 193 | --libexecdir=%{_libexecdir}/openssh \ |
194 | --datadir=%{_datadir}/openssh \ | 194 | --datadir=%{_datadir}/openssh \ |
195 | --with-tcp-wrappers \ | ||
196 | --with-rsh=%{_bindir}/rsh \ | 195 | --with-rsh=%{_bindir}/rsh \ |
197 | --with-default-path=/usr/local/bin:/bin:/usr/bin \ | 196 | --with-default-path=/usr/local/bin:/bin:/usr/bin \ |
198 | --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ | 197 | --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 | |||
28 | # (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) | 28 | # (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) |
29 | # building prerequisites -- stuff for | 29 | # building prerequisites -- stuff for |
30 | # OpenSSL (openssl-devel), | 30 | # OpenSSL (openssl-devel), |
31 | # TCP Wrappers (tcpd-devel), | ||
32 | # and Gnome (glibdev, gtkdev, and gnlibsd) | 31 | # and Gnome (glibdev, gtkdev, and gnlibsd) |
33 | # | 32 | # |
34 | BuildPrereq: openssl | 33 | BuildPrereq: openssl |
35 | BuildPrereq: tcpd-devel | ||
36 | BuildPrereq: zlib-devel | 34 | BuildPrereq: zlib-devel |
37 | #BuildPrereq: glibdev | 35 | #BuildPrereq: glibdev |
38 | #BuildPrereq: gtkdev | 36 | #BuildPrereq: gtkdev |
@@ -140,7 +138,6 @@ CFLAGS="$RPM_OPT_FLAGS" \ | |||
140 | --mandir=%{_mandir} \ | 138 | --mandir=%{_mandir} \ |
141 | --with-privsep-path=/var/lib/empty \ | 139 | --with-privsep-path=/var/lib/empty \ |
142 | --with-pam \ | 140 | --with-pam \ |
143 | --with-tcp-wrappers \ | ||
144 | --libexecdir=%{_libdir}/ssh | 141 | --libexecdir=%{_libdir}/ssh |
145 | make | 142 | make |
146 | 143 | ||