From 8131d6610bbaf6492af570c80f080c0328347dd2140cbf662f20491e92dcb3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 5 Sep 2018 08:59:19 +0000
Subject: [PATCH] * Switch to -fstack-protector-strong

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=193
---
 zsh.changes | 1 +
 zsh.spec    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/zsh.changes b/zsh.changes
index 481f9d2..86a2a94 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -3,6 +3,7 @@ Tue Sep  4 15:51:31 UTC 2018 - Ismail Dönmez <idonmez@suse.com>
 
 - Update to version 5.6
   * Fixes CVE-2018-0502 and CVE-2018-13259
+  * Switch to -fstack-protector-strong
   * See included NEWS file for complete changes.
 
 -------------------------------------------------------------------
diff --git a/zsh.spec b/zsh.spec
index c53a857..6503001 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -100,6 +100,10 @@ This package contains the Zsh manual in HTML format.
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl
 
+# Fix for missing help
+# http://www.zsh.org/mla/workers/2018/msg01180.html
+rm Doc/help.txt
+
 # Fix bindir path in some files
 perl -p -i -e 's|%{_prefix}/local/bin|%{_bindir}|' \
     Doc/intro.ms Misc/globtests.ksh Misc/globtests \
@@ -111,7 +115,7 @@ perl -p -i -e 's|%{_prefix}/local/bin|%{_bindir}|' \
 %configure \
 %if 0%{?suse_version}
     --with-term-lib="ncursesw" \
-    --enable-cflags="%{optflags} -fPIE -fstack-protector %(ncursesw6-config --cflags)" \
+    --enable-cflags="%{optflags} -fPIE -fstack-protector-strong %(ncursesw6-config --cflags)" \
     --enable-ldflags="%(ncursesw6-config --libs) -pie -Wl,-z,relro" \
 %endif
     --enable-fndir=%{_datadir}/%{name}/${version}/functions \