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 2.x development tree".

The branch, core100 has been updated via 4bee1eb491e8193fa75be2dd6b450aacf3772368 (commit) via 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b (commit) from a2c6ae9e1576a5f9720f300a485a850390168bf9 (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 4bee1eb491e8193fa75be2dd6b450aacf3772368 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 17 22:25:16 2016 +0200

kernel: change stackprotector from strong to regular.

Xen/Paravirt crash with stackprotect in strong mode.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 17 22:23:11 2016 +0200

xen-image-maker: fix typos and missing doublequote.

-----------------------------------------------------------------------

Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/xen-image/xen-image-maker.sh | 6 +++--- lfs/linux | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)

Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f596a44..cfc3a6a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 07414f7..00abb89 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 Arne Fitzenreiter arne_f@ipfire.org # +# Copyright (C) 2007-2016 Arne Fitzenreiter arne_f@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar mkfs.$FSTYPE -F $IMGvar

echo -------------------------------------------------------- -echo - Intall IPFire to the Images ... +echo - Install IPFire to the images ... echo --------------------------------------------------------

# Mount Images @@ -130,7 +130,7 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " root (hd0) >> $MNThdd/boot/grub/grub.conf +echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf diff --git a/lfs/linux b/lfs/linux index be2e105..8e1536c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =

-PAK_VER = 67 +PAK_VER = 68 DEPS = ""

KERNEL_ARCH = $(MACHINE)

hooks/post-receive -- IPFire 2.x development tree