Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index 989b2d6ba75bac1e9384f275a9bc186f2fdc23d5..3c354e2972d44c309072e0f339f06c2174d3f13d 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -3296,8 +3296,8 @@ CONFIG_UIO_PDRV_GENIRQ=m
 #
 CONFIG_STAGING=y
 # CONFIG_USBIP_CORE is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_COMEDI is not set
 # CONFIG_RTLLIB is not set
@@ -3965,7 +3965,7 @@ CONFIG_CRYPTO_AUTHENC=m
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_SEQIV=m
 
 #

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index f596a4435a8a21717079eb4af5f91e0842467fa5..cfc3a6ab5df2fa49a6020bc667971c99ff65e5ce 100644 (file)
--- 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/rootfiles/core/101/filelists/armv5tel/linux-rpi b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi
new file mode 120000 (symlink)
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/100/exclude b/config/rootfiles/oldcore/100/exclude
index 8e446ce6ca2ee7a1220295d521201dfe0449570a..7ddeae0ba387ee9ad5e6f4f83836b3319d314148 100644 (file)
--- a/config/rootfiles/oldcore/100/exclude
+++ b/config/rootfiles/oldcore/100/exclude
@@ -1,4 +1,6 @@
 boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
 etc/alternatives
 etc/collectd.custom
 etc/default/grub

diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh
index bd29855b5901da0ec07c2ed0180dae420cff101a..00abb89c201fbd99987c926e807f2715d65b50b8 100644 (file)
--- 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

diff --git a/lfs/linux b/lfs/linux
index be2e105b9738593b9fdc244c919cb75beff05229..8e1536c5da3fc6d32133193cfa3247b00550efd1 100644 (file)
--- 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)