From e0b110267ddf7e00b5b6885c2634b4c07d4dc9ab Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 9 May 2002 23:12:12 +0000
Subject: [PATCH] Merge the version changes from 0.9.6-stable. The tag for this
 branch will be OpenSSL-engine-0_9_6d

---
 CHANGES           | 2 +-
 FAQ               | 2 +-
 README            | 2 +-
 crypto/opensslv.h | 4 ++--
 openssl.spec      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5df8e1a667..9dec277f01 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]
+ Changes between 0.9.6c and 0.9.6d  [9 May 2002]
 
   *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not
      encoded as NULL) with id-dsa-with-sha1.
diff --git a/FAQ b/FAQ
index 1932f72433..3b69d8bcc9 100644
--- a/FAQ
+++ b/FAQ
@@ -59,7 +59,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.6c was released on December 21st, 2001.
+OpenSSL 0.9.6d was released on 9 May, 2002.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
diff --git a/README b/README
index 2dc5424c03..fb48e0dcbf 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 0.9.6d-beta1 [engine] 17 Apr 2002
+ OpenSSL 0.9.6d [engine] 9 May 2002
 
  Copyright (c) 1998-2002 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index ad87acf1f2..374fbadd79 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -25,8 +25,8 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x00906041L
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6d-beta1 [engine] 17 Apr 2002"
+#define OPENSSL_VERSION_NUMBER	0x0090604fL
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6d [engine] 9 May 2002"
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
 
diff --git a/openssl.spec b/openssl.spec
index 0f8d2f4ccc..9a34190b0b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,7 +1,7 @@
 %define libmaj 0
 %define libmin 9
 %define librel 6
-%define librev c
+%define librev d
 Release: 1
 
 %define openssldir /var/ssl
-- 
2.25.1