[pve-devel] [PATCH] bump to 0.5.6

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 Makefile                                   |    2 +-
 debian/changelog                           |    6 ++++++
 debian/patches/simplify-log-rotation.patch |   21 +++++++++++----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 94e7365..6b556a4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.2
 
 PACKAGE=pve-sheepdog
 PKGREL=1
-SDVER=0.5.4
+SDVER=0.5.6
 
 DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
 
diff --git a/debian/changelog b/debian/changelog
index 1adf045..54fa4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-sheepdog (0.5.6-1) unstable; urgency=low
+
+  * Bump to sheepdog 0.5.6
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 8 Feb 2013 15:52:00 +0200
+
 pve-sheepdog (0.5.4-1) unstable; urgency=low
 
   * Bump to sheepdog 0.5.4
diff --git a/debian/patches/simplify-log-rotation.patch b/debian/patches/simplify-log-rotation.patch
index 254128b..9502aaa 100644
--- a/debian/patches/simplify-log-rotation.patch
+++ b/debian/patches/simplify-log-rotation.patch
@@ -6,18 +6,18 @@ any logrotate script. max_logfile is set to 256MB.
 
 Index: new/lib/logger.c
 ===================================================================
---- new.orig/lib/logger.c	2012-07-17 14:40:47.000000000 +0200
-+++ new/lib/logger.c	2012-07-17 14:42:16.000000000 +0200
-@@ -57,7 +57,7 @@
- static pid_t logger_pid;
+--- a/lib/logger.c
++++ b/lib/logger.c
+@@ -97,7 +97,7 @@ static pid_t logger_pid;
  static key_t semkey;
+ static char *log_buff;
  
 -static int64_t max_logsize = 500 * 1024 * 1024;  /*500MB*/
-+static int64_t max_logsize = 256 * 1024 * 1024;  /*256MB*/
++static int64_t max_logsize = 256 * 1024 * 1024;  /*500MB*/
  
- pthread_mutex_t logsize_lock = PTHREAD_MUTEX_INITIALIZER;
+ static pthread_mutex_t logsize_lock = PTHREAD_MUTEX_INITIALIZER;
  
-@@ -345,13 +345,7 @@
+@@ -357,14 +357,7 @@ static notrace void rotate_log(void)
  
  	if (access(log_nowname, R_OK) == 0) {
  		char old_logfile[256];
@@ -25,9 +25,10 @@ Index: new/lib/logger.c
 -		struct tm tm;
 -		time(&t);
 -		localtime_r((const time_t *)&t, &tm);
--		sprintf(old_logfile, "%s.%04d-%02d-%02d-%02d-%02d",
--				log_nowname, tm.tm_year + 1900, tm.tm_mon + 1,
--				tm.tm_mday, tm.tm_hour, tm.tm_min);
+-		snprintf(old_logfile, sizeof(old_logfile),
+-			 "%s.%04d-%02d-%02d-%02d-%02d",
+-			 log_nowname, tm.tm_year + 1900, tm.tm_mon + 1,
+-			 tm.tm_mday, tm.tm_hour, tm.tm_min);
 +		sprintf(old_logfile, "%s.1", log_nowname);
  		rename(log_nowname, old_logfile);
  	}
-- 
1.7.10.4