summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-12-10 22:12:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-12-10 22:12:54 +0000
commit4cc90a492e9f0eee49e77e192a2c1226260fe4f3 (patch)
tree52a3ecdd59eeaff2b87b52627ec8a5278fd3b530
parent971c97317fd535b363ff6414d6f266325f7a3842 (diff)
20001211
- (bal) Applied patch to include ssh-keyscan into Redhat's package, and patch to install ssh-keyscan manpage. Patch by Pekka Savola <pekka@netcore.fi>
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in1
-rw-r--r--contrib/redhat/openssh.spec2
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 18339c47..ef9dd84b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20001211
+ - (bal) Applied patch to include ssh-keyscan into Redhat's package, and
+ patch to install ssh-keyscan manpage. Patch by Pekka Savola
+ <pekka@netcore.fi>
+
20001210
- (bal) OpenBSD CVS updates
- markus@cvs.openbsd.org 2000/12/09 13:41:51
diff --git a/Makefile.in b/Makefile.in
index b351985c..4a6bf954 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,6 +157,7 @@ install-files:
$(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
$(INSTALL) -m 644 ssh-agent.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
$(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
+ $(INSTALL) -m 644 ssh-keyscan.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
$(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
$(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
-rm -f $(DESTDIR)$(bindir)/slogin
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index ad2c2a98..18b9ade0 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -209,7 +209,9 @@ fi
%doc CREDITS LICENCE
%attr(0755,root,root) %{_bindir}/ssh-keygen
%attr(0755,root,root) %{_bindir}/scp
+%attr(0755,root,root) %{_bindir}/ssh-keyscan
%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
+%attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
%attr(0644,root,root) %{_mandir}/man1/scp.1*
%attr(0755,root,root) %dir %{_sysconfdir}
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes