Skip to content

Commit a60da29

Browse files
committed
Fix various issues with the release staging script
Reviewed-by: Richard Levitte <[email protected]> (Merged from #199)
1 parent 4b2eca3 commit a60da29

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

release-tools/release-aux/openssl-announce-release-premium.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
The OpenSSL project team is pleased to announce the release of
1010
version $release of our open source toolkit for SSL/TLS.
1111

12+
For details of the changes, see the NEWS file at:
13+
14+
https://github.openssl.org/openssl/extended-releases/blob/$release_tag/NEWS
15+
1216
OpenSSL $release is available for download via HTTPS from the following
1317
location on our support system:
1418

release-tools/release-aux/openssl-announce-release-public.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
https://www.openssl.org/docs/man$series/man7/migration_guide.html
1818

19-
The OpenSSL $release is available for download at these URLs:
19+
The OpenSSL $release is available for download at this URL:
2020

21-
* https://www.openssl.org/source/
2221
* https://github.com/openssl/openssl/releases
2322

2423
The distribution file name is:

release-tools/release-aux/release-data-fn.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
# Public or premium release? Let the version numbers determine it!
1010
declare -A _ossl_release_types=(
11-
[premium]='^1\.0\.2'
12-
[public]='^(1\.1\.1|[3-9]\.)'
11+
[premium]='^1\.'
12+
[public]='^[3-9]\.'
1313
)
1414

1515
std_release_type () {

release-tools/release-aux/release-version-fn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ BEGIN {
322322
}
323323
324324
s|^([[:space:]]*#[[:space:]]*define[[:space:]]+OPENSSL_VERSION_NUMBER[[:space:]]+0x)[[:xdigit:]]+L$|$1${version_number}L|;
325-
s|^([[:space:]]*#[[:space:]]*define[[:space:]]+OPENSSL_VERSION_TEXT[[:space:]]+)"OpenSSL \d+\.\d+\.\dz*[a-x]?(-fips)?(-dev)? [^"]+"$|$1"OpenSSL ${version_text}$2${version_tag} $release_date"|;
325+
s|^([[:space:]]*#[[:space:]]*define[[:space:]]+OPENSSL_VERSION_TEXT[[:space:]]+)"OpenSSL \d+\.\d+\.\dz*[a-y]?(-fips)?(-dev)? [^"]+"$|$1"OpenSSL ${version_text}$2${version_tag} $release_date"|;
326326
s|^([[:space:]]*#[[:space:]]*define[[:space:]]+SHLIB_VERSION_NUMBER[[:space:]]+)"[^"]*"$|$1"${shlib_version}"|;
327327
'
328328
perl -pi -e "$version_updater" "$VERSION_FILE"

0 commit comments

Comments
 (0)