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

This commit is contained in:
Michael Tremer
2014-04-05 17:02:33 +02:00
5 changed files with 43 additions and 28 deletions

View File

@@ -25,7 +25,7 @@
include Config
VER = 2.2.26
VER = 2.2.27
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
$(DL_FILE)_MD5 = 254eda547f8d624604e4bf403241e617
$(DL_FILE)_MD5 = 8faef0decf3fa7e69b2568eb2105a3d8
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)

View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.34
VER = 3.10.36
RPI_PATCHES = linux-3.10.34-grsec-dea8280
GRS_PATCHES = grsecurity-2.9.1-3.10.34-ipfire1.patch.xz
GRS_PATCHES = grsecurity-2.9.1-3.10.36-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 = 39
PAK_VER = 41
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 = 30991b495a3d75196d5608072d2e62e6
$(DL_FILE)_MD5 = 721f76050755ec8ec88876ee350a2726
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 522683db031f7033b1b5dfe1b1f30e67
$(GRS_PATCHES)_MD5 = b490f7f3bf48387ab2eb60212fcf0c11
$(GRS_PATCHES)_MD5 = 85717c4d6643ea52eef443ee7bc873e2
install : $(TARGET)