summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/truecrypt/truecrypt.SlackBuild8
-rw-r--r--system/truecrypt/truecrypt.info4
-rw-r--r--system/truecrypt/truecrypt_dismount_failure.diff26
3 files changed, 6 insertions, 32 deletions
diff --git a/system/truecrypt/truecrypt.SlackBuild b/system/truecrypt/truecrypt.SlackBuild
index 719bc27c68..f1f36fc696 100644
--- a/system/truecrypt/truecrypt.SlackBuild
+++ b/system/truecrypt/truecrypt.SlackBuild
@@ -6,7 +6,7 @@
# http://connie.slackware.com/~alien/slackbuilds/truecrypt/build/
# http://repository.slacky.eu/slackware-12.2/security/6.3a/src
#
-# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+# Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
PRGNAM=truecrypt
SRCNAM=TrueCrypt
-VERSION=${VERSION:-7.0}
+VERSION=${VERSION:-7.0a}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -68,12 +68,12 @@ tar xvf $CWD/"${SRCNAM} ${VERSION} Source.tar.gz"
cd ${PRGNAM}-${VERSION}-source
# Fix dismount failure on Slackware using neongen's patch from slacky.eu
-patch -p1 < $CWD/truecrypt_dismount_failure.diff
+#patch -p1 < $CWD/truecrypt_dismount_failure.diff
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-if [ $ARCH == "x86_64" ]; then
+if [ $ARCH = "x86_64" ]; then
export LDFLAGS="$SLKLDFLAGS"
fi
export CXXFLAGS="$SLKCFLAGS"
diff --git a/system/truecrypt/truecrypt.info b/system/truecrypt/truecrypt.info
index ee02bc28a0..4d354e2bdd 100644
--- a/system/truecrypt/truecrypt.info
+++ b/system/truecrypt/truecrypt.info
@@ -1,8 +1,8 @@
PRGNAM="truecrypt"
-VERSION="7.0"
+VERSION="7.0a"
HOMEPAGE="http://www.truecrypt.org"
DOWNLOAD="http://www.truecrypt.org/downloads2"
-MD5SUM="da60dcc842b88ae7c8eb2171b1701abc"
+MD5SUM="0a61616bc5c5ad90e876b4014c004ac9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Pierre Cazenave"
diff --git a/system/truecrypt/truecrypt_dismount_failure.diff b/system/truecrypt/truecrypt_dismount_failure.diff
deleted file mode 100644
index 6bd21c15ca..0000000000
--- a/system/truecrypt/truecrypt_dismount_failure.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- truecrypt-6.3-source/Core/Unix/Linux/CoreLinux.cpp 2009-10-21 15:11:02.000000000 +0200
-+++ truecrypt-6.3-source.src/Core/Unix/Linux/CoreLinux.cpp 2009-10-26 14:26:24.741564814 +0100
-@@ -90,13 +90,23 @@
- void CoreLinux::DetachLoopDevice (const DevicePath &devicePath) const
- {
- list <string> args;
-+ list <string> args2;
- args.push_back ("-d");
- args.push_back (devicePath);
-+ /* args2 needed to umount loop device before detaching it
-+ by Enrico Lo Tauro (neongen)*/
-+ args2.push_back (devicePath);
-
- for (int t = 0; true; t++)
- {
- try
- {
-+ try
-+ {Process::Execute ("umount", args2);
-+ }
-+ catch (ExecutedProcessFailed&)
-+ {
-+ }
- Process::Execute ("losetup", args);
- break;
- }