Snapshot

[Pekka Savola]

On Sat, 16 Sep 2000, Damien Miller wrote:

> 
> Quite a few changes here, please test.

I noticed a few packaging issues.

With Red Hat (and probably SuSE too) spec file, sftp-server is not being
installed.  Also, if you compile OpenSSH w/ mandir /usr/share/man (RH 7.0
beta and up), the paths will go wrong because %configure will tell it to
use use /usr/share/man but %files uses /usr/man.  These have been replaced
by %{_mandir} macro.  Both changes done in my patch.

More "portability" patches like these could probably go in too, but I
think the rest, like %{_bindir} for /usr/bin, are pretty theoretical.

Also, sftp-server.8 seems to use an undefined (OpenBSD only?) definition
Ox:

---
.Sh HISTORY
.Nm
first appeared in
.Ox 2.8 .
---

Believe this is trying to hint at OpenBSD 2.8.  It shows as:

---
HISTORY
     sftp-server first appeared in

---

I couldn't find any other references to .Ox in OpenSSH (cvs or not). 
Some kind of patch attached.


-- 
Pekka Savola                 "Tell me of difficulties surmounted, 
Pekka.Savola at netcore.fi      not those you stumble over and fall"
-------------- next part --------------
--- openssh.spec.orig	Sat Sep 16 07:39:57 2000
+++ openssh.spec	Sat Sep 16 12:59:30 2000
@@ -227,8 +227,8 @@
 %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 @@
 %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
-------------- next part --------------
--- sftp-server.8.orig	Sat Sep 16 05:29:10 2000
+++ sftp-server.8	Sat Sep 16 13:03:56 2000
@@ -45,8 +45,7 @@
 for more information.
 .Sh HISTORY
 .Nm
-first appeared in
-.Ox 2.8 .
+first appeared in OpenBSD 2.8.
 .Sh AUTHOR
 Markus Friedl <markus at openbsd.org>
 .Sh SEE ALSO