summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2020-07-04 11:27:59 +0000
committerDmitry Baryshkov <dbaryshkov@gmail.com>2020-07-04 11:27:59 +0000
commit808558d8b3a703d0755a429c6a27fe6f94fe5b59 (patch)
treebef26dbb43c59deee7ad0b73d61976224bb857db
parent6e57d1dd6c8fa9307b818ad15c9795d5d0282106 (diff)
parent7b75424f28bd1ed1e4cca613e182d09b7eab4009 (diff)
downloadgnutls-808558d8b3a703d0755a429c6a27fe6f94fe5b59.tar.gz
Merge branch 'tmp-doc-fixes' into 'master'
RELEASES.md: update for the 3.7.x releases See merge request gnutls/gnutls!1283
-rw-r--r--NEWS2
-rw-r--r--RELEASES.md30
-rw-r--r--devel/release-steps.md24
3 files changed, 28 insertions, 28 deletions
diff --git a/NEWS b/NEWS
index 4624e200f7..175eb785ff 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,8 @@ gnutls_x509_trust_list_set_getissuer_function: Added
GNUTLS_CIPHER_AES_128_SIV: Added
GNUTLS_CIPHER_AES_256_SIV: Added
GNUTLS_CIPHER_AES_192_GCM: Added
+GNUTLS_NO_AUTO_SEND_TICKET: Added
+gnutls_ext_get_name2: Added
gnutls_pkcs7_print_signature_info: Added
* Version 3.6.13 (released 2020-03-31)
diff --git a/RELEASES.md b/RELEASES.md
index 5922814900..53360df3d6 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -14,31 +14,5 @@ cases change the API.
|Branch|Version|Release interval|
|:----:|:-----:|:--------------:|
-|stable|3.6.x |bi-monthly |
-|next |- | |
-
-
-# Release process
-
- 0. Create a new 'milestone' for the next release and move all issues present in the
- current release milestone.
- 1. Verification of release notes: ensure that release notes ([NEWS](NEWS)) exist
- for this release, and include all significant changes since last release.
- 2. Update of release date in [NEWS](NEWS), and bump of version number in
- [configure.ac](configure.ac) as well as soname numbers in [m4/hooks.m4](m4/hooks.m4).
- 3. make distcheck
- 4. git tag -s $(VERSION). The 3.6.12 was including both the 3.6.12 and
- gnutls_3_6_12 tags, but it may make sense to only use the version from
- now on.
- 5. git push && git push --tags
- 6. make dist && gpg --sign --detach gnutls-$(VERSION).tar.xz
- 7. scp gnutls-$(VERSION).tar.xz* trithemius.gnupg.org:/home/ftp/gcrypt/v3.6/
- 8. Create and send announcement email based on previously sent email to the list and
- [NEWS](NEWS) file.
- 9. Create a NEWS entry at [web-pages repository](https://gitlab.com/gnutls/web-pages/-/tree/master/news-entries),
- and/or [a security advisory entry](https://gitlab.com/gnutls/web-pages/-/tree/master/security-entries)
- if necessary. The NEWS entry is usually pointing to the announcement email.
- A commit auto-generates the [gnutls web site](https://gnutls.gitlab.io/web-pages/)
- which is mirrored twice a day by www.gnutls.org.
-10. Use the @GnuTLS twitter account to announce the release.
-11. Close the current release milestone.
+|stable|3.6.x |as needed |
+|next |3.7.x |bi-monthly |
diff --git a/devel/release-steps.md b/devel/release-steps.md
new file mode 100644
index 0000000000..04e7b2dfa5
--- /dev/null
+++ b/devel/release-steps.md
@@ -0,0 +1,24 @@
+# Release process
+
+ 0. Create a new 'milestone' for the next release and move all issues present in the
+ current release milestone.
+ 1. Verification of release notes: ensure that release notes ([NEWS](NEWS)) exist
+ for this release, and include all significant changes since last release.
+ 2. Update of release date in [NEWS](NEWS), and bump of version number in
+ [configure.ac](configure.ac) as well as soname numbers in [m4/hooks.m4](m4/hooks.m4).
+ 3. make distcheck
+ 4. git tag -s $(VERSION). The 3.6.12 was including both the 3.6.12 and
+ gnutls_3_6_12 tags, but it may make sense to only use the version from
+ now on.
+ 5. git push && git push --tags
+ 6. make dist && gpg --sign --detach gnutls-$(VERSION).tar.xz
+ 7. scp gnutls-$(VERSION).tar.xz* ftp.gnupg.org:/home/ftp/gcrypt/gnutls/v3.6/
+ 8. Create and send announcement email based on previously sent email to the list and
+ [NEWS](NEWS) file.
+ 9. Create a NEWS entry at [web-pages repository](https://gitlab.com/gnutls/web-pages/-/tree/master/news-entries),
+ and/or [a security advisory entry](https://gitlab.com/gnutls/web-pages/-/tree/master/security-entries)
+ if necessary. The NEWS entry is usually pointing to the announcement email.
+ A commit auto-generates the [gnutls web site](https://gnutls.gitlab.io/web-pages/)
+ which is mirrored twice a day by www.gnutls.org.
+10. Use the @GnuTLS twitter account to announce the release.
+11. Close the current release milestone.