[arch-commits] Commit in truecrypt/repos (4 files)

[Eric Belanger]

    Date: Tuesday, November 4, 2008 @ 00:10:12
  Author: eric
Revision: 18327

fixed svn conflict

Modified:
  truecrypt/repos/extra-x86_64/	(properties)
  truecrypt/repos/extra-x86_64/PKGBUILD
Deleted:
  truecrypt/repos/extra-x86_64/gcc-4.3.patch
  truecrypt/repos/extra-x86_64/truecrypt.install

-------------------+
 PKGBUILD          |   34 ++++++++++++++++++----------------
 gcc-4.3.patch     |   44 --------------------------------------------
 truecrypt.install |   15 ---------------
 3 files changed, 18 insertions(+), 75 deletions(-)


Property changes on: truecrypt/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /truecrypt/trunk:1-286
   + /truecrypt/trunk:1-18326

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-04 05:05:54 UTC (rev 18326)
+++ extra-x86_64/PKGBUILD	2008-11-04 05:10:12 UTC (rev 18327)
@@ -1,32 +1,34 @@
 # $Id$
-# Maintainer: Tom K <tom at archlinux.org>
+# Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=truecrypt
-pkgver=5.1a
+pkgver=6.1
 pkgrel=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 arch=('i686' 'x86_64')
-depends=('fuse' 'gtk2' 'libsm')
+depends=('fuse' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
 # N.B. Truecrypt's web-based source download is incompatible with
 # makepkg. Source has been placed on ftp.archlinux.org instead
-source=(http://ftp.archlinux.org/other/truecrypt/TrueCrypt-$pkgver-Source.tar.gz
-	http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.7.tar.bz2
-	gcc-4.3.patch)
+source=(ftp://ftp.archlinux.org/other/tc/$pkgname-$pkgver.tar.gz
+	ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz
+	http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.9.tar.bz2)
 url="http://www.truecrypt.org/"
 license=('custom')
 conflicts=('truecrypt-utils')
 replaces=('truecrypt-utils')
-install=truecrypt.install
-options=('force')
+install=
 
 build() {
-  cd $startdir/src/truecrypt-$pkgver-source
-  patch -Np1 -i ../gcc-4.3.patch || return 1
-  make WX_ROOT=$startdir/src/wxWidgets-2.8.7 wxbuild || return 1
+  export PKCS11_INC="$startdir/src/pkcs-2.20"
+
+  cd $startdir/src/truecrypt-$pkgver-source || return 1
+  make WX_ROOT=$startdir/src/wxWidgets-2.8.9 wxbuild || return 1
   make || return 1
-  install -Dm755 Main/truecrypt $startdir/pkg/usr/bin/truecrypt
-  install -Dm644 License.txt $startdir/pkg/usr/share/licenses/truecrypt/License.txt
+
+  install -Dm755 Main/truecrypt $startdir/pkg/usr/bin/truecrypt || return 1
+  install -Dm644 License.txt \
+  	$startdir/pkg/usr/share/licenses/truecrypt/License.txt || return 1
 }
-md5sums=('bf8363f2bb3a24c2fcea588b210b3a16'
-         'e3455083afdf6404a569a8bf0701cf13'
-         '3ac33867555479f6b935daa32ee7889b')
+md5sums=('6907f7492ed204d764552837947dd4d3'
+         'ce6a707b79411e82e8e558aa03e764b0'
+         'b0b2d0f6915a21ca6f33896ee8f50387')

Deleted: extra-x86_64/gcc-4.3.patch
===================================================================
--- extra-x86_64/gcc-4.3.patch	2008-11-04 05:05:54 UTC (rev 18326)
+++ extra-x86_64/gcc-4.3.patch	2008-11-04 05:10:12 UTC (rev 18327)
@@ -1,44 +0,0 @@
-diff -uNr ../truecrypt-5.1a-source-orig/Common/BootEncryption.cpp truecrypt-5.1a-source/Common/BootEncryption.cpp
---- ../truecrypt-5.1a-source-orig/Common/BootEncryption.cpp	2008-04-14 12:39:50.000000000 +0100
-+++ truecrypt-5.1a-source/Common/BootEncryption.cpp	2008-04-14 14:29:11.000000000 +0100
-@@ -6,6 +6,7 @@
- distribution packages.
- */
- 
-+#include <cstring>
- #include "Tcdefs.h"
- #include "Platform/Finally.h"
- #include "Platform/ForEach.h"
-diff -uNr ../truecrypt-5.1a-source-orig/Core/FatFormatter.cpp truecrypt-5.1a-source/Core/FatFormatter.cpp
---- ../truecrypt-5.1a-source-orig/Core/FatFormatter.cpp	2008-04-14 12:39:50.000000000 +0100
-+++ truecrypt-5.1a-source/Core/FatFormatter.cpp	2008-04-14 14:28:22.000000000 +0100
-@@ -9,6 +9,7 @@
-  file License.txt included in TrueCrypt binary and source code distribution
-  packages. */
- 
-+#include <cstring>
- #include <time.h>
- #include "Common/Tcdefs.h"
- #include "Platform/Platform.h"
-diff -uNr ../truecrypt-5.1a-source-orig/Platform/Memory.cpp truecrypt-5.1a-source/Platform/Memory.cpp
---- ../truecrypt-5.1a-source-orig/Platform/Memory.cpp	2008-04-14 12:39:50.000000000 +0100
-+++ truecrypt-5.1a-source/Platform/Memory.cpp	2008-04-14 14:27:26.000000000 +0100
-@@ -6,6 +6,7 @@
-  distribution packages.
- */
- 
-+#include <cstring>
- #include "Memory.h"
- #include "Exception.h"
- 
-diff -uNr ../truecrypt-5.1a-source-orig/Volume/EncryptionTest.cpp truecrypt-5.1a-source/Volume/EncryptionTest.cpp
---- ../truecrypt-5.1a-source-orig/Volume/EncryptionTest.cpp	2008-04-14 12:39:50.000000000 +0100
-+++ truecrypt-5.1a-source/Volume/EncryptionTest.cpp	2008-04-14 14:27:26.000000000 +0100
-@@ -6,6 +6,7 @@
-  distribution packages.
- */
- 
-+#include <cstring>
- #include "Cipher.h"
- #include "Common/Crc.h"
- #include "EncryptionAlgorithm.h"

Deleted: extra-x86_64/truecrypt.install
===================================================================
--- extra-x86_64/truecrypt.install	2008-11-04 05:05:54 UTC (rev 18326)
+++ extra-x86_64/truecrypt.install	2008-11-04 05:10:12 UTC (rev 18327)
@@ -1,15 +0,0 @@
-post_upgrade() {
-  cat << 'EOM'
-  
-  ==>
-  ==> PLEASE NOTE:
-  ==> TrueCrypt is now fuse-based, and no longer requires separate module
-  ==> and utils packages.
-  ==>
-
-EOM
-}
-      
-op=$1
-shift
-$op $*