Merge branch 'master' into next

This commit is contained in:
Michael Tremer
2020-12-16 10:33:36 +00:00
3 changed files with 6 additions and 6 deletions

View File

@@ -94,6 +94,7 @@ Rene Zingel,
Sascha Kilian,
Ronald Wiesinger,
Florian Bührle,
Leo-Andres Hofmann,
Bernhard Bitsch,
Justin Luth,
Michael Eitelwein,
@@ -110,7 +111,6 @@ David Kleuker,
Hans Horsten,
Jakub Ratajczak,
Jorrit de Jonge,
Leo-Andres Hofmann,
Przemek Zdroik,
Alexander Rudolf Gruber,
Andrew Bellows,

View File

@@ -24,8 +24,8 @@
include Config
VER = 4.14.211
ARM_PATCHES = 4.14.211-ipfire0
VER = 4.14.212
ARM_PATCHES = 4.14.212-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -79,7 +79,7 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
$(DL_FILE)_MD5 = 41241e9508acc9183540db785f78ec78
$(DL_FILE)_MD5 = 645d5256adf72569e14edcf80c3757dc
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 2b0e8e3ebe9827b2bfed7397b043dbc5
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 6.0.0
VER = 5.0.5
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bbddcf2f209930206ef21977d40120d2
$(DL_FILE)_MD5 = fe039cc4571eb56828874ddc0b71dc51
install : $(TARGET)