From 5013152756609c9edc1267fb22ba26da6a5aca3b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 24 May 2012 10:58:50 +0200
Subject: [PATCH] Use pbzip2 instead of bzip2 for maillog rotation

---
 ipasserelle-base.spec                | 6 +++++-
 root/etc/cron.monthly/maillog-rotate | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ipasserelle-base.spec b/ipasserelle-base.spec
index 7e80bd3..d9cad58 100644
--- a/ipasserelle-base.spec
+++ b/ipasserelle-base.spec
@@ -1,4 +1,4 @@
-%define version 0.2.7
+%define version 0.2.8
 %define release 1.beta2
 %define name ipasserelle-base
 
@@ -37,6 +37,7 @@ Requires: perl(Text::Unaccent::PurePerl)
 Requires: perl(Net::LDAP)
 Requires: perl(Proc::ProcessTable)
 Requires: perl(Proc::ProcessTable::Process)
+Requires: pbzip2
 
 
 %description
@@ -45,6 +46,9 @@ Based on SMEServer, iPasserelle is a specially configured
 SME Server, with some additionnal modules
 
 %changelog
+* Thu May 24 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.8-1.sme
+- Use pbzip2 instead of bzip2 for maillog rotation
+
 * Wed May 23 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.7-1.sme
 - Include CHANGELOG
 
diff --git a/root/etc/cron.monthly/maillog-rotate b/root/etc/cron.monthly/maillog-rotate
index de26ff5..731e98e 100644
--- a/root/etc/cron.monthly/maillog-rotate
+++ b/root/etc/cron.monthly/maillog-rotate
@@ -25,7 +25,7 @@ chmod +t $HOME
 cd $HOME
 find Maildir/cur/ -type f | xargs -I __INPUT__ mv __INPUT__ Maildir/.$YEAR.$MONTH/cur/ 2>&1 > /dev/null
 find Maildir/new/ -type f | xargs -I __INPUT__ mv __INPUT__ Maildir/.$YEAR.$MONTH/new/ 2>&1 > /dev/null
-su - -s /bin/bash $USER -c "tar cjf $HOME/mails_$YEAR.$MONTH.tar.bz2 Maildir/.$YEAR.$MONTH/"
+su - -s /bin/bash $USER -c "tar -c --use-compress-program=pbzip2 -f $HOME/mails_$YEAR.$MONTH.tar.bz2 Maildir/.$YEAR.$MONTH/"
 su - -s /bin/bash $USER -c "rm -rf Maildir/.$YEAR.$MONTH/"
 # Unlock mail delivery
 chmod -t $HOME