[arch-commits] Commit in veracrypt/trunk (PKGBUILD no-exec-stack.patch)

[Levente Polyak]

    Date: Tuesday, August 23, 2016 @ 22:06:36
  Author: anthraxx
Revision: 187430

upgpkg: veracrypt 1.18-1

Modified:
  veracrypt/trunk/PKGBUILD
  veracrypt/trunk/no-exec-stack.patch

---------------------+
 PKGBUILD            |   33 +++++++++++++--------------------
 no-exec-stack.patch |   22 +++++++++++-----------
 2 files changed, 24 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-23 20:47:38 UTC (rev 187429)
+++ PKGBUILD	2016-08-23 22:06:36 UTC (rev 187430)
@@ -4,30 +4,25 @@
 
 pkgname=veracrypt
 _pkgname=VeraCrypt
-pkgver=1.17
-pkgrel=5
+pkgver=1.18
+pkgrel=1
 pkgdesc='Disk encryption with strong security based on TrueCrypt'
 url='http://veracrypt.codeplex.com/'
 arch=('i686' 'x86_64')
 license=('custom:TrueCrypt')
 depends=('fuse>=2.8.0' 'wxgtk>=3.0' 'libsm' 'device-mapper')
-optdepends=('sudo: mounting encrypted volumes as nonroot users')
-makedepends=('nasm')
-source=("${pkgname}_${pkgver}_Source.tar.bz2::https://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2/download"
-        "${pkgname}_${pkgver}_Source.tar.bz2.sig::https://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2.sig/download"
+optdepends=('sudo: mounting encrypted volumes as nonroot users'
+            'desktop-file-utils: update desktop database')
+makedepends=('nasm' 'pkg-config')
+source=("${pkgname}_${pkgver}_Source.tar.bz2::https://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${_pkgname}_${pkgver}_Source.tar.bz2/download"
+        "${pkgname}_${pkgver}_Source.tar.bz2.sig::https://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${_pkgname}_${pkgver}_Source.tar.bz2.sig/download"
         no-makeself.patch
-        truecrypt-arch-detection.patch
-        gcc6.patch
-        fix-invalid-characters.patch
         no-exec-stack.patch
         veracrypt.desktop)
-sha512sums=('a26c28513030b43390942f5363c3e501ef36ac8277a9f10cf8339a0ba487fea4d0db853c96f7f2540b0b2ff417e182525b1ad193f4ef6e5078224bc466236ee9'
-            '82e09ff9132b20dff75d509be3da43a9aa1b23d14e52f35d248d1e578360f6bb191a328332cd503c324a01fe739ef301b4c532dc7398861d2b094c6a7fc76825'
+sha512sums=('cf2140253179c8d130b890a00d4ef448695b726abcad5099bce84b1721eec833c84dc72995d54f48317f5ecd8e517e75462c809b65606f15be988d4d41a2234e'
+            'cacccc246c8725d47a880266c0cdb7ada26bf50a159bc78581b32c1ac181787a195a93fdb8e61e975028cebf8be27e535ab3ca28fa9c03c1cf5bf91f762d9ff9'
             'e3972fd239fd83807c5ea9dd9268a0e962b0bd9cb9cf8f6251ac51a44a94f3c57f0b1e6857b42e4296cff531030c8278c543b386ebf463d4e19fe9a536acbcf9'
-            'fac6963c65720f0b13486ff22bdcc2e31e78c39ede2b9561b2c4037ef2c0375f04c4d51dc6067c37aaeb664c3ed70e5747488389737c41807680750c26a8f084'
-            '84175a3677f20b2b03ab29b017b9deecb517a58a640cf667b503cc9375c104b9c0a5d5ea4b3537ba7f12530054a456b466df0afdd935714cd43034b8e6cb2b7c'
-            'd52826572178a471bb608fd4991766f4f9fa7c5cbf3659922372feb9fdfcbab596d5f1360e30f66613681619672d0be6c5457f5617f5fb1f84061de779831f96'
-            'c64f9255303a521b4e531ebea574befe80a9f193c9aa42fd9cb552e56d087815ca161b50b593e7c3ede10a65c67dc36d0447dbffb0f4d4614f181a95759c2f79'
+            '94f1b0bd00a84a8294c8efa72058dba71acbe5c846c9761874faa36ba9c3f1ac3d8a7d3b7452c62e2baf770efa4eecf2d989fc6d2181b3b3e11808e5cd6eb726'
             'f689ca64bac7042030de7714aed8cc89f2c5f87b407444b1b121491c1d89c147babaaa454ddc2a93b70ae20d4da59f96ad64f01b04bea9017d658c377faeb75d')
 validpgpkeys=('993B7D7E8E413809828F0F29EB559C7C54DDD393') # VeraCrypt Team <veracrypt at idrix.fr>
 
@@ -34,16 +29,14 @@
 prepare() {
   cd src
   patch -p1 < "${srcdir}/no-makeself.patch"
-  patch -p1 < "${srcdir}/truecrypt-arch-detection.patch"
-  patch -p0 < "${srcdir}/gcc6.patch"
-  patch -p2 < "${srcdir}/fix-invalid-characters.patch"
   patch -p0 < "${srcdir}/no-exec-stack.patch"
 }
 
 build() {
   cd src
-  export WX_CONFIG=/usr/bin/wx-config
-  make TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \
+  make PKG_CONFIG_PATH=/usr/lib/pkgconfig \
+    WX_CONFIG=/usr/bin/wx-config \
+    TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \
     TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
     TC_EXTRA_CFLAGS="${CFLAGS}"
 }

Modified: no-exec-stack.patch
===================================================================
--- no-exec-stack.patch	2016-08-23 20:47:38 UTC (rev 187429)
+++ no-exec-stack.patch	2016-08-23 22:06:36 UTC (rev 187430)
@@ -1,9 +1,9 @@
 --- Crypto/Aes_hw_cpu.asm.old	2011-06-01 17:12:53.078000001 -0400
 +++ Crypto/Aes_hw_cpu.asm	2011-06-01 17:12:53.080000002 -0400
 @@ -328,3 +328,12 @@
- 
- 
- %endif	; __BITS__ != 16
+ 
+ 
+ %endif	; __BITS__ != 16
 +	%ifidn __OUTPUT_FORMAT__,elf
 +	section .note.GNU-stack noalloc noexec nowrite progbits
 +	%endif
@@ -17,8 +17,8 @@
 +++ Crypto/AesSmall_x86.asm	2011-06-01 17:12:53.086000002 -0400
 @@ -1442,3 +1442,12 @@
      db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)
- 
- %endif
+ 
+ %endif
 +	%ifidn __OUTPUT_FORMAT__,elf
 +	section .note.GNU-stack noalloc noexec nowrite progbits
 +	%endif
@@ -31,9 +31,9 @@
 --- Crypto/Aes_x64.asm.old	2011-06-01 17:12:53.090000002 -0400
 +++ Crypto/Aes_x64.asm	2011-06-01 17:12:53.092000002 -0400
 @@ -905,3 +905,12 @@
- %endif
- 
- %endif
+ %endif
+ 
+ %endif
 +	%ifidn __OUTPUT_FORMAT__,elf
 +	section .note.GNU-stack noalloc noexec nowrite progbits
 +	%endif
@@ -46,9 +46,9 @@
 --- Crypto/Aes_x86.asm.old	2011-06-01 17:12:53.096000002 -0400
 +++ Crypto/Aes_x86.asm	2011-06-01 17:12:53.097000002 -0400
 @@ -644,3 +644,12 @@
-     do_exit
- 
- %endif
+     do_exit
+ 
+ %endif
 +	%ifidn __OUTPUT_FORMAT__,elf
 +	section .note.GNU-stack noalloc noexec nowrite progbits
 +	%endif