This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e6575e1a58cce7aeef56b142560890a384eecd2d (commit) via c4f1f56157955c018510f7cd20f3d4c21cb294bd (commit) via d310d24eefb8074f229afee0ebe70000f32b2c2d (commit) via 78a45ae10a4cd9100b2d12bb6e68867d9d4ac7ca (commit) via 3b8e39553d7295d6aa7cf5545f73f0191622d7f9 (commit) from b954ae2750e4d36323cc497563fa7c12420df5e4 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e6575e1a58cce7aeef56b142560890a384eecd2d Merge: b954ae275 c4f1f5615 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 16 10:33:36 2020 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/credits.cgi | 2 +- lfs/linux | 6 +++--- lfs/suricata | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index ef7609cfc..8d757d37c 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -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, diff --git a/lfs/linux b/lfs/linux index e4467c477..5abc6f93a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -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) diff --git a/lfs/suricata b/lfs/suricata index 2871d8e7b..c5dc46af4 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -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)
hooks/post-receive -- IPFire 2.x development tree