summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--contrib/caldera/openssh.spec6
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
-rw-r--r--version.h4
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 @@
44 disable privsep and enable setuid for the 3.2.2 release 44 disable privsep and enable setuid for the 3.2.2 release
45 - (bal) Fixed up PAM case. I think. 45 - (bal) Fixed up PAM case. I think.
46 - (bal) Clarified openbsd-compat/*-cray.* Licence provided by Wendy 46 - (bal) Clarified openbsd-compat/*-cray.* Licence provided by Wendy
47 - (bal) OpenBSD CVS Sync
48 - markus@cvs.openbsd.org 2002/05/15 21:05:29
49 [version.h]
50 enter OpenSSH_3.2.2
51 - (bal) Caldara, Suse, and Redhat openssh.specs updated.
47 52
4820020514 5320020514
49 - (stevesk) [README.privsep] PAM+privsep works with Solaris 8. 54 - (stevesk) [README.privsep] PAM+privsep works with Solaris 8.
@@ -648,4 +653,4 @@
648 - (stevesk) entropy.c: typo in debug message 653 - (stevesk) entropy.c: typo in debug message
649 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 654 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
650 655
651$Id: ChangeLog,v 1.2133 2002/05/15 21:37:34 mouring Exp $ 656$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 @@
1%define use-stable 1 1%define use-stable 1
2%if %{use-stable} 2%if %{use-stable}
3 %define version 3.2.1p1 3 %define version 3.2.2
4 %define cvs %{nil} 4 %define cvs %{nil}
5 %define release 1 5 %define release 1
6%else 6%else
7 %define version 3.2.1p1 7 %define version 3.2.2
8 %define cvs cvs20020515 8 %define cvs cvs20020515
9 %define release 0r1 9 %define release 0r1
10%endif 10%endif
@@ -224,4 +224,4 @@ by Jim Knoble <jmknoble@pobox.com>.
224%ChangeLog 224%ChangeLog
225* Mon Jan 01 1998 ... 225* Mon Jan 01 1998 ...
226 226
227$Id: openssh.spec,v 1.30 2002/05/14 16:03:46 tim Exp $ 227$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 @@
1%define ver 3.2.1p1 1%define ver 3.2.2
2%define rel 1 2%define rel 1
3 3
4# OpenSSH privilege separation requires a user & group ID 4# 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 @@
1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
2Name: openssh 2Name: openssh
3Version: 3.2p1 3Version: 3.2.2
4URL: http://www.openssh.com/ 4URL: http://www.openssh.com/
5Release: 1 5Release: 1
6Source0: openssh-%{version}.tar.gz 6Source0: 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 @@
1/* $OpenBSD: version.h,v 1.30 2002/04/23 12:54:10 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.31 2002/05/15 21:05:29 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_3.2.1p1" 3#define SSH_VERSION "OpenSSH_3.2.2"