bump version to 4.0.3-pve3

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/changelog b/debian/changelog
index e2988b00b10b8e6a5504f4116d93578c3c0a1a0b..550f9371eb95824a6a3b050472c711b9ed11702c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lxcfs (4.0.3-pve3) pve; urgency=medium
+
+  * update to current stable-4.0 branch
+
+  * fixes some file descriptor and memory leaks
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 17 Jun 2020 12:07:40 +0200
+
 lxcfs (4.0.3-pve2) pve; urgency=medium
 
   * silence a warning about failing to convert memlimits for containers with a

diff --git a/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch b/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch
deleted file mode 100644 (file)
index 08c0f7d..0000000
--- a/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 607a79df39bbe1e4b3e09dc54c0388ed6140cf7b Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Fri, 24 Apr 2020 09:17:06 +0200
-Subject: [PATCH lxcfs] proc_fuse: silence error when we find no memlimit
-
-We get a positive result with an empty string if we do not
-encounter any limits while walking up the cgroup.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
- src/proc_fuse.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/proc_fuse.c b/src/proc_fuse.c
-index b2edf76..ae06bff 100644
---- a/src/proc_fuse.c
-+++ b/src/proc_fuse.c
-@@ -210,7 +210,7 @@ static uint64_t get_memlimit(const char *cgroup, bool swap)
-               ret = cgroup_ops->get_memory_swap_max(cgroup_ops, cgroup, &memlimit_str);
-       else
-               ret = cgroup_ops->get_memory_max(cgroup_ops, cgroup, &memlimit_str);
--      if (ret > 0 && safe_uint64(memlimit_str, &memlimit, 10) < 0)
-+      if (ret > 0 && memlimit_str[0] && safe_uint64(memlimit_str, &memlimit, 10) < 0)
-               lxcfs_error("Failed to convert memlimit %s", memlimit_str);
- 
-       return memlimit;
--- 
-2.20.1
-

diff --git a/debian/patches/series b/debian/patches/series
index efb74634001dd7fdbe67f5497ce6795714ffc351..bf650b42b1037ca3c7f99c19421c9e1728402554 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do-not-start-without-lxcfs.patch
-extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch

diff --git a/lxcfs b/lxcfs
index 4caca4eb4d166ac47afdd09200380c110ef58c53..5f44974ac86f738b99a52de064fc69448498ac41 160000 (submodule)
--- a/lxcfs
+++ b/lxcfs
@@ -1 +1 @@
-Subproject commit 4caca4eb4d166ac47afdd09200380c110ef58c53
+Subproject commit 5f44974ac86f738b99a52de064fc69448498ac41