- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]

   [contrib/suse/openssh.spec] Prepare for 5.2p1

diff --git a/ChangeLog b/ChangeLog
index efddfc7d1777ea9370c61fe9304d7b90e5478305..06f09da622c695a5b931ed89a571ee8bf310bde2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
      [schnorr.c]
      signature should hash over the entire group, not just the generator
      (this is still disabled code)
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Prepare for 5.2p1
 
 20090216
  - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 264cd16aec8f10236416cff59163281201d31a2a..780a4dea576bba508e95330bc9606d27a68fd196 100644 (file)
--- 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.1p1
+  %define version      5.2p1
   %define cvs          %{nil}
   %define release      1
 %else
-  %define version      5.1p1
+  %define version      5.2p1
   %define cvs          cvs20050315
   %define release      0r1
 %endif
@@ -251,7 +251,7 @@ install -m 0755 contrib/caldera/ssh-host-keygen $SKG
 # install remaining docs
 DocD="%{buildroot}%{_defaultdocdir}/%{name}-%{version}"
 mkdir -p $DocD/%{askpass}
-cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO  $DocD
+cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO PROTOCOL* $DocD
 install -p -m 0444 %{SOURCE3}  $DocD/faq.html
 cp -a %{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad}  $DocD/%{askpass}
 %if %{use_stable}

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index bb9e4d616c98357375180ad9d6d5d74d71a43c70..10bdc1989a34fcbc317c3cc49e3874fe1a92e6a8 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 5.1p1
+%define ver 5.2p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
@@ -333,7 +333,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING*
+%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO WARNING*
 %attr(0755,root,root) %{_bindir}/scp
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7bd9e05694c8a5811f33372ee683d8e3ffe9bc05..62f43e1374e7bc41246ada8c1da0d3dd969e4ec0 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
 
 Summary:       OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:          openssh
-Version:       5.1p1
+Version:       5.2p1
 URL:           http://www.openssh.com/
 Release:       1
 Source0:       openssh-%{version}.tar.gz
@@ -200,7 +200,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog OVERVIEW README*
+%doc ChangeLog OVERVIEW README* PROTOCOL*
 %doc TODO CREDITS LICENCE
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config