bump to 0.5.6

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/Makefile b/Makefile
index 94e7365097a882132f7ded281b611c8f8d299cc2..6b556a4fd3858f38ee3a864bdf29f3fd71a115d5 100644 (file)
--- 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 1adf045ecdb0a15d2cfb1b6abe6695ec558da4a2..54fa4c1f72c952de31141ca6d98a8b94a87cbebc 100644 (file)
--- 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@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 254128b4ab27870ed71cf98b9eb32aa3c4197a35..9502aaa6e9e196b9a308092323841bb38523122a 100644 (file)
--- 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);
        }