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

diff --git a/lfs/linux b/lfs/linux
index bf04240894d48c662e5eca57753d977de453ace4..8f78d13208749cb3a11b9765cf7fae62562d9177 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.37
+VER        = 3.10.38
 
 RPI_PATCHES = linux-3.10.34-grsec-dea8280
-GRS_PATCHES = grsecurity-2.9.1-3.10.37-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.38-ipfire1.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 42
+PAK_VER    = 43
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 $(GRS_PATCHES)                         = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                         = a08a10ffc31b07d9422af1cd2baa3274
+$(DL_FILE)_MD5                         = cef991f05d2d1a15f08ca88ac31ee83e
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 522683db031f7033b1b5dfe1b1f30e67
-$(GRS_PATCHES)_MD5                     = 7b0f44571974217d79dbcdf5d7e33976
+$(GRS_PATCHES)_MD5                     = a50ac65d64c72badd21695c2294f8548
 
 install : $(TARGET)
 

diff --git a/lfs/mc b/lfs/mc
index 18613498a7630fac1173607502e1332a740e9344..ed799be0640cef1473d0036451d7fabaa8f3297e 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.8.9
+VER        = 4.8.12
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f8a05f9a9708241541ae177c8e2f209
+$(DL_FILE)_MD5 = 7ecccc03df060cd0ca1414a5a14e6649
 
 install : $(TARGET)