- (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi>

diff --git a/CREDITS b/CREDITS
index 63dc64add24856626d9b55bafa0a9de4800b7cb4..0bae5a1a5994f53675476d76e62f16087cf6e75b 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -58,6 +58,7 @@ Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch
 Nate Itkin <nitkin@europa.com> - SunOS 4.1.x fixes
 Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches
 Pavel Troller <patrol@omni.sinus.cz> - Bugfixes
+Pekka Savola <pekkas@netcore.fi> - Bugfixes
 Peter Kocks <peter.kocks@baygate.com> - Makefile fixes
 Phil Hands <phil@hands.com> - Debian scripts, assorted patches
 Phil Karn <karn@ka9q.ampr.org> - Autoconf fix

diff --git a/ChangeLog b/ChangeLog
index 9a8a3965eaf80a496fa874f7b45033ed4e0c62d0..ef8407e19ceb7b5d3e867541fe89da656ed1b0c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20000923
  - (djm) Fix address logging in utmp from Kevin Steves 
    <stevesk@sweden.hp.com>
+ - (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi>
 
 20000920
  - (djm) Fix bad path substitution. Report from Andrew Miner

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 37316d21e08c25b6cffa8a09670b96b2187b95fb..3bf444352a8226a166c7decc95f841270604a89b 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -227,8 +227,8 @@ fi
 %doc CREDITS UPGRADING
 %attr(0755,root,root) /usr/bin/ssh-keygen
 %attr(0755,root,root) /usr/bin/scp
-%attr(0644,root,root) /usr/man/man1/ssh-keygen.1*
-%attr(0644,root,root) /usr/man/man1/scp.1*
+%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
+%attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir /etc/ssh
 %attr(0755,root,root) %dir /usr/libexec/openssh
 
@@ -237,17 +237,19 @@ fi
 %attr(4755,root,root) /usr/bin/ssh
 %attr(0755,root,root) /usr/bin/ssh-agent
 %attr(0755,root,root) /usr/bin/ssh-add
-%attr(0644,root,root) /usr/man/man1/ssh.1*
-%attr(0644,root,root) /usr/man/man1/ssh-agent.1*
-%attr(0644,root,root) /usr/man/man1/ssh-add.1*
+%attr(0644,root,root) %{_mandir}/man1/ssh.1*
+%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
+%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
 %attr(0644,root,root) %config(noreplace) /etc/ssh/ssh_config
 %attr(-,root,root) /usr/bin/slogin
-%attr(-,root,root) /usr/man/man1/slogin.1*
+%attr(-,root,root) %{_mandir}/man1/slogin.1*
 
 %files server
 %defattr(-,root,root)
 %attr(0755,root,root) /usr/sbin/sshd
-%attr(0644,root,root) /usr/man/man8/sshd.8*
+%attr(0755,root,root) /usr/libexec/openssh/sftp-server
+%attr(0644,root,root) %{_mandir}/man8/sshd.8*
+%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 %attr(0600,root,root) %config(noreplace) /etc/ssh/sshd_config
 %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
 %attr(0755,root,root) %config /etc/rc.d/init.d/sshd

diff --git a/sftp-server.8 b/sftp-server.8
index 9811a3b4266cf14dddf1511ff7432603fb4213ce..59c997c3ff82b03c0ffd1fe03d55233e186b8845 100644 (file)
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -45,8 +45,7 @@ See
 for more information.
 .Sh HISTORY
 .Nm
-first appeared in
-.Ox 2.8 .
+first appeared in OpenBSD 2.8.
 .Sh AUTHOR
 Markus Friedl <markus@openbsd.org>
 .Sh SEE ALSO