backupninja update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@569 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/backupninja/backupninja-0.9.4.diff b/backupninja/backupninja-0.9.4.diff
index 0e64bbbda5a4c8e53ea0fe50a7f6e942faf2345e..2d93cb2511c78c8175baea041389a93476115a39 100644 (file)
--- a/backupninja/backupninja-0.9.4.diff
+++ b/backupninja/backupninja-0.9.4.diff
@@ -1,67 +1,56 @@
 diff -Naur backupninja-0.9.4.orig/handlers/pgsql backupninja-0.9.4/handlers/pgsql
 --- backupninja-0.9.4.orig/handlers/pgsql      2006-10-07 01:45:20.000000000 -0300
-+++ backupninja-0.9.4/handlers/pgsql   2006-11-02 17:28:25.000000000 -0200
-@@ -7,6 +7,7 @@
- getconf databases all
- getconf compress yes
- getconf vsname
-+getconf pgsqluser postgres
- 
- localhost=`hostname`
- 
-@@ -62,12 +63,12 @@
- # give backup dir the good uid and permissions
- # (in respect to the vserver, if $usevserver = yes)
++++ backupninja-0.9.4/handlers/pgsql   2006-11-02 17:43:13.000000000 -0200
+@@ -64,10 +64,10 @@
  if [ $usevserver = yes ]; then
--   pguid=`$VSERVER $vsname exec getent passwd $PGSQLUSER | awk -F: '{print $3}'`
-+   pguid=`$VSERVER $vsname exec getent passwd $pgsqluser | awk -F: '{print $3}'`
+    pguid=`$VSERVER $vsname exec getent passwd $PGSQLUSER | awk -F: '{print $3}'`
  else
 -   pguid=`getent passwd postgres | awk -F: '{print $3}'`
-+   pguid=`getent passwd $pgsqluser | awk -F: '{print $3}'`
++   pguid=`getent passwd $PGSQLUSER | awk -F: '{print $3}'`
  fi
  [ -n "$pguid" ] || \
 -    fatal "No user called postgres`[ $usevserver = no ] || echo \" on vserver $vsname\"`."
-+    fatal "No user called $pgsqluser`[ $usevserver = no ] || echo \" on vserver $vsname\"`."
++    fatal "No user called $PGSQLUSER`[ $usevserver = no ] || echo \" on vserver $vsname\"`."
  debug "chown $pguid $vroot$backupdir"
  chown $pguid $vroot$backupdir
  debug "chmod 700 $vroot$backupdir"
-@@ -77,15 +78,15 @@
+@@ -77,15 +77,15 @@
  if [ "$databases" == "all" ]; then
      if [ $usevserver = yes ]; then
         if [ "$compress" == "yes" ]; then          
 -          execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\""
-+          execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\""
++          execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\""
         else
 -          execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\""
-+          execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\""
++          execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\""
         fi
      else
         if [ "$compress" == "yes" ]; then
 -          execstr="su - postgres -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\""
-+          execstr="su - $pgsqluser -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\""
++          execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\""
         else
 -      execstr="su - postgres -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\""
-+      execstr="su - $pgsqluser -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\""
++      execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\""
         fi
      fi
      debug "$execstr"
-@@ -106,15 +107,15 @@
+@@ -106,15 +106,15 @@
      for db in $databases; do
        if [ $usevserver = yes ]; then
             if [ "$compress" == "yes" ]; then
 -              execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
-+              execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
++              execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
             else
 -              execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\""
-+              execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\""
++              execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\""
             fi
        else
             if [ "$compress" == "yes" ]; then
 -              execstr="su - postgres -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
-+              execstr="su - $pgsqluser -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
++              execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\""
             else
 -              execstr="su - postgres -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\""
-+              execstr="su - $pgsqluser -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\""
++              execstr="su - $PGSQLUSER -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\""
             fi
        fi
        debug "$execstr"

diff --git a/backupninja/backupninja.SlackBuild b/backupninja/backupninja.SlackBuild
index dd7436c74edad47eeed96f237d89951be049b8b6..c81f24f18e3f88a09f51d50ac54d595924b8c109 100755 (executable)
--- a/backupninja/backupninja.SlackBuild
+++ b/backupninja/backupninja.SlackBuild
@@ -18,7 +18,7 @@ fi
 PACKAGE="backupninja"
 ARCH="noarch"
 VERSION=${VERSION:=0.9.4}
-BUILD=${BUILD:=3rha}
+BUILD=${BUILD:=4rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}