Attachment 13850 Details for Bug 13174 – patch for 4.7

[patch] patch for 4.7

aesni-build-fix.patch1.txt (text/plain), 3.16 KB, created by Andreas Schneider on 2017-12-07 12:23:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2017-12-07 12:23:40 UTC

Size: 3.16 KB

patch

obsolete

>From c738b363e9a9f6981d6dbfb564b5781519d8a3c8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 4 Dec 2017 10:49:19 +0100
>Subject: [PATCH 1/2] third_party: Link th aesni-intel library with -z
> noexecstack
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13174
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit 6015cfad6ebf46b9f311a069dd960ff5af5bdcd8)
>---
> third_party/aesni-intel/wscript | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript
>index eb92d6626fe..0ccd9eb1e5b 100644
>--- a/third_party/aesni-intel/wscript
>+++ b/third_party/aesni-intel/wscript
>@@ -12,6 +12,8 @@ def configure(conf):
>                 raise Utils.WafError('--aes-accel=intelaesni selected and non x86_64 CPU')
>         else:
>             raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects -Wp,-E,-lang-asm')
>+        if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
>+            raise Utils.WafError('--aes-accel=intelaesni selected and linker rejects -z noexecstack')
> 
> def build(bld):
>     if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
>@@ -20,4 +22,5 @@ def build(bld):
>     bld.SAMBA_LIBRARY('aesni-intel',
>         source='aesni-intel_asm.c',
>         cflags='-Wp,-E,-lang-asm',
>+        ldflags='-Wl,-z,noexecstack',
>         private_library=True)
>-- 
>2.15.1
>
>
>From 1285ed625bbce2bfb56969b5dae364312f12db71 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Mon, 4 Dec 2017 11:00:10 +0100
>Subject: [PATCH 2/2] third_party: Fix a typo in the option name
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13174
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit e7e68958025937f97554cd956ca482dfe507f803)
>---
> third_party/aesni-intel/wscript | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript
>index 0ccd9eb1e5b..f0723a52501 100644
>--- a/third_party/aesni-intel/wscript
>+++ b/third_party/aesni-intel/wscript
>@@ -9,11 +9,11 @@ def configure(conf):
>                 print("Compiling with Intel AES instructions")
>                 conf.DEFINE('HAVE_AESNI_INTEL', 1)
>             else:
>-                raise Utils.WafError('--aes-accel=intelaesni selected and non x86_64 CPU')
>+                raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU')
>         else:
>-            raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects -Wp,-E,-lang-asm')
>+            raise Utils.WafError('--accel-aes=intelaesni selected and compiler rejects -Wp,-E,-lang-asm')
>         if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
>-            raise Utils.WafError('--aes-accel=intelaesni selected and linker rejects -z noexecstack')
>+            raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
> 
> def build(bld):
>     if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
>-- 
>2.15.1
>

Flags:

ab: review+

Actions: View

Attachments on bug 13174: 13837 | 13838 | 13839 | 13850