summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/redhat/openssh.spec27
2 files changed, 29 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 84212ea10..9c8cafe94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 - ID sync for auth-passwd.c 7 - ID sync for auth-passwd.c
8 - (djm) Warn and disable compression on platforms which can't handle both 8 - (djm) Warn and disable compression on platforms which can't handle both
9 useprivilegeseparation=yes and compression=yes 9 useprivilegeseparation=yes and compression=yes
10 - (djm) contrib/redhat/openssh.spec hacking:
11 - Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
12 - Add new {ssh,sshd}_config.5 manpages
13 - Add new ssh-keysign program and remove setuid from ssh client
10 14
1120020620 1520020620
12 - (bal) Fixed AIX environment handling, use setpcred() instead of existing 16 - (bal) Fixed AIX environment handling, use setpcred() instead of existing
@@ -996,4 +1000,4 @@
996 - (stevesk) entropy.c: typo in debug message 1000 - (stevesk) entropy.c: typo in debug message
997 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1001 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
998 1002
999$Id: ChangeLog,v 1.2237 2002/06/21 06:20:44 djm Exp $ 1003$Id: ChangeLog,v 1.2238 2002/06/21 06:42:41 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b3dccfba6..66225caff 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -26,6 +26,9 @@
26# Disable IPv6 (avoids DNS hangs on some glibc versions) 26# Disable IPv6 (avoids DNS hangs on some glibc versions)
27%define noip6 0 27%define noip6 0
28 28
29# Do we want kerberos5 support (1=yes 0=no)
30%define kerberos5 1
31
29# Reserve options to override askpass settings with: 32# Reserve options to override askpass settings with:
30# rpm -ba|--rebuild --define 'skip_xxx 1' 33# rpm -ba|--rebuild --define 'skip_xxx 1'
31%{?skip_x11_askpass:%define no_x11_askpass 1} 34%{?skip_x11_askpass:%define no_x11_askpass 1}
@@ -40,6 +43,11 @@
40%define noip6 1 43%define noip6 1
41%endif 44%endif
42 45
46# Turn off some stuff for resuce builds
47%if %{rescue}
48%define kerberos5 0
49%endif
50
43# Options for static OpenSSL link: 51# Options for static OpenSSL link:
44# rpm -ba|--rebuild --define "static_openssl 1" 52# rpm -ba|--rebuild --define "static_openssl 1"
45%{?static_openssl:%define static_libcrypto 1} 53%{?static_openssl:%define static_libcrypto 1}
@@ -185,10 +193,14 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
185 --with-ipv4-default \ 193 --with-ipv4-default \
186%endif 194%endif
187%if %{rescue} 195%if %{rescue}
188 --without-pam --with-md5-passwords 196 --without-pam --with-md5-passwords \
189%else 197%else
190 --with-pam --with-kerberos5=/usr/kerberos 198 --with-pam \
191%endif 199%endif
200%if %{kerberos5}
201 --with-kerberos5=/usr/kerberos \
202%else
203
192 204
193 205
194%if %{static_libcrypto} 206%if %{static_libcrypto}
@@ -306,6 +318,8 @@ fi
306%attr(0755,root,root) %{_bindir}/ssh-keygen 318%attr(0755,root,root) %{_bindir}/ssh-keygen
307%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* 319%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
308%attr(0755,root,root) %dir %{_libexecdir}/openssh 320%attr(0755,root,root) %dir %{_libexecdir}/openssh
321%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign
322%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
309%endif 323%endif
310%if %{scard} 324%if %{scard}
311%attr(0755,root,root) %dir %{_datadir}/openssh 325%attr(0755,root,root) %dir %{_datadir}/openssh
@@ -314,8 +328,9 @@ fi
314 328
315%files clients 329%files clients
316%defattr(-,root,root) 330%defattr(-,root,root)
317%attr(4755,root,root) %{_bindir}/ssh 331%attr(0755,root,root) %{_bindir}/ssh
318%attr(0644,root,root) %{_mandir}/man1/ssh.1* 332%attr(0644,root,root) %{_mandir}/man1/ssh.1*
333%attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
319%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config 334%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
320%attr(-,root,root) %{_bindir}/slogin 335%attr(-,root,root) %{_bindir}/slogin
321%attr(-,root,root) %{_mandir}/man1/slogin.1* 336%attr(-,root,root) %{_mandir}/man1/slogin.1*
@@ -337,6 +352,7 @@ fi
337%attr(0755,root,root) %{_sbindir}/sshd 352%attr(0755,root,root) %{_sbindir}/sshd
338%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server 353%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
339%attr(0644,root,root) %{_mandir}/man8/sshd.8* 354%attr(0644,root,root) %{_mandir}/man8/sshd.8*
355%attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
340%attr(0644,root,root) %{_mandir}/man8/sftp-server.8* 356%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
341%attr(0755,root,root) %dir %{_sysconfdir}/ssh 357%attr(0755,root,root) %dir %{_sysconfdir}/ssh
342%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config 358%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
@@ -362,6 +378,11 @@ fi
362%endif 378%endif
363 379
364%changelog 380%changelog
381* Fri Jun 21 2002 Damien Miller <djm@mindrot.org>
382- Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
383- Add new {ssh,sshd}_config.5 manpages
384- Add new ssh-keysign program and remove setuid from ssh client
385
365* Fri May 10 2002 Damien Miller <djm@mindrot.org> 386* Fri May 10 2002 Damien Miller <djm@mindrot.org>
366- Merge in spec changes from RedHat, reorgansie a little 387- Merge in spec changes from RedHat, reorgansie a little
367- Add Privsep user, group and directory 388- Add Privsep user, group and directory