misc/ophcrack: Updated for version 3.3.1

4 files changed, 22 insertions, 36 deletions

diff --git a/misc/ophcrack/README b/misc/ophcrack/README
index 994daa23e071..495a569ccd73 100644
--- a/misc/ophcrack/README
+++ b/misc/ophcrack/README
@@ -3,16 +3,10 @@ It is a very efficient implementation of rainbow tables done by the
 inventors of the method. It comes with a Graphical User Interface
 and runs on multiple platforms.
 
-This optionally requires qt4 for the gui, but if you do not wish to
-build the gui, you can use the command line mode; run the build script
-like this:  GUI=no ./ophcrack.SlackBuild
-
 Ophcrack has a graphing function that goes with the ophcrack gui. The
-graphing function depends on the qwt package available at
-slackbuilds.org.  qwt must be built with Qt4 as well by passing
-QMAKE="qmake-qt4" to qwt.SlackBuild, otherwise, the ophcrack slackbuild will
-fail with qwt Qt3 bindings.  To enable the graphing function run the
-build script like this: GRAPH=yes ./ophcrack.SlackBiuld
+graphing function depends on the "qwt" package available at
+slackbuilds.org. To enable the graphing function run the build script
+like this: GRAPH=yes ./ophcrack.SlackBuild
 
 Ophcrack tables can be found at
-http://ophcrack.sourceforge.net/tables.php
\ No newline at end of file
+http://ophcrack.sourceforge.net/tables.php
diff --git a/misc/ophcrack/ophcrack.SlackBuild b/misc/ophcrack/ophcrack.SlackBuild
index c4be94beeeae..f4a994550112 100644
--- a/misc/ophcrack/ophcrack.SlackBuild
+++ b/misc/ophcrack/ophcrack.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=ophcrack
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.3.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -13,7 +13,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-GUI=${GUI:-yes}
 GRAPH=${GRAPH:-no}
 
 if [ "$ARCH" = "i486" ]; then
@@ -42,13 +41,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$GUI" != "yes" ]; then
-  GUI_STATUS="--disable-gui"
-else
-  GUI_STATUS="--enable-gui"
-fi
-
-if [ "$GUI" == "yes" ] && [ "$GRAPH" == "yes" ]; then
+if [ "$GRAPH" == "yes" ]; then
   GRAPH_STATUS="--enable-graph"
 else
   GRAPH_STATUS="--disable-graph"
@@ -59,9 +52,9 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --enable-debug=no \
+  --enable-gui \
+  $GRAPH_STATUS \
   --build=$ARCH-slackware-linux \
-  $GUI_STATUS \
-  $GRAPH_STATUS
 
 make
 make install DESTDIR=$PKG
@@ -76,12 +69,10 @@ make install DESTDIR=$PKG
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-if [ "$GUI" = "yes" ]; then
-  # Make a desktop menu entry
-  mkdir -p $PKG/usr/share/{applications,pixmaps}
-  cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-  cat src/gui/pixmaps/os.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
-fi
+# Make a desktop menu entry
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat src/gui/pixmaps/os.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -94,4 +85,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/misc/ophcrack/ophcrack.desktop b/misc/ophcrack/ophcrack.desktop
index 6ae7c778a59c..9e0554d47719 100644
--- a/misc/ophcrack/ophcrack.desktop
+++ b/misc/ophcrack/ophcrack.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Version=3.2.1
-Encoding=UTF-8
+Version=1.0
 Name=Ophcrack
 Exec=ophcrack
-Icon=ophcrack.xpm
+Icon=ophcrack
 Type=Application
-Terminal=0
+Terminal=false
 Comment=Microsoft Windows password cracker
 Comment[fr]=Casseur de mot de passe Microsoft Windows
-Categories=Application;Utility;
+Categories=System;Utility;
diff --git a/misc/ophcrack/ophcrack.info b/misc/ophcrack/ophcrack.info
index 96f97fea475e..04be48563e9a 100644
--- a/misc/ophcrack/ophcrack.info
+++ b/misc/ophcrack/ophcrack.info
@@ -1,8 +1,10 @@
 PRGNAM="ophcrack"
-VERSION="3.3.0"
+VERSION="3.3.1"
 HOMEPAGE="http://ophcrack.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ophcrack/ophcrack-3.3.0.tar.bz2"
-MD5SUM="09028bf3d470cf050baf7639ecf5943f"
+DOWNLOAD="http://downloads.sourceforge.net/ophcrack/ophcrack-3.3.1.tar.bz2"
+MD5SUM="740eef54e9082f26851e15c1cb4ef55c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
 APPROVED="rworkman"