[arch-commits] Commit in truecrypt/trunk (PKGBUILD truecrypt-arch-detection.patch)

[Paul Mattal]

    Date: Tuesday, July 5, 2011 @ 22:01:03
  Author: paul
Revision: 130364

upgpkg: truecrypt 7.0a-3
resolved FS#20412 64-bit detection of HW acceleration

Added:
  truecrypt/trunk/truecrypt-arch-detection.patch
Modified:
  truecrypt/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   15 +++++++++++----
 truecrypt-arch-detection.patch |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-05 18:29:14 UTC (rev 130363)
+++ PKGBUILD	2011-07-06 02:01:03 UTC (rev 130364)
@@ -3,26 +3,32 @@
 
 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 @@
 }
 md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
          'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01')
+         '183b9bf04a943454d4e216130bcbac01'
+         '00ea70fa8437de877b31b027ac2b4060')

Added: truecrypt-arch-detection.patch
===================================================================
--- truecrypt-arch-detection.patch	                        (rev 0)
+++ truecrypt-arch-detection.patch	2011-07-06 02:01:03 UTC (rev 130364)
@@ -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