- updated files

[packages/amanda.git] / amanda-bashizm.patch

diff --git a/amanda-bashizm.patch b/amanda-bashizm.patch
index 61ec7d5d3b05876c658221b423d0f4f3977451fc..93b42794117b6a50f45c02739027fb92be94e89b 100644 (file)
--- a/amanda-bashizm.patch
+++ b/amanda-bashizm.patch
@@ -1,42 +1,20 @@
 --- amanda-2.6.0/config/amanda/dumpers.m4~     2008-03-03 14:50:51.000000000 +0100
 +++ amanda-2.6.0/config/amanda/dumpers.m4      2008-05-07 11:13:49.000000000 +0200
 @@ -41,7 +41,7 @@
-     fi
- 
-     if test ! -z "$GNUTAR"; then
--      case "`\"$GNUTAR\" --version 2>&1`" in
-+      case "`$GNUTAR --version 2>&1`" in
-        *GNU*tar* | *Free*paxutils* ) : # OK, it is GNU tar
-                   ;;
-        *)
+       for gnutar_name in gtar gnutar tar; do
+           AC_PATH_PROGS(GNUTAR, $gnutar_name, , $LOCSYSPATH)
+           if test -n "$GNUTAR"; then
+-            case "`\"$GNUTAR\" --version 2>&1`" in
++            case "`$GNUTAR --version 2>&1`" in
+              *GNU*tar* | *Free*paxutils* )
+                           # OK, it is GNU tar
+                           break
 @@ -103,7 +103,7 @@
        AC_PATH_PROG(SAMBA_CLIENT,smbclient,,$LOCSYSPATH)
        smbversion=0
        if test ! -z "$SAMBA_CLIENT"; then
--        case "`\"$SAMBA_CLIENT\" '\\\\not.a.host.name\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
-+        case "`$SAMBA_CLIENT '\\\\not.a.host.name\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
+-        case "`\"$SAMBA_CLIENT\" '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
++        case "`$SAMBA_CLIENT '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in
          *"Unknown host"*)
                      smbversion=1
                      ;;
---- amanda-2.6.0/changer-src/chg-zd-mtx.sh~    2008-05-14 17:36:20.000000000 +0200
-+++ amanda-2.6.0/changer-src/chg-zd-mtx.sh     2008-05-15 15:03:59.000000000 +0200
-@@ -797,7 +797,7 @@
- max_drive_wait=${max_drive_wait:-'120'}                       # default: two minutes
- 
- # check MT and MTX for sanity
--if test "${MTX:0:1}" = "/"; then
-+if test "${MTX#/}" != "$MTX"; then
-     if ! test -f "${MTX}"; then
-       Exit 2 \
-           `_ '<none>'` \
---- amanda-2.6.0/server-src/amcleanup.sh~      2008-01-18 01:31:25.000000000 +0100
-+++ amanda-2.6.0/server-src/amcleanup.sh       2008-05-21 13:45:10.000000000 +0200
-@@ -75,7 +75,7 @@
- #   after receiving SIGTERM,  if yes send SIGKILL  
- #
- 
--function killpid() {
-+killpid() {
- 
- killPID=$1
- SIGTERM=15