From ca12e5617b1c7a600324e2c6437444627720c62c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 24 Jun 2008 18:02:23 +0000
Subject: [PATCH] made mktemp a requirement for building backupninja, added
 autotools variables to substitute the proper binary location and removed bad
 fall-back when mktemp was not there

---
 ChangeLog                |  3 +++
 configure.in             |  5 +++++
 examples/example.maildir |  8 +++++---
 lib/easydialog.in        | 10 +++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9a6906..80db11c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@ version 0.9.6 -- unreleased
     lib changes
 	vserver:
 	 . added vservers_running function
+	tools
+	 . mktemp is now required to run backupninja, removed less secure
+	   fall-back if mktemp did not exist on the system
     handler changes
 	dup:
 	 . General cleanup
diff --git a/configure.in b/configure.in
index 0d603ff..43a6513 100644
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,11 @@ if test x$MD5SUM = "xno"; then
     AC_MSG_ERROR([md5sum is required])
 fi
 
+AC_PATH_PROGS(MKTEMP, mktemp, "no")
+if test x$MKTEMPT = "xno"; then
+    AC_MSG_ERROR([mktemp is required])
+fi
+
 AC_CHECK_PROG(ac_cv_have_rpm, rpm, "yes", "no")
 if test "x$ac_cv_have_rpm" = "xyes"; then
         rpm --define '_topdir /tmp' > /dev/null 2>&1
diff --git a/examples/example.maildir b/examples/example.maildir
index 96f0c0e..8898a78 100644
--- a/examples/example.maildir
+++ b/examples/example.maildir
@@ -35,11 +35,13 @@ keepweekly = 3
 keepmonthly = 1
 
 # directory which contains all the maildirs
-# this directory is expected to have subdirectories lettered a-z and
-# in each letter subdirectory are the users Maildirs which start with 
-# those letters
 srcdir = /maildir/riseup.net
 
+# the srcdir is expected to contain the following subdirectories. Each
+# of these will contain the user's Maildirs which start with these
+# letters
+srcsubdirs = 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z
+
 # put the backups under this directory
 destdir = /crypta/maildir/riseup.net
 desthost = kakapo-pn
diff --git a/lib/easydialog.in b/lib/easydialog.in
index d861218..056c76c 100644
--- a/lib/easydialog.in
+++ b/lib/easydialog.in
@@ -48,7 +48,7 @@ gaugeBox() {
 }
 
 inputBox() {
-    local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
+    local temp=$(@MKTEMP@ -t backupninja.XXXXXX) || exit 1
     trap "rm -f $temp" 0
     REPLY=
     $DIALOG --backtitle "$BACKTITLE" --title "$1" \
@@ -80,7 +80,7 @@ _genericListBox() {
     local title=$1
     local text=$2
     shift 2
-    local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
+    local temp=$(@MKTEMP@ -t backupninja.XXXXXX) || exit 1
     trap "rm -f $temp" 0
     REPLY=
     $DIALOG $HELP $_DEFAULT --backtitle "$BACKTITLE" --title "$title" \
@@ -133,7 +133,7 @@ textBox() {
 }
 
 passwordBox() {
-    local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
+    local temp=$(@MKTEMP@ -t backupninja.XXXXXX) || exit 1
     trap "rm -f $temp" 0
     REPLY=
     $DIALOG --backtitle "$BACKTITLE" --title "$1" \
@@ -175,7 +175,7 @@ listItem() {
 ##
 listDisplay() {
    boxtype=$1
-   local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
+   local temp=$(@MKTEMP@ -t backupninja.XXXXXX) || exit 1
    trap "rm -f $temp" 0
    
    local label
@@ -221,7 +221,7 @@ formItem() {
 }
     
 formDisplay() {
-   local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
+   local temp=$(@MKTEMP@ -t backupninja.XXXXXX) || exit 1
    
    max_length=0
    for ((i=0; i < ${#_form_labels[@]} ; i++)); do
-- 
2.30.2