update to latest upstream, bump version to 0.12-pve2

diff --git a/Makefile b/Makefile
index 97df05c4182d22dec8eb0eaa8f38e4368bc6c750..5dab03423daded75c3fa5d4bdf364841a252015b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.0
 
 PACKAGE=lxcfs
 PKGVER=0.12
-DEBREL=pve1
+DEBREL=pve2
 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz

diff --git a/debian/changelog b/debian/changelog
index b323205a8d1af5e8bc48ebcfacfa69963958aea4..29e313f18d6932bf65c378c832a4848abf2342b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lxcfs (0.12-pve2) unstable; urgency=medium
+
+  * update to latest upstream
+    (commit 3c01956bd55ca06bdc268db65d737848068a6299)
+    
+  * remove use-line-buffered-mode-on-stdout.patch (fixed upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Nov 2015 10:22:09 +0100
+
 lxcfs (0.12-pve1) unstable; urgency=medium
 
   * use line buffered mode for stdout

diff --git a/debian/patches/series b/debian/patches/series
index 7f2904bea71948f9f830afc514f03ee0cc480f72..bf650b42b1037ca3c7f99c19421c9e1728402554 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do-not-start-without-lxcfs.patch
-use-line-buffered-mode-on-stdout.patch

diff --git a/debian/patches/use-line-buffered-mode-on-stdout.patch b/debian/patches/use-line-buffered-mode-on-stdout.patch
deleted file mode 100644 (file)
index 3dc8f81..0000000
--- a/debian/patches/use-line-buffered-mode-on-stdout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-use line buffered mode for stdout
-
-We observerd duplicated syslog messages without this.
-Seems to be a systemd bug. 
-
-Index: new/lxcfs.c
-===================================================================
---- new.orig/lxcfs.c
-+++ new/lxcfs.c
-@@ -3183,6 +3183,8 @@ int main(int argc, char *argv[])
-       newargv[cnt++] = argv[1];
-       newargv[cnt++] = NULL;
- 
-+      setlinebuf(stdout);
-+
-       if (!cgfs_setup_controllers())
-               goto out;
- 

diff --git a/lxcfs.tgz b/lxcfs.tgz
index 0d910303a2b0b2d8b277f9b0d4eb9ad4b4fd27a4..daa3e2da35891de9815f933dde77f18fd9e2a22f 100644 (file)
Binary files a/lxcfs.tgz and b/lxcfs.tgz differ