From 2b234aa6c871eaa39d2b2c8dc7cd47ec5db3975c Mon Sep 17 00:00:00 2001 From: Adam Osuchowski Date: Fri, 30 Apr 2021 17:32:57 +0200 Subject: [PATCH] - up to 4.0.7 --- lxc.spec | 4 ++-- x32.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lxc.spec b/lxc.spec index 8c2e8ff..b92c02a 100644 --- a/lxc.spec +++ b/lxc.spec @@ -13,12 +13,12 @@ Summary: Linux Containers userspace tools Summary(pl.UTF-8): Narzędzia do kontenerów linuksowych (LXC) Name: lxc -Version: 4.0.5 +Version: 4.0.7 Release: 1 License: LGPL v2.1+ Group: Applications/System Source0: https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz -# Source0-md5: 9db85d0a12b24f674df3e84df12afed9 +# Source0-md5: d4b16323dd950efd16b62b7d04323199 Source1: %{name}-pld.in.sh # lxc-net based on bridge, macvlan is an alternative/supported lxc network Source2: %{name}_macvlan.sysconfig diff --git a/x32.patch b/x32.patch index 2679bab..9113480 100644 --- 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); -- 2.43.0