From dd444371467d02391d2f57de2f39367a9df23c9d Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 13 Sep 2020 17:52:44 +0200 Subject: gnulib: update git submodule This brings in the build fixes of parse-datetime module: https://lists.gnu.org/archive/html/bug-gnulib/2020-07/msg00178.html https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00001.html https://lists.gnu.org/archive/html/bug-gnulib/2020-09/msg00046.html Signed-off-by: Daiki Ueno --- .gitignore | 3 ++- configure.ac | 2 +- gnulib | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b23292693..b721fee238 100644 --- a/.gitignore +++ b/.gitignore @@ -287,7 +287,8 @@ src/danetool src/danetool-args.c src/danetool-args.h src/gaa.skel -src/gl +src/gl/* +!src/gl/override src/gnutls-cli src/gnutls-cli-debug src/gnutls-serv diff --git a/configure.ac b/configure.ac index 5ab834ad62..b5b0ceb5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 # USA -AC_PREREQ(2.63) +AC_PREREQ(2.64) dnl when updating version also update LT_REVISION in m4/hooks.m4 AC_INIT([GnuTLS], [3.6.14], [bugs@gnutls.org]) diff --git a/gnulib b/gnulib index fb64a78174..46bdd627ff 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit fb64a78174042189f4d012cbd748d565f021cd69 +Subproject commit 46bdd627ff522193134d31bdfd3ac4e4fddb5975 -- cgit v1.2.1 From 87d4582e50029a9d1cd6d54143d93c14ae622980 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 13 Sep 2020 20:27:05 +0200 Subject: build: ignore pointless -Wformat-y2k warning Printing UTCTime really needs last 2 digits of the year. Signed-off-by: Daiki Ueno --- lib/x509/time.c | 3 +++ src/common.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/x509/time.c b/lib/x509/time.c index fa10a91002..421138436a 100644 --- a/lib/x509/time.c +++ b/lib/x509/time.c @@ -245,6 +245,8 @@ time_t _gnutls_x509_generalTime2gtime(const char *ttime) return time2gtime(ttime, year); } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-y2k" /* tag will contain ASN1_TAG_UTCTime or ASN1_TAG_GENERALIZEDTime */ static int gtime_to_suitable_time(time_t gtime, char *str_time, size_t str_time_size, unsigned *tag) @@ -285,6 +287,7 @@ gtime_to_suitable_time(time_t gtime, char *str_time, size_t str_time_size, unsig return 0; } +#pragma GCC diagnostic pop static int gtime_to_generalTime(time_t gtime, char *str_time, size_t str_time_size) diff --git a/src/common.c b/src/common.c index 9b0d385ca3..823a8a83fa 100644 --- a/src/common.c +++ b/src/common.c @@ -1265,6 +1265,8 @@ void log_set(FILE *file) logfile = file; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-y2k" /* This is very similar to ctime() but it does not force a newline. */ char *simple_ctime(const time_t *t, char out[SIMPLE_CTIME_BUF_SIZE]) @@ -1283,3 +1285,4 @@ char *simple_ctime(const time_t *t, char out[SIMPLE_CTIME_BUF_SIZE]) snprintf(out, SIMPLE_CTIME_BUF_SIZE, "[error]"); return out; } +#pragma GCC diagnostic pop -- cgit v1.2.1 From bc8e5090a5cfc86bd3f216fba2bcc1f24999a652 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sat, 12 Sep 2020 20:29:54 +0200 Subject: .gitlab-ci.yml: bump cache version Signed-off-by: Daiki Ueno --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c4160dcf2..095662bea8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: # name to allow expiration of old caches. cache: - key: "$CI_JOB_NAME-ver16" + key: "$CI_JOB_NAME-ver17" paths: - cache/ -- cgit v1.2.1 From 50b88241a15e1a40e09ca64dca1538c64ff22766 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 17 Sep 2020 11:15:43 +0200 Subject: configure.ac: don't enable warning only available in decent gcc -Warith-conversion is new in GCC 10. Signed-off-by: Daiki Ueno --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index b5b0ceb5e2..e485699f30 100644 --- a/configure.ac +++ b/configure.ac @@ -523,6 +523,7 @@ if test "$gl_gcc_warnings" = yes; then nw="$nw -Wunsafe-loop-optimizations" # Warnings with no point nw="$nw -Wredundant-decls" # Some files cannot be compiled with that (gl_fd_to_handle) nw="$nw -Wtype-limits" # Too many warnings in gnulib macros + nw="$nw -Warith-conversion" # Too compiler dependent gl_MANYWARN_ALL_GCC([ws]) gl_MANYWARN_COMPLEMENT(ws, [$ws], [$nw]) -- cgit v1.2.1 From ddfe076d024cae619c9e4b971b7be3c1c6b37bca Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 17 Sep 2020 12:03:20 +0200 Subject: build: ignore pointless -Wformat-nonliteral warning Signed-off-by: Daiki Ueno --- src/certtool-cfg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c index fbbb4c6ab9..03358524d6 100644 --- a/src/certtool-cfg.c +++ b/src/certtool-cfg.c @@ -660,6 +660,8 @@ read_crq_set(gnutls_x509_crq_t crq, const char *input_str, const char *oid) free(lineptr); } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" /* The input_str should contain %d or %u to print the default. */ static int64_t read_int_with_default(const char *input_str, long def) @@ -714,6 +716,7 @@ static int64_t read_int_with_default(const char *input_str, long def) return l; } +#pragma GCC diagnostic pop int64_t read_int(const char *input_str) { -- cgit v1.2.1