Revert to packaging pre-built binary by idrix (already extracted & signed)

3 files changed, 58 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5a5000156cb..8e0b41506ec7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,31 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 11:49:51 UTC 2016
+# Mon Feb 15 13:31:01 UTC 2016
 pkgbase = veracrypt
 	pkgdesc = Disk encryption with strong security based on TrueCrypt
 	pkgver = 1.17
-	pkgrel = 1
+	pkgrel = 2
 	url = http://veracrypt.codeplex.com/
 	install = veracrypt.install
 	arch = i686
 	arch = x86_64
-	arch = armv6h
-	arch = armv7h
 	license = custom
 	makedepends = nasm
 	depends = fuse
 	depends = wxgtk>=3.0
-	source = veracrypt_1.17_Source.tar.bz2::http://sourceforge.net/projects/veracrypt/files/VeraCrypt 1.17/veracrypt_1.17_Source.tar.bz2/download
-	source = veracrypt_1.17_Source.tar.bz2.sig::http://sourceforge.net/projects/veracrypt/files/VeraCrypt 1.17/veracrypt_1.17_Source.tar.bz2.sig/download
 	source = no_makeself.patch
 	source = veracrypt.desktop
 	source = veracrypt.install
-	sha1sums = cd27cf9b6853aac104a33fac0f1d8733765042ba
-	sha1sums = cbe620297486c32d1f6a1693f6f2136097644287
 	sha1sums = 0cbe9f7875ab52be125cc575533f76fab60314a5
 	sha1sums = ebdd450e719fe3cff5e459f027856cbaf03db13a
 	sha1sums = 14dceabf658a7e3505c855c2862aa86e343fcda5
+	source_i686 = https://archlinux.0ptr.de/mirrors/veracrypt/1.17/veracrypt_1.17_i386.tar.gz
+	source_i686 = https://archlinux.0ptr.de/mirrors/veracrypt/1.17/veracrypt_1.17_i386.tar.gz.sig
+	sha1sums_i686 = 479fad1cfe53fef9155dd7ef9c28dd2ecb5d9be4
+	sha1sums_i686 = SKIP
+	source_x86_64 = https://archlinux.0ptr.de/mirrors/veracrypt/1.17/veracrypt_1.17_amd64.tar.gz
+	source_x86_64 = https://archlinux.0ptr.de/mirrors/veracrypt/1.17/veracrypt_1.17_amd64.tar.gz.sig
+	sha1sums_x86_64 = b8aa201c42b4dda3233722066bd17fcac600d301
+	sha1sums_x86_64 = SKIP
 
 pkgname = veracrypt
 
diff --git a/PKGBUILD b/PKGBUILD
index 225093bad0f5..bf5b967f2a56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,45 +5,58 @@ pkgname=veracrypt
 _pkgname=VeraCrypt
 pkgver=1.17
 _pkgver=${pkgver//_/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk encryption with strong security based on TrueCrypt"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+arch=('i686' 'x86_64') #'armv6h' 'armv7h')
 url="http://veracrypt.codeplex.com/"
 license=('custom')
 depends=('fuse' 'wxgtk>=3.0')
 makedepends=('nasm')
 install='veracrypt.install'
-source=("${pkgname}_${pkgver}_Source.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2/download"
-	"${pkgname}_${pkgver}_Source.tar.bz2.sig::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2.sig/download"
-	"no_makeself.patch"
+
+source_x86_64=(	"https://archlinux.0ptr.de/mirrors/veracrypt/${pkgver}/${pkgname}_${pkgver}_amd64.tar.gz"
+		"https://archlinux.0ptr.de/mirrors/veracrypt/${pkgver}/${pkgname}_${pkgver}_amd64.tar.gz.sig")
+source_i686=(	"https://archlinux.0ptr.de/mirrors/veracrypt/${pkgver}/${pkgname}_${pkgver}_i386.tar.gz"
+		"https://archlinux.0ptr.de/mirrors/veracrypt/${pkgver}/${pkgname}_${pkgver}_i386.tar.gz.sig")
+#source=("${pkgname}_${pkgver}_Source.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2/download"
+	#"${pkgname}_${pkgver}_Source.tar.bz2.sig::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2.sig/download"
+source=("no_makeself.patch"
         "veracrypt.desktop"
         "veracrypt.install")
-sha1sums=('cd27cf9b6853aac104a33fac0f1d8733765042ba'
-          'cbe620297486c32d1f6a1693f6f2136097644287'
-          '0cbe9f7875ab52be125cc575533f76fab60314a5'
+sha1sums=('0cbe9f7875ab52be125cc575533f76fab60314a5'
           'ebdd450e719fe3cff5e459f027856cbaf03db13a'
           '14dceabf658a7e3505c855c2862aa86e343fcda5')
-validpgpkeys=('993B7D7E8E413809828F0F29EB559C7C54DDD393')
+sha1sums_i686=('479fad1cfe53fef9155dd7ef9c28dd2ecb5d9be4'
+               'SKIP')
+sha1sums_x86_64=('b8aa201c42b4dda3233722066bd17fcac600d301'
+                 'SKIP')
+validpgpkeys=('8B15186570664AF6494C3920B4767A17CEC5B4E9')
+		#'993B7D7E8E413809828F0F29EB559C7C54DDD393')
 
-prepare() {
-  cd ${srcdir}/src
+#prepare() {
+#  cd ${srcdir}/src
 
-  msg2 "Applying patches..."
-  patch -Np1 -i ../no_makeself.patch  # disable sfx archive
-}
+#  msg2 "Applying patches..."
+#  patch -Np1 -i ../no_makeself.patch  # disable sfx archive
+#}
 
-build() {
-  cd ${srcdir}/src
+#build() {
+#  cd ${srcdir}/src
 
-  msg2 "Building veracrypt..."
-  export WX_CONFIG=/usr/bin/wx-config
-  make LFLAGS+="-ldl"
-}
+#  msg2 "Building veracrypt..."
+#  export WX_CONFIG=/usr/bin/wx-config
+#  make LFLAGS+="-ldl"
+#}
 
 package() {
-  cd ${srcdir}/src
-  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 Resources/Icons/VeraCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/veracrypt.xpm"
-  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
+#  cd ${srcdir}/src
+  cd "${srcdir}"
+  install -D -m755 "${srcdir}/usr/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -D -m644 "${srcdir}/usr/share/veracrypt/doc/License.txt" "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
+  install -D -m644 "${srcdir}/usr/share/pixmaps/veracrypt.xpm" "${pkgdir}/usr/share/pixmaps/veracrypt.xpm"
+  install -D -m644 "${srcdir}/usr/share/applications/veracrypt.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+#  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
+#  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+#  install -D -m644 Resources/Icons/VeraCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/veracrypt.xpm"
+#  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
diff --git a/no_glibcxx_use_cxx11_abi.patch b/no_glibcxx_use_cxx11_abi.patch
new file mode 100644
index 000000000000..1a4c6a9935e9
--- /dev/null
+++ b/no_glibcxx_use_cxx11_abi.patch
@@ -0,0 +1,10 @@
+--- old/Makefile	2015-12-09 22:38:14.011044205 +0100
++++ src/Makefile	2015-12-09 22:38:48.384227463 +0100
+@@ -41,7 +41,7 @@
+ 
+ export CFLAGS := -Wall
+ export CXXFLAGS := -Wall -Wno-unused-parameter
+-C_CXX_FLAGS := -MMD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
++C_CXX_FLAGS := -MMD -D_GLIBCXX_USE_CXX11_ABI=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
+ export ASFLAGS := -Ox -D __GNUC__
+ export LFLAGS :=