diff options
author | Daiki Ueno <ueno@gnu.org> | 2021-05-29 07:41:46 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2021-05-29 07:41:46 +0000 |
commit | 1b83d881938b4e37d2bb6475ade716b22364b6cb (patch) | |
tree | d2148eed88b92623e5fbce761ebe908834f5bdb0 | |
parent | a9c7040a1c18b30d1c6e9616b63a7ae100e6a2ec (diff) | |
parent | 090c92848190f845a1cff96e159dd7c4b630d6ba (diff) | |
download | gnutls-3.7.2.tar.gz |
Merge branch 'wip/dueno/release-3.7.2' into 'master'3.7.2
Release 3.7.2
See merge request gnutls/gnutls!1445
-rw-r--r-- | .mailmap | 2 | ||||
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | devel/release-steps.md | 10 | ||||
-rw-r--r-- | m4/hooks.m4 | 6 |
6 files changed, 19 insertions, 17 deletions
@@ -1,9 +1,11 @@ Andreas Metzler <ametzler@debian.org> <ametzler@bebt.de> Andreas Metzler <ametzler@debian.org> <ametzler@downhill.at.eu.org> +Andreas Metzler <ametzler@debian.org> <gitlab@bebt.de> Daiki Ueno <ueno@gnu.org> <dueno@redhat.com> Daiki Ueno <ueno@gnu.org> <ueno@redhat.com> Daiki Ueno <ueno@gnu.org> <ueno@unixuser.org> David Woodhouse <dwmw2@infradead.org> <david.woodhouse@intel.com> +František Krenželok <krenzelok.frantisek@gmail.com> Giuseppe Scrivano <gscrivano@gnu.org> <giuseppe@southpole.se> Ludovic Courtès <ludo@gnu.org> Ludovic Courtès <ludo@gnu.org> <ludo@chbouib.org> diff --git a/Makefile.am b/Makefile.am index ae5820c62d..80cb64a113 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,15 +60,17 @@ endif ACLOCAL_AMFLAGS = -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4 --install EXTRA_DIST = cfg.mk maint.mk CONTRIBUTING.md README.md LICENSE AUTHORS NEWS \ - ChangeLog THANKS INSTALL.md RELEASES.md + ChangeLog THANKS INSTALL.md RELEASES.md .mailmap DISTCLEANFILES = AUTHORS -AUTHORS: - @echo -e "The authors list is autogenerated from the git history; sorted by number of commits\n" >AUTHORS - @git shortlog -sen| cut -f 2 | sed 's/@/ at /g' >> AUTHORS - @echo -e "\n\nThe translators list is autogenerated from po file history\n" >>AUTHORS - @sed -n 's/.*Last-Translator: *\(.*\) *<.*/\1/p' po/*.po | sort -u >>AUTHORS +AUTHORS: Makefile.am .mailmap + $(AM_V_GEN) { \ + echo -e "The authors list is autogenerated from the git history; sorted by number of commits\n"; \ + git shortlog -sen --no-merges --group author --group trailer:co-authored-by | cut -f 2 | sed 's/@/ at /g'; \ + echo -e "\n\nThe translators list is autogenerated from po file history\n"; \ + sed -n 's/.*Last-Translator: *\(.*\) *<.*/\1/p' po/*.po | sort -u; \ + } > $@-t && mv $@-t $@ pic-check: @echo "Checking for position dependent code" @@ -5,7 +5,7 @@ Copyright (C) 2000-2016 Free Software Foundation, Inc. Copyright (C) 2013-2019 Nikos Mavrogiannopoulos See the end for copying conditions. -* Version 3.7.2 (unreleased) +* Version 3.7.2 (released 2021-05-29) ** libgnutls: The priority string option %DISABLE_TLS13_COMPAT_MODE was added to disable TLS 1.3 middlebox compatibility mode diff --git a/configure.ac b/configure.ac index 8f60db08c5..11ea91c822 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.64) dnl when updating version also update LT_REVISION in m4/hooks.m4 -AC_INIT([GnuTLS], [3.7.1], [bugs@gnutls.org]) +AC_INIT([GnuTLS], [3.7.2], [bugs@gnutls.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIRS([m4 src/gl/m4 src/libopts/m4 lib/unistring/m4]) AC_CANONICAL_HOST diff --git a/devel/release-steps.md b/devel/release-steps.md index 04e7b2dfa5..358f67a9f5 100644 --- a/devel/release-steps.md +++ b/devel/release-steps.md @@ -7,12 +7,10 @@ 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/ + 4. git tag -s $VERSION + 5. git push && git push $VERSION + 6. gpg --detach-sign gnutls-$VERSION.tar.xz + 7. scp gnutls-$VERSION.tar.xz* ftp.gnupg.org:/home/ftp/gcrypt/gnutls/v$(expr $VERSION : '\([0-9]*\.[0-9]*\)')/ 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), diff --git a/m4/hooks.m4 b/m4/hooks.m4 index f0de73d8e4..4d3d22107d 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -40,9 +40,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS], # in CONTRIBUTION.md for more info. # # Interfaces removed: AGE=0 (+bump all symbol versions in .map) - AC_SUBST(LT_CURRENT, 59) - AC_SUBST(LT_REVISION, 1) - AC_SUBST(LT_AGE, 29) + AC_SUBST(LT_CURRENT, 60) + AC_SUBST(LT_REVISION, 0) + AC_SUBST(LT_AGE, 30) AC_SUBST(LT_SSL_CURRENT, 27) AC_SUBST(LT_SSL_REVISION, 2) |