Merge branch 'tmp-gnulib' into 'master'

gnulib: update git submodule

See merge request gnutls/gnutls!1330

7 files changed, 14 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/.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/
 
diff --git a/configure.ac b/configure.ac
index 5ab834ad62..e485699f30 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])
@@ -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])
diff --git a/gnulib b/gnulib
-Subproject fb64a78174042189f4d012cbd748d565f021cd6
+Subproject 46bdd627ff522193134d31bdfd3ac4e4fddb597
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/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)
 {
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