summaryrefslogtreecommitdiff
path: root/extra/truecrypt
diff options
context:
space:
mode:
Diffstat (limited to 'extra/truecrypt')
-rw-r--r--extra/truecrypt/PKGBUILD17
-rw-r--r--extra/truecrypt/truecrypt-arch-detection.patch15
2 files changed, 27 insertions, 5 deletions
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index 4c7d585ed..ac08317d4 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 105442 2011-01-08 22:25:31Z paul $
+# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $
# Maintainer: Paul Mattal <paul.archlinux.org>
pkgname=truecrypt
pkgver=7.0a
-pkgrel=2
+pkgrel=3
pkgdesc="Free open-source cross-platform disk encryption software"
url="http://www.truecrypt.org/"
arch=('i686' 'x86_64')
license=('custom') # TrueCrypt License v2.6
depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
+makedepends=('nasm')
optdepends=('sudo: mounting encrypted volumes as nonroot users')
conflicts=('truecrypt-utils')
replaces=('truecrypt-utils')
-options=('force')
# N.B. Truecrypt's web-based source download is incompatible with
# makepkg. Source has been placed on ftp.archlinux.org instead
source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \
'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
- "${pkgname}.desktop")
+ "${pkgname}.desktop" \
+ "${pkgname}-arch-detection.patch")
build() {
export PKCS11_INC="${srcdir}/pkcs-2.20"
cd ${srcdir}/${pkgname}-${pkgver}-source || return 1
+
+ # Work around buggy CPU type detection
+ patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1
+
+ # Build
make || return 1
# Install Binary
@@ -37,4 +43,5 @@ build() {
}
md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
'ce6a707b79411e82e8e558aa03e764b0'
- '183b9bf04a943454d4e216130bcbac01')
+ '183b9bf04a943454d4e216130bcbac01'
+ '00ea70fa8437de877b31b027ac2b4060')
diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch
new file mode 100644
index 000000000..bc16a2a36
--- /dev/null
+++ b/extra/truecrypt/truecrypt-arch-detection.patch
@@ -0,0 +1,15 @@
+diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile
+--- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400
++++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400
+@@ -120,10 +120,7 @@
+
+ export CPU_ARCH ?= unknown
+
+-ARCH = $(shell uname -p)
+-ifeq "$(ARCH)" "unknown"
+- ARCH = $(shell uname -m)
+-endif
++ARCH = $(shell uname -m)
+
+ ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
+ CPU_ARCH = x86