- up to 4.0.7

[packages/lxc.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 2679bab44faa07350ff396bd0b8959848dac37ad..9113480ee18b6f2faadef7c8cd1c8ab72cdabfcc 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,15 +1,15 @@
-diff -urN lxc-3.0.3.orig/src/lxc/log.c lxc-3.0.3/src/lxc/log.c
---- lxc-3.0.3.orig/src/lxc/log.c       2018-11-23 00:08:27.000000000 +0100
-+++ lxc-3.0.3/src/lxc/log.c    2019-01-28 19:52:33.204408097 +0100
-@@ -271,7 +271,11 @@
+diff -ruNp lxc-4.0.7.orig/src/lxc/log.c lxc-4.0.7/src/lxc/log.c
+--- lxc-4.0.7.orig/src/lxc/log.c       2021-04-29 22:57:15.000000000 +0200
++++ lxc-4.0.7/src/lxc/log.c    2021-04-30 17:29:22.505346892 +0200
+@@ -280,7 +280,11 @@ static int lxc_unix_epoch_to_utc(char *b
        seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
  
        /* Make string from nanoseconds. */
 +        #ifdef __ILP32__
 +        ret = snprintf(nanosec, sizeof(nanosec), "%lld", (int64_t)time->tv_nsec);
 +        #else
-       ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
+       ret = strnprintf(nanosec, sizeof(nanosec), "%"PRId64, (int64_t)time->tv_nsec);
 +      #endif
-       if (ret < 0 || (size_t)ret >= sizeof(nanosec))
+       if (ret < 0)
                return ret_errno(EIO);