summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--contrib/redhat/openssh.spec9
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 988a2c779..c9cde251e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
35 SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before. 35 SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before.
36 - (djm) Fix up Makefile and Redhat init script to create RSA host keys 36 - (djm) Fix up Makefile and Redhat init script to create RSA host keys
37 - (djm) Change to interim version 37 - (djm) Change to interim version
38 - (djm) Fix RPM spec file stupidity
38 39
3920001112 4020001112
40 - (bal) SCO Patch to add needed libraries for configure.in. Patch by 41 - (bal) SCO Patch to add needed libraries for configure.in. Patch by
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index a4567c1f4..ad2c2a98f 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -167,7 +167,6 @@ popd
167%install 167%install
168rm -rf $RPM_BUILD_ROOT 168rm -rf $RPM_BUILD_ROOT
169%{makeinstall} \ 169%{makeinstall} \
170 sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/ssh \
171 libexecdir=$RPM_BUILD_ROOT%{_libexecdir}/openssh \ 170 libexecdir=$RPM_BUILD_ROOT%{_libexecdir}/openssh \
172 DESTDIR=/ # Hack to disable key generation 171 DESTDIR=/ # Hack to disable key generation
173 172
@@ -212,8 +211,8 @@ fi
212%attr(0755,root,root) %{_bindir}/scp 211%attr(0755,root,root) %{_bindir}/scp
213%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* 212%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
214%attr(0644,root,root) %{_mandir}/man1/scp.1* 213%attr(0644,root,root) %{_mandir}/man1/scp.1*
215%attr(0755,root,root) %dir %{_sysconfdir}/ssh 214%attr(0755,root,root) %dir %{_sysconfdir}
216%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/primes 215%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes
217%attr(0755,root,root) %dir %{_libexecdir}/openssh 216%attr(0755,root,root) %dir %{_libexecdir}/openssh
218 217
219%files clients 218%files clients
@@ -224,7 +223,7 @@ fi
224%attr(0644,root,root) %{_mandir}/man1/ssh.1* 223%attr(0644,root,root) %{_mandir}/man1/ssh.1*
225%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1* 224%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
226%attr(0644,root,root) %{_mandir}/man1/ssh-add.1* 225%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
227%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config 226%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config
228%attr(-,root,root) %{_bindir}/slogin 227%attr(-,root,root) %{_bindir}/slogin
229%attr(-,root,root) %{_mandir}/man1/slogin.1* 228%attr(-,root,root) %{_mandir}/man1/slogin.1*
230 229
@@ -234,7 +233,7 @@ fi
234%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server 233%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
235%attr(0644,root,root) %{_mandir}/man8/sshd.8* 234%attr(0644,root,root) %{_mandir}/man8/sshd.8*
236%attr(0644,root,root) %{_mandir}/man8/sftp-server.8* 235%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
237%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config 236%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config
238%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd 237%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
239%attr(0755,root,root) %config /etc/rc.d/init.d/sshd 238%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
240 239