From 1fda206fa22dc2f97faf90e96ecd4cd8955d2cf1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 27 Feb 2012 18:47:21 -0300
Subject: Rsync handler: using more debug/warning instead of regular echo
 (upstream #3840)

---
 handlers/rsync.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index e253c5c..a9dae06 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -405,7 +405,7 @@ function rotate_long {
       echo "Debug: $dir.1 does not exist, skipping."
       continue 1
     elif [ ! -f $metadata.1/created ] && [ ! -f $metadata.1/rotated ]; then
-      echo "Warning: metadata does not exist for $dir.1. This backup may be only partially completed. Skipping rotation."
+      warning "Warning: metadata does not exist for $dir.1. This backup may be only partially completed. Skipping rotation."
       continue 1
     fi
     
@@ -425,7 +425,7 @@ function rotate_long {
         if [ ! $created -gt $cutoff_time ]; then
           next=$(( i + 1 ))
           if [ ! -d $dir.$next ]; then
-            echo "Debug: $rottype.$i --> $rottype.$next"
+            debug "$rottype.$i --> $rottype.$next"
             $nice mv $dir.$i $dir.$next
             mkdir -p $metadata.$next
             date +%c%n%s > $metadata.$next/rotated
@@ -433,10 +433,10 @@ function rotate_long {
               $nice mv $metadata.$i/created $metadata.$next
             fi
           else
-            echo "Debug: skipping rotation of $dir.$i because $dir.$next already exists."
+            debug "skipping rotation of $dir.$i because $dir.$next already exists."
           fi
         else
-          echo "Debug: skipping rotation of $dir.$i because it was created" $(( (now-created)/86400)) "days ago ("$(( (now-cutoff_time)/86400))" needed)."
+          debug "skipping rotation of $dir.$i because it was created" $(( (now-created)/86400)) "days ago ("$(( (now-cutoff_time)/86400))" needed)."
         fi
       fi
     done
@@ -444,7 +444,7 @@ function rotate_long {
 
   max=$((keepdaily+1))
   if [ $keepweekly -gt 0 -a -d $backuproot/daily.$max -a ! -d $backuproot/weekly.1 ]; then
-    echo "Debug: daily.$max --> weekly.1"
+    debug "daily.$max --> weekly.1"
     $nice mv $backuproot/daily.$max $backuproot/weekly.1
     mkdir -p $backuproot/metadata/weekly.1
     date +%c%n%s > $backuproot/metadata/weekly.1/rotated
@@ -455,7 +455,7 @@ function rotate_long {
 
   max=$((keepweekly+1))
   if [ $keepmonthly -gt 0 -a -d $backuproot/weekly.$max -a ! -d $backuproot/monthly.1 ]; then
-    echo "Debug: weekly.$max --> monthly.1"
+    debug "weekly.$max --> monthly.1"
     $nice mv $backuproot/weekly.$max $backuproot/monthly.1
     mkdir -p $backuproot/metadata/monthly.1
     date +%c%n%s > $backuproot/metadata/monthly.1/rotated
@@ -473,10 +473,10 @@ function rotate_long {
     for (( i=$oldest; i >= $max; i-- )); do
       if [ -d $dir.$i ]; then
         if [ -d $backuproot/rotate.tmp ]; then
-          echo "Debug: removing rotate.tmp"
+          debug "removing rotate.tmp"
           $nice rm -rf $backuproot/rotate.tmp
         fi
-        echo "Debug: moving $rottype.$i to rotate.tmp"
+        debug "moving $rottype.$i to rotate.tmp"
         $nice mv $dir.$i $backuproot/rotate.tmp
       fi
     done
-- 
cgit v1.2.3


From 29286c7c3edefc3d77ea529bbe325718cace64db Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 6 Apr 2012 17:29:10 -0300
Subject: Quoting $starttime (upstream #3868)

---
 handlers/rsync.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 884a885..68ab392 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -830,7 +830,7 @@ function update_metadata {
     # finished, otherwise daily rotations might not take place.
     # If we used backup end time, in the next handler run
     # we might not have $now - $created >= 24:00
-    echo $starttime > $metadata/created
+    echo "$starttime" > $metadata/created
     $touch $backupdir/$SECTION/$suffix
   else
     folder="`echo $dest_path | cut -d : -f 2`"
@@ -844,7 +844,7 @@ function update_metadata {
     # finished, otherwise daily rotations might not take place.
     # If we used backup end time, in the next handler run
     # we might not have $now - $created >= 24:00
-    echo $starttime > $metadata/created
+    echo "$starttime" > $metadata/created
     ##### END REMOTE SCRIPT #######
 EOF
 ) | (while read a; do passthru $a; done)
@@ -1111,7 +1111,7 @@ stop_services
 mount_rw
 
 starttime="`date +%c%n%s`"
-echo "Starting backup at `echo $starttime | head -n 1`" >> $log
+echo "Starting backup at `echo "$starttime" | head -n 1`" >> $log
 
 for SECTION in $include; do
 
-- 
cgit v1.2.3


From e22107cf0954f29215052becf848bc28b47ffbe0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 12 Apr 2012 20:49:04 -0300
Subject: Validate created date on long_rotation to avoid too many arguments at
 comparison (upstream #3868)

---
 handlers/rsync.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 68ab392..31449c2 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -421,6 +421,11 @@ function rotate_long {
         else
           created=0
         fi
+        # Validate created date
+        if [ -z "$created" ] || echo $created | grep -v -q -e '^[0-9]*$'; then
+           warning "Invalid metatada $created. Skipping rotation."
+           break
+        fi
         cutoff_time=$(( now - (seconds*(i-1)) ))
         if [ ! $created -gt $cutoff_time ]; then
           next=$(( i + 1 ))
@@ -539,6 +544,11 @@ function rotate_long_remote {
         else
           created=0
         fi
+        # Validate created date
+        if [ -z "\$created" ] || echo \$created | grep -v -q -e '^[0-9]*$'; then
+           echo "Warning: Invalid metatada \$created. Skipping rotation."
+           break
+        fi
         cutoff_time=\$(( now - (seconds*(i-1)) ))
         if [ ! \$created -gt \$cutoff_time ]; then
           next=\$(( i + 1 ))
-- 
cgit v1.2.3


From aa8d0f864830036e12e52696243c05df76d678e2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 12 Apr 2012 21:29:57 -0300
Subject: Quoting $exclude and $excludes and avoiding a for loop on $exclude to
 not expand wildcards in beforehand (upstream #3882)

---
 handlers/rsync.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index e253c5c..a77da2a 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -277,9 +277,7 @@ function eval_config {
     mv=move_files
   fi
 
-  for path in $exclude; do
-    excludes="$excludes --exclude=$path"
-  done
+  excludes=`echo "$exclude" | sed -e 's/^/--exclude=/g' -e 's/ / --exclude=/g'`
 
 }
 
@@ -1113,8 +1111,8 @@ for SECTION in $include; do
   set_dest
 
   info "Syncing $SECTION on $dest_path..."
-  debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path
-  $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path | tee -a $log
+  debug $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path
+  $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path | tee -a $log
 
   if [ "$?" != "0" ]; then
     fatal "Rsync error when trying to transfer $SECTION"
-- 
cgit v1.2.3


From 5ea13f4c240cf4c8c9f96dc424a5a14acc709f51 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Apr 2012 00:31:03 -0300
Subject: Using @SED@ for #3882

---
 handlers/rsync.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index a77da2a..ad8e64f 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -277,7 +277,7 @@ function eval_config {
     mv=move_files
   fi
 
-  excludes=`echo "$exclude" | sed -e 's/^/--exclude=/g' -e 's/ / --exclude=/g'`
+  excludes=`echo "$exclude" | @SED@ 's/^/--exclude=/g' -e 's/ / --exclude=/g'`
 
 }
 
-- 
cgit v1.2.3


From 39bb9e605f04665f8d838be442d9224745959872 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Apr 2012 09:58:18 -0300
Subject: Trying additional quoting on excludes (upstream #3882)

---
 handlers/rsync.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index ad8e64f..3108b37 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -277,7 +277,7 @@ function eval_config {
     mv=move_files
   fi
 
-  excludes=`echo "$exclude" | @SED@ 's/^/--exclude=/g' -e 's/ / --exclude=/g'`
+  excludes=`echo "$exclude" | @SED@ "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"`
 
 }
 
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From bf5ada0f0357dd3b7500d03dd4a4a2f84282e8c1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 16:53:52 -0300
Subject: Changing remaining 'exit' to 'fatal' at rsync handler (#3721)

---
 handlers/rsync.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 884a885..cb72886 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -391,8 +391,7 @@ function rotate_long {
   local metadata
 
   if [ ! -d "$backuproot" ]; then
-    echo "Debug: skipping rotate of $backuproot as it doesn't exist."
-    exit
+    fatal "Skipping rotate of $backuproot as it doesn't exist."
   fi
 
   for rottype in daily weekly monthly; do
@@ -509,7 +508,7 @@ function rotate_long_remote {
   now=\`date +%s\`
 
   if [ ! -d "$backuproot" ]; then
-    echo "Debug: skipping rotate of $backuproot as it doesn't exist."
+    echo "Fatal: skipping rotate of $backuproot as it doesn't exist."
     exit
   fi
 
-- 
cgit v1.2.3


From ba3e37595d7a8fbf9a881ab0b9b14146eb91f3a2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 17:00:58 -0300
Subject: Changing a 'fatal' to a 'warning' on rsync handler.

Using 'warning' and 'return' instead of a fatal at rotate_long if
backuproot doesn't exist. Using a warning ensures that the backup
action can process the other includes and not just exit.
---
 handlers/rsync.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index cb72886..6fcda05 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -391,7 +391,8 @@ function rotate_long {
   local metadata
 
   if [ ! -d "$backuproot" ]; then
-    fatal "Skipping rotate of $backuproot as it doesn't exist."
+    warning "Skipping rotate of $backuproot as it doesn't exist."
+    return
   fi
 
   for rottype in daily weekly monthly; do
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 5af9b963715efa186feacd0314a793184cc0eea3 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 17:25:34 -0300
Subject: Removing duplicated locking support (#3838)

---
 handlers/rsync.in | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 884a885..3378819 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -39,7 +39,6 @@
 #   keepdaily = for long storage format, specify the number of daily backup increments
 #   keepweekly = for long storage format, specify the number of weekly backup increments
 #   keepmonthly = for long storage format, specify the number of monthly backup increments
-#   lockfile = lockfile to be kept during backup execution
 #   nicelevel = rsync command nice level
 #   enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly
 #   tmp = temp folder
@@ -129,7 +128,6 @@ function eval_config {
   getconf keepdaily 5
   getconf keepweekly 3
   getconf keepmonthly 1
-  getconf lockfile
   getconf nicelevel 0
   getconf enable_mv_timestamp_bug no
   getconf tmp /tmp
@@ -875,45 +873,6 @@ function test_connect {
 
 }
 
-function set_lockfile {
-
-  if [ ! -z "$lockfile" ]; then
-    mkdir -p `dirname $lockfile`
-    if ( set -o noclobber; echo "$$" > "$lockfile" ) &> /dev/null; then
-      trap 'unset_lockfile' INT TERM EXIT
-    else
-      fatal "Could not create lockfile $lockfile, exiting"
-    fi
-  fi
-
-}
-
-function unset_lockfile {
-
-  if [ ! -z "$lockfile" ]; then
-    $rm -f $lockfile || warning "Could not remove lockfile $lockfile"
-  fi
-
-}
-
-function check_lockfile {
-
-  local pid process
-
-  if [ ! -z "$lockfile" ] && [ -f "$lockfile" ]; then
-    pid="`cat $lockfile`"
-    process="`ps --no-headers -o comm $pid`"
-    if [ "$?" == "0" ] && [ "`ps --no-headers -o comm $$`" == "$process" ]; then
-      info "Another backup is running for $lockfile, skipping run"
-      exit
-    else
-      info "Found old lockfile $lockfile, removing it"
-      unset_lockfile  
-    fi
-  fi
-
-}
-
 function set_filelist {
 
   filelist_flag=""
@@ -1103,8 +1062,6 @@ function end_mux {
 # the backup procedure
 
 eval_config
-check_lockfile
-set_lockfile
 set_rsync_options
 start_mux
 stop_services
@@ -1136,7 +1093,6 @@ done
 mount_ro
 run_fsck
 start_services
-unset_lockfile
 end_mux
 
 echo "Finnishing backup at `date`" >> $log
-- 
cgit v1.2.3


From a99421620f829c039324b71c88460eaf20c94c7c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 17:34:15 -0300
Subject: Removing lockfile from rsync example (#3838)

---
 examples/example.rsync | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/examples/example.rsync b/examples/example.rsync
index a2795db..faba203 100644
--- a/examples/example.rsync
+++ b/examples/example.rsync
@@ -50,11 +50,6 @@ days = 7
 # for long storage format, specify the number of monthly backup increments
 #keepmonthly = 1
 
-# use this if you need a lockfile to be kept during backup execution
-# this is an useful feature in case you have some tasks that should
-# know if the backup is running or not
-#lockfile = 
-
 # rsync command nice level
 #nicelevel = 0
 
-- 
cgit v1.2.3


From 461275fa4d537c80a0c28dd77a4620581fcf0324 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 17:59:24 -0300
Subject: Documenting rotation parameters at example.rsync (#3891)

---
 examples/example.rsync | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/examples/example.rsync b/examples/example.rsync
index a2795db..2b5eaa1 100644
--- a/examples/example.rsync
+++ b/examples/example.rsync
@@ -36,9 +36,33 @@ backupdir = myserver
 #tmp = /tmp
 
 # specify backup storage format: short, long or mirror (i.e, no rotations)
+#
+# In the short format, incremental backups are rotated every day the handler
+# runs an by a finite number of times (backup.0, backup.1, backup.1, etc), so
+# if you want to have incremental backups for longer periods (like months) you
+# have to configure rotations for 30 or more using the "days" parameter at the
+# [general] section in the handler config.
+# 
+# The short format is better described here:
+# http://www.mikerubel.org/computers/rsync_snapshots/#Incremental
+# 
+# The long format is inspired by the maildir handler and allows keeping backups
+# of longer periods (weeks and months) using less rotations as it stores
+# the increments in folders like daily.1, weekly.1, monthly.1 and has three
+# rotation parameters:
+# 
+#   keepdaily   = number of daily backup increments
+#   keepweekly  = number of weekly backup increments
+#   keepmonthly = number of monthly backup increments
+#
 format = short
 
 # for short storage format, specify the number of backup increments (min = 2, set to 1 or less to disable)
+#
+# Note that setting days = 0 is almost the same as using format = mirror except
+# that with the days config your backup gets a .0 suffix at the destination
+# folder, making it easier to turn it later to an incremental backup.
+#
 days = 7
 
 # for long storage format, specify the number of daily backup increments
-- 
cgit v1.2.3


From b7a92b20f8c139fff7e0febc0275c25c5c254d94 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 May 2012 21:26:38 -0300
Subject: Fixing typos (#3868)

---
 handlers/rsync.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 31449c2..5d8c777 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -423,7 +423,7 @@ function rotate_long {
         fi
         # Validate created date
         if [ -z "$created" ] || echo $created | grep -v -q -e '^[0-9]*$'; then
-           warning "Invalid metatada $created. Skipping rotation."
+           warning "Invalid metadata $created. Skipping rotation."
            break
         fi
         cutoff_time=$(( now - (seconds*(i-1)) ))
@@ -546,7 +546,7 @@ function rotate_long_remote {
         fi
         # Validate created date
         if [ -z "\$created" ] || echo \$created | grep -v -q -e '^[0-9]*$'; then
-           echo "Warning: Invalid metatada \$created. Skipping rotation."
+           echo "Warning: Invalid metadata \$created. Skipping rotation."
            break
         fi
         cutoff_time=\$(( now - (seconds*(i-1)) ))
-- 
cgit v1.2.3


From 7c66b699f5820a9fab997a98d95e2852dd21a262 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 14 May 2012 16:30:02 +0200
Subject: Always use explicit sed's -e.

Hopefully this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656968#31
and future incarnations of this class of bugs.
---
 handlers/rsync.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/handlers/rsync.in b/handlers/rsync.in
index c5c7cac..2d00267 100644
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -275,7 +275,7 @@ function eval_config {
     mv=move_files
   fi
 
-  excludes=`echo "$exclude" | @SED@ "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"`
+  excludes=`echo "$exclude" | @SED@ -e "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"`
 
 }
 
@@ -406,7 +406,7 @@ function rotate_long {
     fi
     
     # Rotate the current list of backups, if we can.
-    oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1`
+    oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1`
     [ "$oldest" == "" ] && oldest=0
     for (( i=$oldest; i > 0; i-- )); do
       if [ -d $dir.$i ]; then
@@ -468,7 +468,7 @@ function rotate_long {
   for rottype in daily weekly monthly; do
     max=$((keep${rottype}+1))
     dir="$backuproot/$rottype"
-    oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1`
+    oldest=`find $backuproot -maxdepth 1 -type d -name $rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1`
     [ "$oldest" == "" ] && oldest=0 
     # if we've rotated the last backup off the stack, remove it.
     for (( i=$oldest; i >= $max; i-- )); do
@@ -529,7 +529,7 @@ function rotate_long_remote {
     fi
     
     # Rotate the current list of backups, if we can.
-    oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1\`
+    oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1\`
     [ "\$oldest" == "" ] && oldest=0
     for (( i=\$oldest; i > 0; i-- )); do
       if [ -d \$dir.\$i ]; then
@@ -591,7 +591,7 @@ function rotate_long_remote {
   for rottype in daily weekly monthly; do
     max=\$((keep\${rottype}+1))
     dir="$backuproot/\$rottype"
-    oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1\`
+    oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ -e 's/^.*\.//' | sort -n | tail -1\`
     [ "\$oldest" == "" ] && oldest=0 
     # if we've rotated the last backup off the stack, remove it.
     for (( i=\$oldest; i >= \$max; i-- )); do
-- 
cgit v1.2.3