From 9216e0d466fda62b8cfb68b8db980311c27e97a0de1c6adbf0b4702fce1f796f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 18 Sep 2018 09:49:02 +0000 Subject: [PATCH 1/2] - OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=201 --- zsh.changes | 2 +- zsh.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh.changes b/zsh.changes index 6e0e056..4da2f42 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Sep 16 20:13:34 UTC 2018 - Karol Babioch -- Updateo to version 5.6.2 +- Update to version 5.6.2 * Fix another SIGTTOU case. * Fix SIGWINCH being ignored when zsh is not in the foreground. diff --git a/zsh.spec b/zsh.spec index 97e533a..7312c6b 100644 --- a/zsh.spec +++ b/zsh.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # From 32d5305ae71d32db6cf2970fea786749e3ab24399e5dc33fb6112b2e0c8ddc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 21 Sep 2018 09:29:49 +0000 Subject: [PATCH 2/2] - Unbreak Leap 42.3 compilation OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=202 --- zsh.changes | 5 +++++ zsh.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/zsh.changes b/zsh.changes index 4da2f42..ea946b8 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 21 09:29:03 UTC 2018 - Ismail Dönmez + +- Unbreak Leap 42.3 compilation + ------------------------------------------------------------------- Sun Sep 16 20:13:34 UTC 2018 - Karol Babioch diff --git a/zsh.spec b/zsh.spec index 7312c6b..86b5b98 100644 --- a/zsh.spec +++ b/zsh.spec @@ -108,10 +108,15 @@ perl -p -i -e 's|%{_prefix}/local/bin|%{_bindir}|' \ %build +%define _stack_protector "-fstack-protector-strong" +%if 0%{?suse_version} <= 1315 +%define _stack_protector "-fstack-protector" +%endif + %configure \ %if 0%{?suse_version} --with-term-lib="ncursesw" \ - --enable-cflags="%{optflags} -fPIE -fstack-protector-strong %(ncursesw6-config --cflags)" \ + --enable-cflags="%{optflags} -fPIE %{_stack_protector} %(ncursesw6-config --cflags)" \ --enable-ldflags="%(ncursesw6-config --libs) -pie -Wl,-z,relro" \ %endif --enable-fndir=%{_datadir}/%{name}/${version}/functions \