5 files changed, 26 insertions, 25 deletions
diff --git a/system/amanda/README b/system/amanda/README
index 6cba710a2ad56..09d25b13f54c4 100644
--- a/system/amanda/README
+++ b/system/amanda/README
@@ -1,14 +1,14 @@
-AMANDA, the Advanced Maryland Autoamatic Network Disk Archiver, is a backup 
-system that allows the administrator of a LAN to set up a single master backup
-server to back up multiple hosts to a single large capacity tape drive.  
-AMANDA uses native dump and/or GNU tar facilities and can back up a large 
-number of workstations running multiple versions of Unix.  Recent versions 
-can also use SAMBA to back up Microsoft Windows hosts.
+AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a
+backup system that allows the administrator of a LAN to set up a single
+master backup server to back up multiple hosts to a single large capacity
+tape drive.  AMANDA uses native dump and/or GNU tar facilities and can
+back up a large number of workstations running multiple versions of Unix.
+Recent versions can also use SAMBA to back up Microsoft Windows hosts.
 
 You will need to have a special user and group created for AMANDA to use;
 this defaults to user and group of "amanda" but you can specify whatever
 group you wish - see the build script for more information.
 
-After installing, see the /usr/doc/amanda-2.6.1p1/README.SLACKWARE for more 
-information on how to modify inetd.conf to start the the Amanda daemons 
-automatically at boot.
+After installing, see the /usr/doc/amanda-3.2.1/README.Slackware for
+more information on how to modify inetd.conf to start the the Amanda
+daemons automatically at boot.
diff --git a/system/amanda/README.SLACKWARE b/system/amanda/README.Slackware
index 7b01ade70767d..4e0758def06d2 100644
--- a/system/amanda/README.SLACKWARE
+++ b/system/amanda/README.Slackware
@@ -1,4 +1,4 @@
-README.SLACKWARE
+README.Slackware
 Written by Christopher Walker <kris240376@gmail.com>
 
 You'll need to start the Amanda indexing services at boot.
diff --git a/system/amanda/amanda.SlackBuild b/system/amanda/amanda.SlackBuild
index b75c34141c954..d46ed47606852 100644
--- a/system/amanda/amanda.SlackBuild
+++ b/system/amanda/amanda.SlackBuild
@@ -32,16 +32,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=amanda
-VERSION=${VERSION:-2.6.1p1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.1}
+BUILD=${BUILD:-1}
 TAG=${TAB:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -107,7 +105,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-user=$AMANDAUSR \
   --with-group=$AMANDAGRP\
   --with-owner=root \
+  --with-bsdtcp-security \
   --with-bsdudp-security \
+  --with-rsh-security \
   --with-ssh-security \
   --with-bsdtcp-security \
   --disable-static \
@@ -123,9 +123,9 @@ chown -R root:root $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/etc/$PRGNAM
-for i in 3hole.ps 8.5x11.ps DIN-A4.ps DLT.ps EXB-8500.ps \
-  HP-DAT.ps amanda-client.conf amanda.conf chg-mcutil.conf \
-  chg-multi.conf chg-scsi.conf disklist ; do
+for i in 3hole.ps 8.5x11.ps DIN-A4.ps DLT-A4.ps DLT.ps EXB-8500.ps \
+  HP-DAT.ps amanda-client-postgresql.conf amanda-client.conf \
+  amanda.conf chg-multi.conf chg-scsi.conf disklist ; do
     cat example/$i > $PKG/etc/$PRGNAM/$i.new ;
 done
 
@@ -134,13 +134,13 @@ chown -R $AMANDAUSR:$AMANDAGRP $PKG/var/lib/amanda
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+cat $CWD/README.Slackware > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
+cd $PKG/usr/doc/$PRGNAM-$VERSION
   for i in template.d example ChangeLog COPYRIGHT NEWS ReleaseNotes ; do
     ln -s ../../share/amanda/$i $i ;
   done
-)
+cd -
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/amanda/amanda.info b/system/amanda/amanda.info
index eb538c554c590..8645272913c35 100644
--- a/system/amanda/amanda.info
+++ b/system/amanda/amanda.info
@@ -1,10 +1,10 @@
 PRGNAM="amanda"
-VERSION="2.6.1p1"
+VERSION="3.2.1"
 HOMEPAGE="http://www.amanda.org/"
-DOWNLOAD="http://downloads.sourceforge.net/amanda/amanda-2.6.1p1.tar.gz"
-MD5SUM="eae0a75f21aa708a8dccf9ea7ac1c631"
+DOWNLOAD="http://downloads.sourceforge.net/amanda/amanda-3.2.1.tar.gz"
+MD5SUM="52448420a04d27b8ce47ef397b0a7061"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Christopher Walker"
 EMAIL="kris240376@gmail.com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/system/amanda/doinst.sh b/system/amanda/doinst.sh
index 6910610d707d3..149cd8bdfc0c4 100644
--- a/system/amanda/doinst.sh
+++ b/system/amanda/doinst.sh
@@ -14,12 +14,13 @@ config() {
 config etc/amanda/3hole.ps.new
 config etc/amanda/8.5x11.ps.new
 config etc/amanda/DIN-A4.ps.new
+config etc/amanda/DLT-A4.ps.new
 config etc/amanda/DLT.ps.new
 config etc/amanda/EXB-8500.ps.new
 config etc/amanda/HP-DAT.ps.new
+config etc/amanda/amanda-client-postgresql.conf.new
 config etc/amanda/amanda-client.conf.new
 config etc/amanda/amanda.conf.new
-config etc/amanda/chg-mcutil.conf.new
 config etc/amanda/chg-multi.conf.new
 config etc/amanda/chg-scsi.conf.new
 config etc/amanda/disklist.new