From 7070cdba4e2008e10807928d9c7f8bd7d3af34b2 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 25 Feb 2010 17:18:23 +0000
Subject: [PATCH] Prepare for 0.9.8m release

---
 CHANGES           | 2 +-
 FAQ               | 2 +-
 NEWS              | 4 +++-
 README            | 2 +-
 STATUS            | 4 ++--
 crypto/opensslv.h | 6 +++---
 openssl.spec      | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index a3a20d0ba1..97b3810f40 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8l and 0.9.8m [xx XXX xxxx]
+ Changes between 0.9.8l and 0.9.8m [25 Feb 2010]
 
   *) Always check bn_wexpend() return values for failure.  (CVE-2009-3245)
      [Martin Olsson, Neel Mehta]
diff --git a/FAQ b/FAQ
index 942a671f2c..8041479c7e 100644
--- a/FAQ
+++ b/FAQ
@@ -78,7 +78,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.8k was released on Mar 25th, 2009.
+OpenSSL 0.9.8m was released on Feb 25th, 2010.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
diff --git a/NEWS b/NEWS
index 19533cb495..7bff9591d4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,10 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m-beta1:
+  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m:
 
+      o Cipher definition fixes.
+      o Workaround for slow RAND_poll() on some WIN32 versions.
       o Remove MD2 from algorithm tables.
       o SPKAC handling fixes.
       o Support for RFC5746 TLS renegotiation extension.
diff --git a/README b/README
index c5cea090c8..0cfba9c6c3 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.8m-dev
+ OpenSSL 0.9.8m
 
  Copyright (c) 1998-2009 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/STATUS b/STATUS
index 3fbf2b968e..d76aa5e8bc 100644
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,11 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2010/01/20 17:26:01 $
+  ______________                           $Date: 2010/02/25 17:18:22 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 1.0.0:  Under development...
-    o  OpenSSL 0.9.8m-beta1: Released on January 20th, 2010
+    o  OpenSSL 0.9.8m: Released on February  25th, 2010
     o  OpenSSL 0.9.8l: Released on November   5th, 2009
     o  OpenSSL 0.9.8k: Released on March     25th, 2009
     o  OpenSSL 0.9.8j: Released on January    7th, 2009
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 588204a854..3d794d9dad 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x009080d0L
+#define OPENSSL_VERSION_NUMBER	0x009080dfL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-fips-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-fips 25 Feb 2010"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m-dev xx XXX xxxx"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8m 25 Feb 2010"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index 72a7a01489..eb4bcede28 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -2,7 +2,7 @@
 %define libmaj 0
 %define libmin 9
 %define librel 8
-%define librev k
+%define librev m
 Release: 1
 
 %define openssldir /var/ssl
-- 
2.25.1