[arch-commits] Commit in vulkan-loader-layers/trunk (2 files)

[Laurent Carlier]

    Date: Friday, July 21, 2017 @ 10:50:07
  Author: lcarlier
Revision: 300882

upgpkg: vulkan-loader-layers 1.0.54.0-2

fix executable stack in libvulkan.so

Added:
  vulkan-loader-layers/trunk/0001-loader-Remove-executable-stack-from-libvulkan.so.patch
Modified:
  vulkan-loader-layers/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-loader-Remove-executable-stack-from-libvulkan.so.patch |   28 ++++++++++
 PKGBUILD                                                    |   15 ++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

Added: 0001-loader-Remove-executable-stack-from-libvulkan.so.patch
===================================================================
--- 0001-loader-Remove-executable-stack-from-libvulkan.so.patch	                        (rev 0)
+++ 0001-loader-Remove-executable-stack-from-libvulkan.so.patch	2017-07-21 10:50:07 UTC (rev 300882)
@@ -0,0 +1,28 @@
+From 3152f2a5056077d3e1061ac61e3ef7888ff96dc7 Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny at lunarg.com>
+Date: Thu, 20 Jul 2017 16:07:14 -0600
+Subject: [PATCH] loader: Remove executable stack from libvulkan.so
+
+Change-Id: Id77d5560479cbbc6f5453a6362c5a20dd721fdd0
+---
+ loader/unknown_ext_chain_gas.asm | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm
+index e463f45b..798760bd 100644
+--- a/loader/unknown_ext_chain_gas.asm
++++ b/loader/unknown_ext_chain_gas.asm
+@@ -108,6 +108,10 @@ vkdev_ext\num:
+ 
+ .endif
+ 
++#if defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+ .data
+ 
+ termin_error_string:
+-- 
+2.13.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-21 09:52:48 UTC (rev 300881)
+++ PKGBUILD	2017-07-21 10:50:07 UTC (rev 300882)
@@ -5,15 +5,24 @@
 pkgname=(vulkan-icd-loader vulkan-validation-layers)
 _pkgname=Vulkan-LoaderAndValidationLayers
 pkgver=1.0.54.0
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="https://www.khronos.org/vulkan/"
 license=('custom')
 depends=()
 makedepends=(git cmake python-lxml libx11 libxrandr wayland)
-source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz")
-sha256sums=('f2556963f27309485c4d6bd9acece58d51df6a1b13699cc3a2c8d2579e6a3831')
+source=("https://github.com/KhronosGroup/${_pkgname}/archive/sdk-${pkgver}.tar.gz"
+        0001-loader-Remove-executable-stack-from-libvulkan.so.patch)
+sha256sums=('f2556963f27309485c4d6bd9acece58d51df6a1b13699cc3a2c8d2579e6a3831'
+            '01c1e96916a9fc0ef6f62703cd968c14031ad75f64f61409f108bc9e427977a1')
 
+prepare() {
+  cd "${srcdir}/${_pkgname}-sdk-${pkgver}"
+
+  # https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1956
+  patch -Np1 -i ../0001-loader-Remove-executable-stack-from-libvulkan.so.patch
+}
+
 build() {
   cd "${srcdir}/${_pkgname}-sdk-${pkgver}"