From 8cf949316ef9b63e55d8c8b95293ee9e6978696b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 16 Jun 2011 10:10:31 +0100 Subject: [PATCH] Fix compiling on ARM due to lack of relro and now support in gcc 4.5 for ARM --- openssh.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openssh.spec b/openssh.spec index 901dc4b..cc99f69 100644 --- a/openssh.spec +++ b/openssh.spec @@ -70,7 +70,7 @@ %endif # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 -%define openssh_rel 24 +%define openssh_rel 25 %define openssh_ver 5.5p1 %define pam_ssh_agent_rel 26 %define pam_ssh_agent_ver 0.9.2 @@ -330,8 +330,14 @@ CFLAGS="$CFLAGS -fpic" %endif export CFLAGS SAVE_LDFLAGS="$LDFLAGS" +%ifarch %{arm} +# This is needed to compile ARM woth gcc 4.5 as ARM doesn't support relro and now. +# Looks to be resolved in 4.6 thanks to Linaro work +LDFLAGS="$LDFLAGS -pie -Wl,-z,relro"; export LDFLAGS +%else LDFLAGS="$LDFLAGS -pie -z relro -z now"; export LDFLAGS %endif +%endif %if %{kerberos5} if test -r /etc/profile.d/krb5-devel.sh ; then source /etc/profile.d/krb5-devel.sh @@ -592,6 +598,9 @@ fi %endif %changelog +* Thu Jun 16 2011 Peter Robinson - 5.5p1-25 + 0.9.2-26 +- Fix compiling on ARM due to lack of relro and now support in gcc 4.5 for ARM + * Wed Nov 24 2010 Jan F. Chadima - 5.5p1-24 + 0.9.2-26 - reapair clientloop crash (#627332)