commit 7af31a122f2ca9ca0e10fdebdd1ad09f66237e1a
Author: Jan Rękorajski <[email protected]>
Date: Fri Jan 1 20:04:17 2021 +0100
- up to 4.0.5
lxc-cgroups.patch | 29 -----------------------------
lxc.spec | 10 +++++-----
x32.patch | 4 ++--
3 files changed, 7 insertions(+), 36 deletions(-)
---
diff --git a/lxc.spec b/lxc.spec
index 3054df5..ab96fb6 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -13,19 +13,18 @@
Summary: Linux Containers userspace tools
Summary(pl.UTF-8): Narzędzia do kontenerów linuksowych (LXC)
Name: lxc
-Version: 3.2.1
-Release: 2
+Version: 4.0.5
+Release: 1
License: LGPL v2.1+
Group: Applications/System
Source0:
https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
-# Source0-md5: 4886c8d1c8e221fe526eefcb47857b85
+# Source0-md5: 9db85d0a12b24f674df3e84df12afed9
Source1: %{name}-pld.in.sh
# lxc-net based on bridge, macvlan is an alternative/supported lxc network
Source2: %{name}_macvlan.sysconfig
Source3: %{name}_macvlan
Patch1: %{name}-net.patch
Patch2: x32.patch
-Patch3: %{name}-cgroups.patch
URL: https://www.linuxcontainers.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -160,7 +159,6 @@ bashowe uzupełnianie nazw dla LXC.
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
cp -p %{SOURCE1} templates/lxc-pld.in
@@ -370,6 +368,8 @@ fi
%files -n pam-pam_cgfs
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/security/pam_cgfs.so
+%{_mandir}/ja/man8/pam_cgfs.8*
+%{_mandir}/man8/pam_cgfs.8*
%endif
%files libs
diff --git a/lxc-cgroups.patch b/lxc-cgroups.patch
deleted file mode 100644
index f530619..0000000
--- a/lxc-cgroups.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lxc-3.2.1/src/lxc/cgroups/cgfsng.c.orig 2019-07-23 00:34:33.000000000
+0200
-+++ lxc-3.2.1/src/lxc/cgroups/cgfsng.c 2020-03-24 15:17:05.536616935 +0100
-@@ -496,12 +496,12 @@
- }
-
- if (!flipped_bit) {
-- DEBUG("No isolated or offline cpus present in cpuset");
-- return true;
-+ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
-+ TRACE("No isolated or offline cpus present in cpuset");
-+ } else {
-+ cpulist = move_ptr(posscpus);
-+ TRACE("Removed isolated or offline cpus from cpuset");
- }
-- DEBUG("Removed isolated or offline cpus from cpuset");
--
-- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
- if (!cpulist) {
- ERROR("Failed to create cpu list");
- return false;
-@@ -1260,7 +1260,7 @@
-
- orig_len = strlen(dir);
- do {
-- __do_free char *makeme;
-+ __do_free char *makeme = NULL;
- int ret;
- size_t cur_len;
-
diff --git a/x32.patch b/x32.patch
index b3207a8..2679bab 100644
--- a/x32.patch
+++ b/x32.patch
@@ -10,6 +10,6 @@ diff -urN lxc-3.0.3.orig/src/lxc/log.c lxc-3.0.3/src/lxc/log.c
+ #else
ret = snprintf(nanosec, sizeof(nanosec), "%"PRId64,
(int64_t)time->tv_nsec);
+ #endif
- if (ret < 0 || ret >= sizeof(nanosec))
- return -1;
+ if (ret < 0 || (size_t)ret >= sizeof(nanosec))
+ return ret_errno(EIO);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/7af31a122f2ca9ca0e10fdebdd1ad09f66237e1a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
