update to lxcfs-2.0.5

diff --git a/Makefile b/Makefile
index 928ce5029a79d0b851991b0b0685a1fe8fa4711f..d410f17b03731063c187e5390c2edba61358ed99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.3
 
 PACKAGE=lxcfs
-PKGVER=2.0.4
-DEBREL=pve2
+PKGVER=2.0.5
+DEBREL=pve1
 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz

diff --git a/debian/changelog b/debian/changelog
index 2abddf3bc98a6fc118199c867179a0e8b13901a6..60c159c49bd2a1a3cad2fbc7c36d02cefee67e76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxcfs (2.0.5-pve1) unstable; urgency=medium
+
+  * update to lxcfs-2.0.5 tag
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Nov 2016 09:40:50 +0100
+
 lxcfs (2.0.4-pve2) unstable; urgency=medium
 
   * fix #1173: /proc/meminfo content

diff --git a/debian/patches/fix-Active-Inactive-proc-meminfo.patch b/debian/patches/fix-Active-Inactive-proc-meminfo.patch
deleted file mode 100644 (file)
index d36f133..0000000
--- a/debian/patches/fix-Active-Inactive-proc-meminfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3f4847aacd7cb56d7859f1562c81c06acf9d41d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 19 Oct 2016 09:16:36 +0200
-Subject: [PATCH] fix Active/Inactive /proc/meminfo
-
----
- bindings.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bindings.c b/bindings.c
-index 2f78ab5..0d46fb8 100644
---- a/bindings.c
-+++ b/bindings.c
-@@ -3197,11 +3197,11 @@ static int proc_meminfo_read(char *buf, size_t size, off_t offset,
-               } else if (startswith(line, "SwapCached:")) {
-                       snprintf(lbuf, 100, "SwapCached:     %8lu kB\n", 0UL);
-                       printme = lbuf;
--              } else if (startswith(line, "Active")) {
-+              } else if (startswith(line, "Active:")) {
-                       snprintf(lbuf, 100, "Active:         %8lu kB\n",
-                                       active_anon + active_file);
-                       printme = lbuf;
--              } else if (startswith(line, "Inactive")) {
-+              } else if (startswith(line, "Inactive:")) {
-                       snprintf(lbuf, 100, "Inactive:       %8lu kB\n",
-                                       inactive_anon + inactive_file);
-                       printme = lbuf;
--- 
-2.1.4
-

diff --git a/debian/patches/series b/debian/patches/series
index d226b69d912f9217899e17d7b21ed21c8918630a..f0b6317497cbd8c46e635b332e311e639f5d7dbd 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 do-not-start-without-lxcfs.patch
 fix-offsets-for-memory.stat-parsing.patch
-fix-Active-Inactive-proc-meminfo.patch

diff --git a/lxcfs.tgz b/lxcfs.tgz
index 08b44000c60a194367df7fb53e0360855c1105d2..f179e0b70fefc97d427940b161d378c1d21a9a23 100644 (file)
Binary files a/lxcfs.tgz and b/lxcfs.tgz differ