summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2020-07-20 13:09:25 +1000
committerDamien Miller <djm@mindrot.org>2020-07-20 13:09:25 +1000
commit3ec9a6d7317236a9994887d8bd5d246af403a00d (patch)
treeb0fa3f748e9d6741b429062ccf212180637180cc /contrib
parenta2855c048b3f4b17d8787bd3f24232ec0cd79abe (diff)
Add ssh-sk-helper and manpage to RPM spec file
Based on patch from Fabio Pedretti
Diffstat (limited to 'contrib')
-rw-r--r--contrib/redhat/openssh.spec5
-rw-r--r--contrib/suse/openssh.spec4
2 files changed, 9 insertions, 0 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index dcd57aa19..2780d6b28 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -363,8 +363,10 @@ fi
363%attr(0755,root,root) %dir %{_libexecdir}/openssh 363%attr(0755,root,root) %dir %{_libexecdir}/openssh
364%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign 364%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign
365%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper 365%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper
366%attr(0755,root,root) %{_libexecdir}/openssh/ssh-sk-helper
366%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* 367%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
367%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8* 368%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8*
369%attr(0644,root,root) %{_mandir}/man8/ssh-sk-helper.8*
368%endif 370%endif
369%if %{scard} 371%if %{scard}
370%attr(0755,root,root) %dir %{_datadir}/openssh 372%attr(0755,root,root) %dir %{_datadir}/openssh
@@ -422,6 +424,9 @@ fi
422%endif 424%endif
423 425
424%changelog 426%changelog
427* Mon Jul 20 2020 Damien Miller <djm@mindrto.org>
428- Add ssh-sk-helper and corresponding manual page.
429
425* Sat Feb 10 2018 Darren Tucker <dtucker@dtucker.net> 430* Sat Feb 10 2018 Darren Tucker <dtucker@dtucker.net>
426- Update openssl-devel dependency to match current requirements. 431- Update openssl-devel dependency to match current requirements.
427- Handle Fedora >=6 openssl 1.0 compat libs. 432- Handle Fedora >=6 openssl 1.0 compat libs.
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index a2789052d..5f74247a4 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -75,6 +75,8 @@ patented algorithms to separate libraries (OpenSSL).
75This package contains an X Window System passphrase dialog for OpenSSH. 75This package contains an X Window System passphrase dialog for OpenSSH.
76 76
77%changelog 77%changelog
78* Mon Jul 20 2020 Damien Miller <djm@mindrto.org>
79- Add ssh-sk-helper and corresponding manual page.
78* Wed Oct 26 2005 Iain Morgan <imorgan@nas.nasa.gov> 80* Wed Oct 26 2005 Iain Morgan <imorgan@nas.nasa.gov>
79- Removed accidental inclusion of --without-zlib-version-check 81- Removed accidental inclusion of --without-zlib-version-check
80* Tue Oct 25 2005 Iain Morgan <imorgan@nas.nasa.gov> 82* Tue Oct 25 2005 Iain Morgan <imorgan@nas.nasa.gov>
@@ -211,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
211%attr(0755,root,root) %{_libdir}/ssh/sftp-server 213%attr(0755,root,root) %{_libdir}/ssh/sftp-server
212%attr(4711,root,root) %{_libdir}/ssh/ssh-keysign 214%attr(4711,root,root) %{_libdir}/ssh/ssh-keysign
213%attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper 215%attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper
216%attr(0755,root,root) %{_libdir}/ssh/ssh-sk-helper
214%attr(0644,root,root) %doc %{_mandir}/man1/scp.1* 217%attr(0644,root,root) %doc %{_mandir}/man1/scp.1*
215%attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* 218%attr(0644,root,root) %doc %{_mandir}/man1/sftp.1*
216%attr(0644,root,root) %doc %{_mandir}/man1/ssh.1* 219%attr(0644,root,root) %doc %{_mandir}/man1/ssh.1*
@@ -224,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
224%attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8* 227%attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8*
225%attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8* 228%attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8*
226%attr(0644,root,root) %doc %{_mandir}/man8/ssh-pkcs11-helper.8* 229%attr(0644,root,root) %doc %{_mandir}/man8/ssh-pkcs11-helper.8*
230%attr(0644,root,root) %doc %{_mandir}/man8/ssh-sk-helper.8*
227%attr(0644,root,root) %doc %{_mandir}/man8/sshd.8* 231%attr(0644,root,root) %doc %{_mandir}/man8/sshd.8*
228%attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh 232%attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh
229 233