From 4e67d38a7eda0c261d7c6d0826ec35f34117beed Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Wed, 15 May 2002 21:50:14 +0000
Subject: [PATCH]  - (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.

---
 ChangeLog                    | 7 ++++++-
 contrib/caldera/openssh.spec | 6 +++---
 contrib/redhat/openssh.spec  | 2 +-
 contrib/suse/openssh.spec    | 2 +-
 version.h                    | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2adca2b3b..6ab8e0253 100644
--- 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.
@@ -648,4 +653,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2133 2002/05/15 21:37:34 mouring Exp $
+$Id: ChangeLog,v 1.2134 2002/05/15 21:50:14 mouring Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 968dc03d1..5c0007adf 100644
--- 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
@@ -224,4 +224,4 @@ by Jim Knoble <jmknoble@pobox.com>.
 %ChangeLog
 * Mon Jan 01 1998 ...
 
-$Id: openssh.spec,v 1.30 2002/05/14 16:03:46 tim Exp $
+$Id: openssh.spec,v 1.31 2002/05/15 21:50:15 mouring Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 33d62e3ce..6e942e6ba 100644
--- 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 bfaa95bb7..5393a914c 100644
--- 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 c67cf1b4d..84fa1392b 100644
--- 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"