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 @@
   - ID sync for auth-passwd.c
  - (djm) Warn and disable compression on platforms which can't handle both
    useprivilegeseparation=yes and compression=yes
+ - (djm) contrib/redhat/openssh.spec hacking:
+   - Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
+   - Add new {ssh,sshd}_config.5 manpages
+   - Add new ssh-keysign program and remove setuid from ssh client
 
 20020620
  - (bal) Fixed AIX environment handling, use setpcred() instead of existing
@@ -996,4 +1000,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2237 2002/06/21 06:20:44 djm Exp $
+$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 @@
 # Disable IPv6 (avoids DNS hangs on some glibc versions)
 %define noip6 0
 
+# Do we want kerberos5 support (1=yes 0=no)
+%define kerberos5 1
+
 # Reserve options to override askpass settings with:
 # rpm -ba|--rebuild --define 'skip_xxx 1'
 %{?skip_x11_askpass:%define no_x11_askpass 1}
@@ -40,6 +43,11 @@
 %define noip6 1
 %endif
 
+# Turn off some stuff for resuce builds
+%if %{rescue}
+%define kerberos5 0
+%endif
+
 # Options for static OpenSSL link:
 # rpm -ba|--rebuild --define "static_openssl 1"
 %{?static_openssl:%define static_libcrypto 1}
@@ -185,10 +193,14 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
         --with-ipv4-default \
 %endif
 %if %{rescue}
-        --without-pam --with-md5-passwords
+        --without-pam --with-md5-passwords \
 %else
-        --with-pam --with-kerberos5=/usr/kerberos
+        --with-pam \
 %endif
+%if %{kerberos5}
+         --with-kerberos5=/usr/kerberos \
+%else
+
 
 
 %if %{static_libcrypto}
@@ -306,6 +318,8 @@ fi
 %attr(0755,root,root) %{_bindir}/ssh-keygen
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
+%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign
+%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
 %endif
 %if %{scard}
 %attr(0755,root,root) %dir %{_datadir}/openssh
@@ -314,8 +328,9 @@ fi
 
 %files clients
 %defattr(-,root,root)
-%attr(4755,root,root) %{_bindir}/ssh
+%attr(0755,root,root) %{_bindir}/ssh
 %attr(0644,root,root) %{_mandir}/man1/ssh.1*
+%attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
 %attr(-,root,root) %{_bindir}/slogin
 %attr(-,root,root) %{_mandir}/man1/slogin.1*
@@ -337,6 +352,7 @@ fi
 %attr(0755,root,root) %{_sbindir}/sshd
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0644,root,root) %{_mandir}/man8/sshd.8*
+%attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
@@ -362,6 +378,11 @@ fi
 %endif
 
 %changelog
+* Fri Jun 21 2002 Damien Miller <djm@mindrot.org>
+- Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
+- Add new {ssh,sshd}_config.5 manpages
+- Add new ssh-keysign program and remove setuid from ssh client
+
 * Fri May 10 2002 Damien Miller <djm@mindrot.org>
 - Merge in spec changes from RedHat, reorgansie a little
 - Add Privsep user, group and directory