4 files changed, 58 insertions, 33 deletions
diff --git a/system/testdisk/README b/system/testdisk/README
index 9cd873d5c9..0e15d7fff8 100644
--- a/system/testdisk/README
+++ b/system/testdisk/README
@@ -1,4 +1,4 @@
-TestDisk is a powerful free data recovery software! It was primarily
+TestDisk is a powerful free data recovery software. It was primarily
 designed to help recover lost partitions and/or make non-booting
 disks bootable again when these symptoms are caused by faulty
 software, certain types of viruses or human error (such as
@@ -9,4 +9,6 @@ PhotoRec is file data recovery software designed to recover lost files
 including video, documents and archives from Hard Disks and CDRom and
 lost pictures from digital camera memory.
 
+If you want to enable the use of sudo run the script with SUDO=true
+
 libewf is an optional dependency.
diff --git a/system/testdisk/slack-desc b/system/testdisk/slack-desc
index 522eb958d8..d3461b8cc3 100644
--- a/system/testdisk/slack-desc
+++ b/system/testdisk/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler-----------------------------------------------------|
-testdisk: TestDisk (free data recovery software)
+testdisk: TestDisk (data recovery software)
 testdisk:
 testdisk: TestDisk was primarily designed to help recover lost partitions
-testdisk: and/or make non-booting disks bootable again when these symptoms 
-testdisk: are caused by faulty software, certain types of viruses or human 
-testdisk: error (such as accidentally deleting a Partition Table). 
-testdisk: 
-testdisk: PhotoRec is file data recovery software designed to recover lost 
-testdisk: files including video, documents and archives from Hard Disks and 
+testdisk: and/or make non-booting disks bootable again when these symptoms
+testdisk: are caused by faulty software, certain types of viruses or human
+testdisk: error (such as accidentally deleting a Partition Table).
+testdisk:
+testdisk: PhotoRec is file data recovery software designed to recover lost
+testdisk: files including video, documents and archives from Hard Disks and
 testdisk: CDRom and lost pictures from digital camera memory.
-testdisk: 
+testdisk:
diff --git a/system/testdisk/testdisk.SlackBuild b/system/testdisk/testdisk.SlackBuild
index 39a677c8f5..556ea2cd4f 100644
--- a/system/testdisk/testdisk.SlackBuild
+++ b/system/testdisk/testdisk.SlackBuild
@@ -1,21 +1,35 @@
 #!/bin/sh
-# Slackware build script for <testdisk>
-# Written by Michales Michaloudes korgie@gmail.com
-# Modified by Robby Workman <rworkman@slackbuilds.org>
+
+# Slackware build script for testdisk
+# Originally Written by Michales Michaloudes korgie@gmail.com
+
+# Copyright 2011 Grigorios Bouzakis <grbzks@xsmail.com>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=testdisk
-VERSION=6.12_WIP
+VERSION=${VERSION:-6.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRC_VERSION="$(printf $VERSION | tr _ -)"
-
-# 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
@@ -39,40 +53,49 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="COPYING INFO"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.bz2
-cd $PRGNAM-$SRC_VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+[ "$SUDO" = "true" ] && ENABLE_SUDO="--enable-sudo"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$SRC-VERSION \
-  --build=$ARCH-slackware-linux
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  ${ENABLE_SUDO}
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Thanks for ignoring the --docdir setting
 mv $PKG/usr/share/doc $PKG/usr ; rmdir $PKG/usr/share
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$SRC_VERSION/$PRGNAM.SlackBuild
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/testdisk/testdisk.info b/system/testdisk/testdisk.info
index b40f20f0e0..39989a22b1 100644
--- a/system/testdisk/testdisk.info
+++ b/system/testdisk/testdisk.info
@@ -1,10 +1,10 @@
 PRGNAM="testdisk"
-VERSION="6.12_WIP"
+VERSION="6.12"
 HOMEPAGE="http://www.cgsecurity.org"
-DOWNLOAD="http://www.cgsecurity.org/testdisk-6.12-WIP.tar.bz2"
-MD5SUM="ed7bcfee065982cd2c831c7aff897707"
+DOWNLOAD="http://www.cgsecurity.org/testdisk-6.12.tar.bz2"
+MD5SUM="6ef653301f309156f3a802233a3139c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Michales Michaloudes"
-EMAIL="korgie@gmail.com"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
 APPROVED="rworkman"