system/dump: Updated for version 0.4b42

4 files changed, 50 insertions, 35 deletions

diff --git a/system/dump/README b/system/dump/README
index 8e540576c37f6..af53cb4a9a082 100644
--- a/system/dump/README
+++ b/system/dump/README
@@ -1,28 +1,29 @@
 DUMP (dump and restore backup commands)
 
-Dump examines files in a filesystem, determines which ones need to be 
-backed up, and copies those files to a specified disk, tape or other 
-storage medium. Subsequent incremental backups can then be layered on top
-of the full backup.
+Dump examines files in a filesystem, determines which ones need to be backed 
+up, and copies those files to a specified disk, tape or other storage medium. 
+Subsequent incremental backups can then be layered on top of the full backup.
 
-You might want to read this post by Linus:
+The restore command performs the inverse function of dump; it can restore a 
+full backup of a filesystem. Single files and directory subtrees may also be 
+restored from full or partial backups in interactive mode.
+
+
+You might want to read this post by Linus: 
 	http://lwn.net/2001/0503/a/lt-dump.php3
-and the counter-argument on
+and the counter-argument on:
 	http://dump.sourceforge.net/isdumpdeprecated.html
 
+Slackware's tar package already has rmt, therefore this SlackBuild 
+excludes it.
 
-SLACKWARE ISSUES WITH DUMP/RESTORE/RMT
+CONFLICT: The restore application conflicts with the tar package.
 
-Dump package conflicts with these two files from the tar package:
-	the rmt man page:	 	/usr/man/man8/rmt.8.gz
-	and the restore application:	/usr/sbin/restore 
-Installing the dump package will overwrite these files. 
+On installing this dump package "/usr/sbin/restore" will be overwritten.
 
-Should you remove the dump package, you may note that the two files 
-referred to above will not be removed because they are "shared" with 
-the tar package.   You will need to reinstall the stock tar package.
+Should you remove the dump package, you may note that this file will not be 
+deleted because it is "shared" with the tar package. You may opt to reinstall 
+the stock tar package after uninstalling the dump package.
+Hint: # slackpkg reinstall tar
 
-With regards to rmt, the tar package installs it to /sbin/rmt while the
-dump package installs it in /usr/sbin/rmt - these two are not identical.
-You can be sure to call the relevant rmt application by qualifying the 
-full path to the desired rmt executable.
+This SlackBuild disables the SELinux functionality and dependency. 
diff --git a/system/dump/dump.SlackBuild b/system/dump/dump.SlackBuild
index 79c0fa21dd7f2..de3076926da74 100644
--- a/system/dump/dump.SlackBuild
+++ b/system/dump/dump.SlackBuild
@@ -3,10 +3,10 @@
 # Slackware build script for dump
 
 # Written by Chris Abela <chris.abela@maltats.com>
-# November 2008
+# July 2009
 
 PRGNAM=dump
-VERSION=${VERSION:-0.4b41}
+VERSION=${VERSION:-0.4b42}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -39,16 +42,24 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# rmt is available on Slack's tar package, so I am disabling it. 
+# The fully qualified mandir is necessary.
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=$PKG/usr/man \
   --with-binowner=root \
   --with-bingrp=root \
   --with-manowner=root \
-  --with-mangrp=root
+  --with-mangrp=root \
+  --enable-rmt=no \
+  --enable-transselinux=no
+
+# This is needed as we do not have SELinux
+sed -i 's/ -lselinux -lsepol//' configure.in
 
 make
 make prefix=$PKG/usr install
@@ -66,8 +77,9 @@ make prefix=$PKG/usr install
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYRIGHT INSTALL KNOWNBUGS MAINTAINERS README REPORTING-BUGS \
-  THANKS TODO examples  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES COPYRIGHT INSTALL *BUGS MAINTAINERS README THANKS TODO examples \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.Slackbuild
 
@@ -75,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dump/dump.info b/system/dump/dump.info
index 36d8590c2eba5..d4d7376b39069 100644
--- a/system/dump/dump.info
+++ b/system/dump/dump.info
@@ -1,8 +1,10 @@
 PRGNAM="dump"
-VERSION="0.4b41"
+VERSION="0.4b42"
 HOMEPAGE="http://dump.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dump/dump-0.4b41.tar.gz"
-MD5SUM="f89bb42d860c58b86b05d0734c9f3649"
+DOWNLOAD="http://downloads.sourceforge.net/dump/dump-0.4b42.tar.gz"
+MD5SUM="7202465ed687da2540a7b2b44a09f1b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Chris Abela"
 EMAIL="chris.abela@maltats.com"
 APPROVED="rworkman"
diff --git a/system/dump/slack-desc b/system/dump/slack-desc
index 769484d12f17d..59c7cf8339ff1 100644
--- a/system/dump/slack-desc
+++ b/system/dump/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |-----handy-ruler------------------------------------------------------|
+    |--------handy-ruler------------------------------------------------------|
 dump: dump (dump and restore backup commands)
 dump:
 dump: Dump examines files in a filesystem, determines which ones need to be 
 dump: backed up, and copies those files to a specified disk, tape or other 
-dump: storage medium. Subsequent incremental backups can then be layered on
-dump: top of the full backup.
-dump:
-dump:
-dump:
+dump: storage medium. Subsequent incremental backups can then be layered on top
+dump: of the full backup.
 dump:
+dump: The restore command performs the inverse function of dump; it can restore
+dump: a full backup of a filesystem. Single files and directory subtrees may 
+dump: also be restored from full or partial backups in interractive mode.
 dump: