system/foremost: Updated for version 1.5.7.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

3 files changed, 11 insertions, 18 deletions

diff --git a/system/foremost/README b/system/foremost/README
index 3362396b24..9b9d12edf6 100644
--- a/system/foremost/README
+++ b/system/foremost/README
@@ -2,4 +2,4 @@ Foremost is a Linux program to recover files based on their headers and
 footers. Foremost can work on image files, such as those generated by dd,
 Safeback, Encase, etc, or directly on a drive. The headers and footers are
 specified by a configuration file, so you can pick and choose which
-headers you want to look for.
\ No newline at end of file
+headers you want to look for.
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 6fc6905ee0..13b654e3b8 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -3,16 +3,14 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=foremost
-VERSION=${VERSION:-1.5.6}
+VERSION=${VERSION:-1.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_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
@@ -24,16 +22,12 @@ 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
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -52,15 +46,15 @@ find . \
  -exec chmod 644 {} \;
 
 # Set the $ARCH variable for the Makefile.
-sed -i "s|-O2|\$(CFLAGS)|" Makefile
+sed -i "s|-O2|$SLKCFLAGS|" Makefile
 # Set location of configuration file.
-sed -i 's|\/usr\/local\/etc|\/etc|' config.c
-# Fix segfaults with broken jpeg headers.
+sed -i 's|/usr/local||' config.c
+# Fix segfaults with broken jpeg.
 patch -p1 < $CWD/foremost-broken-jpeg.patch
 # Make the directories.
 mkdir -p $PKG/etc $PKG/usr/{man/man8,bin}
 
-make CFLAGS="$SLKCFLAGS"
+make
 make install \
   CONF=$PKG/etc \
   MAN=$PKG/usr/man/man8 \
@@ -78,8 +72,7 @@ cp -a \
   CHANGES README COPYRIGHT \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Remove executable priveleges from text files.
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/foremost/foremost.info b/system/foremost/foremost.info
index 6ee3d786b4..f3b3266f35 100644
--- a/system/foremost/foremost.info
+++ b/system/foremost/foremost.info
@@ -1,10 +1,10 @@
 PRGNAM="foremost"
-VERSION="1.5.6"
+VERSION="1.5.7"
 HOMEPAGE="http://foremost.sourceforge.net/"
-DOWNLOAD="http://foremost.sourceforge.net/pkg/foremost-1.5.6.tar.gz"
-MD5SUM="1ac068f5681bbee679f99d2f9fa7f39f"
+DOWNLOAD="http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz"
+MD5SUM="860119c49665c2a3fb2b0b1d3dbad02a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"