From: Matt Caswell <matt@openssl.org>
Date: Thu, 15 Jan 2015 15:01:09 +0000 (+0000)
Subject: Prepare for 1.0.0r-dev
X-Git-Tag: OpenSSL_1_0_0-post-reformat~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=569c68744ab18ff48074a683a57962d959fcb13c;p=oweals%2Fopenssl.git

Prepare for 1.0.0r-dev

Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index f0b67e77c2..f48a0023a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.0q and 1.0.0r [xx XXX xxxx]
+
+  *)
+
  Changes between 1.0.0p and 1.0.0q [15 Jan 2015]
 
   *) Build fixes for the Windows and OpenVMS platforms
diff --git a/NEWS b/NEWS
index d9d48f3dfd..448b24ac01 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +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 1.0.0q and OpenSSL 1.0.0r [under development]
+
+      o
+
   Major changes between OpenSSL 1.0.0p and OpenSSL 1.0.0q [15 Jan 2015]
 
       o Build fixes for the Windows and OpenVMS platforms
diff --git a/README b/README
index dd0ae9deff..4f67e9ec88 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0q 15 Jan 2015
+ OpenSSL 1.0.0r-dev
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 7c0a62f9ab..7cd1fc4f97 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	0x1000011fL
+#define OPENSSL_VERSION_NUMBER	0x10000120L
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0q-fips 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0r-fips-dev xx XXX xxxx"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0q 15 Jan 2015"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0r-dev xx XXX xxxx"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/openssl.spec b/openssl.spec
index a6e807f0d5..272ed988ff 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.0q
+Version: 1.0.0r
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries