This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via e63ec62158eedb421dfa8ed67908e9ccd7666015 (commit) via a97b100339b934a2baa687f6d800aed677aa1211 (commit) from cba4ea7b3e10ef8b96bb386389d947aa3e7763bd (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e63ec62158eedb421dfa8ed67908e9ccd7666015 Merge: a97b100 cba4ea7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 31 14:20:26 2014 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit a97b100339b934a2baa687f6d800aed677aa1211 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 31 14:18:27 2014 +0100
grub: Fix build with -fstack-protector-strong
-----------------------------------------------------------------------
Summary of changes: grub/grub.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Difference in files: diff --git a/grub/grub.nm b/grub/grub.nm index b109a2a..cd39743 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@
name = grub version = 2.00 -release = 5 +release = 5.1 sup_arches = x86_64 i686
groups = System/Boot @@ -60,6 +60,7 @@ build --disable-werror \ CFLAGS="$(echo %{CFLAGS} | sed \ -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' \ + -e 's/-fstack-protector-strong//g' \ -e 's/-fstack-protector-all//g' \ -e 's/-fstack-protector//g' \ -e 's/-fPIC//g' \
hooks/post-receive -- IPFire 3.x development tree