Merge commit 'origin/core51'

This commit is contained in:
Arne Fitzenreiter
2011-08-09 05:44:34 +02:00
8 changed files with 62 additions and 155 deletions

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 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 #
@@ -34,7 +34,7 @@ else
endif
endif
VER = 8.0.19
VER = 8.0.30
THISAPP = e1000-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce
$(DL_FILE)_MD5 = d85a64fdde2987b27ac6fbab5be605a0
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 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 #
@@ -34,7 +34,7 @@ else
endif
endif
VER = 1.1.19
VER = 1.3.10a
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 94e86507f139226c1add173dafdbbd52
$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 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 #
@@ -34,7 +34,7 @@ else
endif
endif
VER = 2.3.4
VER = 3.0.19
THISAPP = igb-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b0ea2a70198746b69392ef935b61454a
$(DL_FILE)_MD5 = 8fdc04600bea4a4188672a1a8d0eb73b
install : $(TARGET)

View File

@@ -34,7 +34,7 @@ else
endif
endif
VER = 2.6.34.1
VER = 2.6.38.6
THISAPP = kvm-kmod-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec
$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5
install : $(TARGET)
@@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch
cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 x86/*.ko \

View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .43
VER = 2.6.32.43
PATCHLEVEL = .44
VER = 2.6.32.44
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS =
CXXFLAGS =
PROG = linux-xen
PAK_VER = 17
PAK_VER = 18
DEPS = ""
# Normal build or XEN build.
@@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
$(DL_FILE)_MD5 = d6819da012da0d9772ac79da9dce3d63
$(DL_FILE)_MD5 = 38d43bb91fff88783f57ada146415029
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
@@ -125,9 +125,6 @@ else
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
endif
# Patch CVE 2011-1767 and 1768 dos hole
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.43-cve_2011_1767+1768.patch
# Not report deprecated syscall 1.23 (for kudzu)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch