From ea43742e77ca5a14b625ebf073ba696b75cd7330 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 2 Oct 2009 11:49:03 +1000 Subject: pull in 5.3 release changes from branch: 20090926 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update for release - (djm) [README] update relnotes URL - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere - (djm) Release 5.3p1 --- contrib/caldera/openssh.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/caldera/openssh.spec') diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 42dbcfeeb..9ced32faf 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,11 +17,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 5.2p1 + %define version 5.3p1 %define cvs %{nil} %define release 1 %else - %define version 5.2p1 + %define version 5.3p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -358,4 +358,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.66 2009/02/21 07:03:05 djm Exp $ +$Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $ -- cgit v1.2.3 From d27d85d5320bb946d4bb734dcf45a8d20bad6020 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 24 Feb 2010 18:21:45 +1100 Subject: contrib/caldera/openssh.spec contrib/redhat/openssh.spec contrib/suse/openssh.spec --- ChangeLog | 2 ++ contrib/caldera/openssh.spec | 4 +++- contrib/redhat/openssh.spec | 2 ++ contrib/suse/openssh.spec | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) (limited to 'contrib/caldera/openssh.spec') diff --git a/ChangeLog b/ChangeLog index 761c1913a..10c074c26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ [regress/agent-pkcs11.sh] test for PKCS#11 support (currently disabled) - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Add PKCS#11 helper binary and manpage 20100212 - (djm) OpenBSD CVS Sync diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9ced32faf..e6c030c0d 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -319,6 +319,7 @@ fi %{_bindir}/ssh-keyscan %dir %{_libexecdir} %attr(4711,root,root) %{_libexecdir}/ssh-keysign +%{_libexecdir}/ssh-pkcs11-helper %{_sbindir}/ssh-host-keygen %dir %{_defaultdocdir}/%{name}-%{version} %{_defaultdocdir}/%{name}-%{version}/CREDITS @@ -330,6 +331,7 @@ fi %{_defaultdocdir}/%{name}-%{version}/faq.html %{_mandir}/man1/* %{_mandir}/man8/ssh-keysign.8.gz +%{_mandir}/man8/ssh-pkcs11-helper.8.gz %{_mandir}/man5/ssh_config.5.gz %Files server @@ -358,4 +360,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $ +$Id: openssh.spec,v 1.68 2010/02/24 07:21:46 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 1bdaf2d93..a15afc7ee 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -345,7 +345,9 @@ fi %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* %attr(0755,root,root) %dir %{_libexecdir}/openssh %attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign +%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* +%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8* %endif %if %{scard} %attr(0755,root,root) %dir %{_datadir}/openssh diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 12661eeae..c09246d1f 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -220,6 +220,7 @@ fi %attr(0755,root,root) %dir %{_libdir}/ssh %attr(0755,root,root) %{_libdir}/ssh/sftp-server %attr(4711,root,root) %{_libdir}/ssh/ssh-keysign +%attr(0755,root,root) %{_libdir}/ssh/ssh-pkcs11-helper %attr(0644,root,root) %doc %{_mandir}/man1/scp.1* %attr(0644,root,root) %doc %{_mandir}/man1/sftp.1* %attr(-,root,root) %doc %{_mandir}/man1/slogin.1* @@ -233,6 +234,7 @@ fi %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5* %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8* %attr(0644,root,root) %doc %{_mandir}/man8/ssh-keysign.8* +%attr(0644,root,root) %doc %{_mandir}/man8/ssh-pkcs11-helper.8* %attr(0644,root,root) %doc %{_mandir}/man8/sshd.8* %attr(0644,root,root) /var/adm/fillup-templates/sysconfig.ssh -- cgit v1.2.3 From 6bf31786cfa4518f2c81088ddaa7c34de0b532bf Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 8 Mar 2010 09:41:02 +1100 Subject: - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] crank version numbers --- ChangeLog | 3 +++ README | 4 ++-- contrib/caldera/openssh.spec | 6 +++--- contrib/redhat/openssh.spec | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'contrib/caldera/openssh.spec') diff --git a/ChangeLog b/ChangeLog index 707be2dd6..ee1c3417f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ - djm@cvs.openbsd.org 2010/03/07 22:01:32 [version.h] openssh-5.4 + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + crank version numbers + 20100307 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that diff --git a/README b/README index 16666518a..0ecb670b6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.3 for the release notes. +See http://www.openssh.com/txt/release-5.4 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.71 2009/10/02 01:49:03 djm Exp $ +$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index e6c030c0d..7c291a0eb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,11 +17,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 5.3p1 + %define version 5.4p1 %define cvs %{nil} %define release 1 %else - %define version 5.3p1 + %define version 5.4p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -360,4 +360,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.68 2010/02/24 07:21:46 djm Exp $ +$Id: openssh.spec,v 1.69 2010/03/07 22:41:03 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 4bec90078..de24f1c5d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.3p1 +%define ver 5.4p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID -- cgit v1.2.3