From 2727265752c66690d79c4cbe6956746977b1df4c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 31 Aug 2021 18:38:15 +0200 Subject: [PATCH] Prepare for 3.1 Because we now have an openssl-3.0 branch, master is moved to be the next potential minor version. Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/16484) --- CHANGES.md | 8 ++++++++ NEWS.md | 8 ++++++++ VERSION.dat | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a24b30e651..5dca90464a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ pick the appropriate release branch. OpenSSL Releases ---------------- + - [OpenSSL 3.1](#openssl-31) - [OpenSSL 3.0](#openssl-30) - [OpenSSL 1.1.1](#openssl-111) - [OpenSSL 1.1.0](#openssl-110) @@ -18,6 +19,13 @@ OpenSSL Releases - [OpenSSL 1.0.0](#openssl-100) - [OpenSSL 0.9.x](#openssl-09x) +OpenSSL 3.1 +----------- + +### Changes between 3.0 and 3.1 [xx XXX xxxx] + + * + OpenSSL 3.0 ----------- diff --git a/NEWS.md b/NEWS.md index c269e370e0..290671e091 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,7 @@ release. For more details please read the CHANGES file. OpenSSL Releases ---------------- + - [OpenSSL 3.1](#openssl-31) - [OpenSSL 3.0](#openssl-30) - [OpenSSL 1.1.1](#openssl-111) - [OpenSSL 1.1.0](#openssl-110) @@ -15,6 +16,13 @@ OpenSSL Releases - [OpenSSL 1.0.0](#openssl-100) - [OpenSSL 0.9.x](#openssl-09x) +OpenSSL 3.1 +----------- + +### Major changes between OpenSSL 3.0 and OpenSSL 3.1 [under development] + + * + OpenSSL 3.0 ----------- diff --git a/VERSION.dat b/VERSION.dat index d5c6836ce5..bf2063dc0b 100644 --- a/VERSION.dat +++ b/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 -MINOR=0 +MINOR=1 PATCH=0 -PRE_RELEASE_TAG=beta3-dev +PRE_RELEASE_TAG=dev BUILD_METADATA= RELEASE_DATE="" SHLIB_VERSION=3