- (bal) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2002/05/15 21:05:29
     [version.h]
     enter OpenSSH_3.2.2
 - (bal) Caldara, Suse, and Redhat openssh.specs updated.

diff --git a/ChangeLog b/ChangeLog
index c4aaab198edf467aabaac30202dd9d6da045d56e..8f4d927ea059f927f6472135a7921fd13b8eeecf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,11 @@
      disable privsep and enable setuid for the 3.2.2 release
  - (bal) Fixed up PAM case.  I think.
  - (bal) Clarified openbsd-compat/*-cray.* Licence provided by Wendy
+ - (bal) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/05/15 21:05:29
+     [version.h]
+     enter OpenSSH_3.2.2
+ - (bal) Caldara, Suse, and Redhat openssh.specs updated.
 
 20020514
  - (stevesk) [README.privsep] PAM+privsep works with Solaris 8.

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 511c2182699511ba8e5a1265b4635db3994a0a55..bfe5acb41d69551f8b66cb5daac885294de55f5c 100644 (file)
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -1,10 +1,10 @@
 %define use-stable     1
 %if %{use-stable}
-  %define version      3.2.1p1
+  %define version      3.2.2
   %define cvs          %{nil}
   %define release      1
 %else
-  %define version      3.2.1p1
+  %define version      3.2.2
   %define cvs          cvs20020515
   %define release      0r1
 %endif

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 33d62e3ce7bf15774b19a3b5cf2e1ba2ac574810..6e942e6bac5df63daa53f8eac3ea5d4a8c88c8cf 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.2.1p1
+%define ver 3.2.2
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index bfaa95bb7282bda4f4228a8ab826710246859c4e..5393a914c1ec9497d89a630e89e6aaef1669031d 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 3.2p1
+Version: 3.2.2
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz

diff --git a/version.h b/version.h
index c67cf1b4d44ddc249b3e5b9c4b6a1cb9fa55f82d..84fa1392b8539d740bdce30c4586645e788bda29 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-/* $OpenBSD: version.h,v 1.30 2002/04/23 12:54:10 markus Exp $ */
+/* $OpenBSD: version.h,v 1.31 2002/05/15 21:05:29 markus Exp $ */
 
-#define SSH_VERSION    "OpenSSH_3.2.1p1"
+#define SSH_VERSION    "OpenSSH_3.2.2"