From 2bd2cd9b7834819bc965c202d654500bae8ea286 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 5 Jul 2005 19:16:24 +0000
Subject: [PATCH] Changes from the 0.9.8 branch.

---
 CHANGES      |  6 +++++-
 FAQ          |  2 +-
 STATUS       | 34 ++--------------------------------
 openssl.spec |  4 ++--
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/CHANGES b/CHANGES
index e7de869740..cd8f971a54 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,11 @@
 
   *) 
 
- Changes between 0.9.7h and 0.9.8  [xx XXX xxxx]
+ Changes between 0.9.8 and 0.9.8a  [XX xxx XXXX]
+
+  *) 
+
+ Changes between 0.9.7h and 0.9.8  [05 Jul 2005]
 
   *) Add libcrypto.pc and libssl.pc for those who feel they need them.
      [Richard Levitte]
diff --git a/FAQ b/FAQ
index 86b6617f44..82d8a6f887 100644
--- a/FAQ
+++ b/FAQ
@@ -72,7 +72,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.7g was released on April 11, 2005.
+OpenSSL 0.9.8 was released on July 5th, 2005.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
diff --git a/STATUS b/STATUS
index 912ea42665..abfd154c29 100644
--- a/STATUS
+++ b/STATUS
@@ -1,41 +1,11 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2005/06/28 05:55:22 $
+  ______________                           $Date: 2005/07/05 19:16:24 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.9:  Under development...
-    o  OpenSSL 0.9.8-beta7-dev (snapshot 20050624):
-	OpenVMS/Alpha [7.3-2; Compaq C 6.4-005]			SUCCESS
-	DJGPP							SUCCESS
-	Cygwin							SUCCESS
-	Irix 6.5.19m [MIPSpro 7.4.2m]				SUCCESS
-	Solaris 9 [Sun Studio 8]				SUCCESS
-	MacOS X 10.4.1						SUCCESS
-	Stratus VOS/PA-RISC [gcc]				SUCCESS
-	Stratus VOS/Intel IA32 [gcc]				SUCCESS
-    o  OpenSSL 0.9.8-beta6:  Released on June 21th, 2005
-	OpenVMS/Alpha [7.3-2; Compaq C 6.4-005]			SUCCESS
-	Windows 2000 [VC-WIN32; MSVC 6.0]			SUCCESS
-	Cygwin 1.5.5-1 [Cygwin; gcc 3.3.1]			SUCCESS
-	Red Hat Linux 9 [linux-elf; gcc 3.2.2]			SUCCESS
-	FreeBSD 4.6 [BSD-x86-elf; gcc 2.95.3]			SUCCESS
-	Solaris 2.6 [solaris-sparcv9-cc;
-		     Sun Workshop 6 update 2 C 5.3]		SUCCESS
-	Solaris 2.7 [solaris-sparcv9-cc;
-		     Sun Workshop 6 update 2 C 5.3]		SUCCESS
-	AIX 5.1 [aix-cc; C for AIX Compiler, version 6]		SUCCESS
-	HP-UX 11.11 [hpux-parisc2-cc; HP C Compiler B.11.11.08]	SUCCESS
-	Tru64 OSF1 V4.0E [tru64-alpha-cc; DEC C V5.8-009]	SUCCESS
-	? [linux-elf; gcc 3.4.2]				SUCCESS
-	Solaris 8 [solaris-sparcv9-cc; Sun C 5.7 2005/01/07 32-bit] SUCCESS
-	Solaris 8 [solaris64-sparcv9-cc; Sun C 5.7 2005/01/07 64-bit] SUCCESS
-	Solaris 8 [solaris-sparcv9-gcc; gcc 2.95.3 32-bit]	SUCCESS
-    o  OpenSSL 0.9.8-beta5:  Released on June 13th, 2005
-    o  OpenSSL 0.9.8-beta4:  Released on June 6th, 2005
-    o  OpenSSL 0.9.8-beta3:  Released on May 31th, 2005
-    o  OpenSSL 0.9.8-beta2:  Released on May 24th, 2005
-    o  OpenSSL 0.9.8-beta1:  Released on May 19th, 2005
+    o  OpenSSL 0.9.8:  Released on July       5th, 2005
     o  OpenSSL 0.9.7g: Released on April     11th, 2005
     o  OpenSSL 0.9.7f: Released on March     22nd, 2005
     o  OpenSSL 0.9.7e: Released on October   25th, 2004
diff --git a/openssl.spec b/openssl.spec
index a994dc1c51..de8c9e18d9 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -8,8 +8,8 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: %{libmaj}.%{libmin}.%{librel}
-#Version: %{libmaj}.%{libmin}.%{librel}%{librev}
+#Version: %{libmaj}.%{libmin}.%{librel}
+Version: %{libmaj}.%{libmin}.%{librel}%{librev}
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 Copyright: Freely distributable
 Group: System Environment/Libraries
-- 
2.34.1