Merge remote-tracking branch 'arne_f/kernel-test'

lfs/clamav

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.98.1
+VER        = 0.98.3
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 24
+PAK_VER    = 25
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8
+$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17
 
 install : $(TARGET)
 
@@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Disable PaX mprotect for clamd and freshclam
 	paxctl -cm /usr/sbin/clamd
+	paxctl -cm /usr/bin/clamscan
 	paxctl -cm /usr/bin/freshclam
 
 	@rm -rf $(DIR_APP)

lfs/linux

@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.39
+VER        = 3.10.40
 
 RPI_PATCHES = linux-3.10.38-grsec-1b49b45
-GRS_PATCHES = grsecurity-2.9.1-3.10.39-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.40-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    = 44
+PAK_VER    = 45
 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				= 74db7cc558a1a72ebf5044d286e2bc47
+$(DL_FILE)_MD5				= c1dca08f0f1a60f29b7caa9ff45582a8
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= a7408e8bad57b4b2cb677dd5a0bfb7ff
-$(GRS_PATCHES)_MD5			= 6296b7ec4146544249075249e338ceb3
+$(GRS_PATCHES)_MD5			= f46506dd67e459fc41d60d0641323668
 
 install : $(TARGET)