Update to 1.17 and build from source again

2 files changed, 35 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 259d6d76fa7e..c5a5000156cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,29 @@
 # Generated by mksrcinfo v8
-# Sat Dec 19 19:59:54 UTC 2015
+# Mon Feb 15 11:49:51 UTC 2016
 pkgbase = veracrypt
 	pkgdesc = Disk encryption with strong security based on TrueCrypt
-	pkgver = 1.16
-	pkgrel = 6
+	pkgver = 1.17
+	pkgrel = 1
 	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://www.dropbox.com/s/n0tlmqwphztotta/veracrypt_1.16_i386.tar.gz?raw=1
-	source_i686 = https://www.dropbox.com/s/fq66bu1ah3k2jac/veracrypt_1.16_i386.tar.gz.sig?raw=1
-	sha1sums_i686 = 0b7e129c944b1a93624fe6e567c6ba14f5c4a2ff
-	sha1sums_i686 = a374df51191f7ef01b1e9714f1eab9e51997a76d
-	source_x86_64 = https://www.dropbox.com/s/2aq54twptvgfwdj/veracrypt_1.16_amd64.tar.gz?raw=1
-	source_x86_64 = https://www.dropbox.com/s/b5sx4sneqkfxkao/veracrypt_1.16_amd64.tar.gz.sig?raw=1
-	sha1sums_x86_64 = e16deb7d40b8569568c3eb861cb3460a70cdd9ea
-	sha1sums_x86_64 = 2b0bbef8e73a90d368dc975cb7791a95ae49c491
 
 pkgname = veracrypt
 
diff --git a/PKGBUILD b/PKGBUILD
index 48999889cb8a..225093bad0f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,60 +3,47 @@
 
 pkgname=veracrypt
 _pkgname=VeraCrypt
-pkgver=1.16
+pkgver=1.17
 _pkgver=${pkgver//_/-}
-pkgrel=6
+pkgrel=1
 pkgdesc="Disk encryption with strong security based on TrueCrypt"
-arch=('i686' 'x86_64') #'armv6h')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://veracrypt.codeplex.com/"
 license=('custom')
 depends=('fuse' 'wxgtk>=3.0')
 makedepends=('nasm')
 install='veracrypt.install'
-
-source_x86_64=("https://www.dropbox.com/s/2aq54twptvgfwdj/${pkgname}_${pkgver}_amd64.tar.gz?raw=1"
-	       "https://www.dropbox.com/s/b5sx4sneqkfxkao/${pkgname}_${pkgver}_amd64.tar.gz.sig?raw=1")
-source_i686=("https://www.dropbox.com/s/n0tlmqwphztotta/${pkgname}_${pkgver}_i386.tar.gz?raw=1"
-	     "https://www.dropbox.com/s/fq66bu1ah3k2jac/${pkgname}_${pkgver}_i386.tar.gz.sig?raw=1")
-#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"
+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"
         "veracrypt.desktop"
         "veracrypt.install")
-sha1sums=('0cbe9f7875ab52be125cc575533f76fab60314a5'
+sha1sums=('cd27cf9b6853aac104a33fac0f1d8733765042ba'
+          'cbe620297486c32d1f6a1693f6f2136097644287'
+          '0cbe9f7875ab52be125cc575533f76fab60314a5'
           'ebdd450e719fe3cff5e459f027856cbaf03db13a'
           '14dceabf658a7e3505c855c2862aa86e343fcda5')
-sha1sums_i686=('0b7e129c944b1a93624fe6e567c6ba14f5c4a2ff'
-               'a374df51191f7ef01b1e9714f1eab9e51997a76d')
-sha1sums_x86_64=('e16deb7d40b8569568c3eb861cb3460a70cdd9ea'
-                 '2b0bbef8e73a90d368dc975cb7791a95ae49c491')
-validpgpkeys=('0864B51BD36BBC39D548DDA7CB147F331607AC45')
-		#'993B7D7E8E413809828F0F29EB559C7C54DDD393')
+validpgpkeys=('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
-  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"
+  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"
 }