From 822b4313d1029bcfa19ec6cc2f36da128001ab24 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 Mar 2016 17:09:32 +0100 Subject: [PATCH] kernel: update to 3.14.63 Signed-off-by: Arne Fitzenreiter --- lfs/linux | 16 ++++++++-------- src/patches/arm-multi-grsec-compile-fixes.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lfs/linux b/lfs/linux index 262e591772..b0c26358e5 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 530d69e2a1..fb0d39b802 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; -- 2.39.5