summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--contrib/caldera/openssh.spec8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 015ab286b..825d60448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
13 - (bal) Disable Privsep for Tru64 after pre-authentication due to issues 13 - (bal) Disable Privsep for Tru64 after pre-authentication due to issues
14 with SIA. Also, clean up of tru64 support patch by Chris Adams 14 with SIA. Also, clean up of tru64 support patch by Chris Adams
15 <cmadams@hiwaay.net> 15 <cmadams@hiwaay.net>
16 - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files
17 section.
16 18
1720030318 1920030318
18 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] 20 - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1238,4 +1240,4 @@
1238 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1240 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1239 ok provos@ 1241 ok provos@
1240 1242
1241$Id: ChangeLog,v 1.2633.2.4 2003/03/21 01:15:17 mouring Exp $ 1243$Id: ChangeLog,v 1.2633.2.5 2003/03/21 04:52:55 tim Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index c442c1a57..e70ac8f37 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -198,7 +198,7 @@ xmkmf
198%Install 198%Install
199[ %{buildroot} != "/" ] && rm -rf %{buildroot} 199[ %{buildroot} != "/" ] && rm -rf %{buildroot}
200 200
201%makeinstall 201make install DESTDIR=%{buildroot}
202%makeinstall -C %{askpass} \ 202%makeinstall -C %{askpass} \
203 BINDIR=%{_libexecdir} \ 203 BINDIR=%{_libexecdir} \
204 MANPATH=%{_mandir} \ 204 MANPATH=%{_mandir} \
@@ -325,6 +325,7 @@ fi
325%{_bindir}/ssh-keygen 325%{_bindir}/ssh-keygen
326%{_bindir}/ssh-keyscan 326%{_bindir}/ssh-keyscan
327%dir %{_libexecdir} 327%dir %{_libexecdir}
328%attr(4711,root,root) %{_libexecdir}/ssh-keysign
328%{_sbindir}/ssh-host-keygen 329%{_sbindir}/ssh-host-keygen
329%dir %{_defaultdocdir}/%{name}-%{version} 330%dir %{_defaultdocdir}/%{name}-%{version}
330%{_defaultdocdir}/%{name}-%{version}/CREDITS 331%{_defaultdocdir}/%{name}-%{version}/CREDITS
@@ -335,6 +336,8 @@ fi
335%{_defaultdocdir}/%{name}-%{version}/TODO 336%{_defaultdocdir}/%{name}-%{version}/TODO
336%{_defaultdocdir}/%{name}-%{version}/faq.html 337%{_defaultdocdir}/%{name}-%{version}/faq.html
337%{_mandir}/man1/* 338%{_mandir}/man1/*
339%{_mandir}/man8/ssh-keysign.8.gz
340%{_mandir}/man5/ssh_config.5.gz
338 341
339%Files server 342%Files server
340%defattr(-,root,root) 343%defattr(-,root,root)
@@ -346,6 +349,7 @@ fi
346%config %{SVIcdir}/sshd 349%config %{SVIcdir}/sshd
347%{_libexecdir}/sftp-server 350%{_libexecdir}/sftp-server
348%{_sbindir}/sshd 351%{_sbindir}/sshd
352%{_mandir}/man5/sshd_config.5.gz
349%{_mandir}/man8/sftp-server.8.gz 353%{_mandir}/man8/sftp-server.8.gz
350%{_mandir}/man8/sshd.8.gz 354%{_mandir}/man8/sshd.8.gz
351 355
@@ -360,4 +364,4 @@ fi
360* Mon Jan 01 1998 ... 364* Mon Jan 01 1998 ...
361Template Version: 1.31 365Template Version: 1.31
362 366
363$Id: openssh.spec,v 1.39.2.1 2003/03/19 23:52:34 djm Exp $ 367$Id: openssh.spec,v 1.39.2.2 2003/03/21 04:52:56 tim Exp $