commit 9b98602cf516b430b743eac1f28a233aeb1d90f2
Author: Grzegorz Pycia <[email protected]>
Date: Mon Jan 28 20:42:06 2019 +0100
up to 3.0.3
lxc.spec | 5 +++--
x32.patch | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/lxc.spec b/lxc.spec
index 3937e99..5da84c9 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -11,12 +11,12 @@
Summary: Linux Containers userspace tools
Summary(pl.UTF-8): Narzędzia do kontenerów linuksowych (LXC)
Name: lxc
-Version: 3.0.2
+Version: 3.0.3
Release: 1
License: LGPL v2.1+
Group: Applications/System
Source0:
https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
-# Source0-md5: 72e2f1e718c7ddf3ffa9b18ec0328d8f
+# Source0-md5: 0aa1a982f7dfa4c7b8ce87b7047b0b6e
Source1: %{name}-pld.in.sh
# lxc-net based on bridge, macvlan is an alternative/supported lxc network
Source2: %{name}_macvlan.sysconfig
@@ -334,6 +334,7 @@ fi
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblxc.so
+%attr(755,root,root) %{_libdir}/liblxc.a
%{_includedir}/lxc
%{_pkgconfigdir}/lxc.pc
diff --git a/x32.patch b/x32.patch
index ae7db20..3574d94 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,15 +1,15 @@
-diff -urN lxc-2.1.1-orig/src/lxc/log.c lxc-2.1.1/src/lxc/log.c
---- lxc-2.1.1-orig/src/lxc/log.c 2017-10-19 19:08:34.000000000 +0200
-+++ lxc-2.1.1/src/lxc/log.c 2018-03-24 13:42:08.659166630 +0100
-@@ -222,7 +222,11 @@
+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 @@
seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
/* Make string from nanoseconds. */
-+ #ifdef __ILP32__
-+ ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%lld",
(int64_t)time->tv_nsec);
-+ #else
- ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%"PRId64,
(int64_t)time->tv_nsec);
++ #ifdef __ILP32__
++ ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%lld",
(int64_t)time->tv_nsec);
++ #else
+ ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64,
(int64_t)time->tv_nsec);
+ #endif
- if (ret < 0 || ret >= LXC_NUMSTRLEN64)
+ if (ret < 0 || ret >= sizeof(nanosec))
return -1;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/9b98602cf516b430b743eac1f28a233aeb1d90f2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
