[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 822b4313d1029bcfa19ec6cc2f36da128001ab24

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 822b4313d1029bcfa19ec6cc2f36da128001ab24

[git]

[-- Attachment #1: Type: text/plain, Size: 4629 bytes --]

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, next has been updated
       via  822b4313d1029bcfa19ec6cc2f36da128001ab24 (commit)
       via  4f472f86f854a5460c4fa8eb63fd1a4393d6099d (commit)
      from  4a6cfe51a16575c7100862e2cc6f959bc48c6628 (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 822b4313d1029bcfa19ec6cc2f36da128001ab24
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 5 17:09:32 2016 +0100

    kernel: update to 3.14.63
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 4f472f86f854a5460c4fa8eb63fd1a4393d6099d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Mar 5 17:07:23 2016 +0100

    flash-images: copy kernel and initrd first
    
    there is a u-boot bug that not find all files if the directory entries
    was splittet to more sectors so copy the important files first.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 lfs/flash-images                                |  5 +++++
 lfs/linux                                       | 16 ++++++++--------
 src/patches/arm-multi-grsec-compile-fixes.patch | 12 ++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/lfs/flash-images b/lfs/flash-images
index 0d57a2a..d10fc9b 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -121,9 +121,14 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
 	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/
+	cp -v /boot/uInit-ipfire-multi $(MNThdd)/boot/
+	cp -v /boot/uImage-ipfire-kirkwood $(MNThdd)/boot/
+	cp -v /boot/uInit-ipfire-kirkwood $(MNThdd)/boot/
+	cp -v /boot/uEnv.txt $(MNThdd)/boot/
 	# work around a u-boot bug not find the folders sometimes
 	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi
 	mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood
+	
 	sync
 	umount $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
diff --git a/lfs/linux b/lfs/linux
index 262e591..b0c2635 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER         = 3.14.62
-RPI_PATCHES = 3.14.62-grsec-ipfire1
-A7M_PATCHES = 3.14.62-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1ipfire-3.14.62-v1.patch.xz
+VER         = 3.14.63
+RPI_PATCHES = 3.14.63-grsec-ipfire1
+A7M_PATCHES = 3.14.63-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1ipfire-3.14.63-v1.patch.xz
 
 
 THISAPP    = linux-$(VER)
@@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz		= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz	= $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)					= $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5					= 84dd675bb2024beb18ade2fe55e7b47d
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= 6f84442e9c00aab43e8118db199107c4
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 4ed04c218c0a84a6a1954d220ad601b6
-$(GRS_PATCHES)_MD5				= 9a77776b2740084dc80846e707bca0e3
+$(DL_FILE)_MD5					= 6cf8a6b23849f47f511e0e46cfdb6392
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5		= 0d1059c18f4810abbe9aafb6beab445b
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	= 589eb8703fa2ba2944b2f925b7f7ffb3
+$(GRS_PATCHES)_MD5				= e84b05c9083fa0eb6bb49facd4f841dc
 
 install : $(TARGET)
 
diff --git a/src/patches/arm-multi-grsec-compile-fixes.patch b/src/patches/arm-multi-grsec-compile-fixes.patch
index 530d69e..fb0d39b 100644
--- a/src/patches/arm-multi-grsec-compile-fixes.patch
+++ b/src/patches/arm-multi-grsec-compile-fixes.patch
@@ -9,3 +9,15 @@
  
  static struct clk_ops dpll1_ck_ops_34xx __initdata = {
  	.init		= &omap2_init_clk_clkdm,
+diff -Naur linux-3.14.63-org/net/ipv6/addrconf.c linux-3.14.63/net/ipv6/addrconf.c
+--- linux-3.14.63-org/net/ipv6/addrconf.c	2016-03-04 22:56:07.375481749 +0100
++++ linux-3.14.63/net/ipv6/addrconf.c	2016-03-04 23:08:34.285482105 +0100
+@@ -4818,7 +4818,7 @@
+ {
+ 	struct inet6_dev *idev = ctl->extra1;
+ 	int min_mtu = IPV6_MIN_MTU;
+-	struct ctl_table lctl;
++	ctl_table_no_const lctl;
+ 
+ 	lctl = *ctl;
+ 	lctl.extra1 = &min_mtu;


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