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 be838808e1d3e7dc52fd25621bda18507294919a (commit) via 7c26f07dabd486f1723615e2546f52c825f8899b (commit) via b9d494e7736ab1fa543903542f2b922ac370331f (commit) via 903052ddea715c66d15b18c9be4631bea8ab4bd5 (commit) via 480e3014429820c687ceeb17a3ad0b46d2b6f2ed (commit) from 26d07ee5da961c7ac8a062b6e8386800cd5f21f7 (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 be838808e1d3e7dc52fd25621bda18507294919a Merge: 7c26f07da 903052dde Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 23 21:19:01 2019 +0100
Merge remote-tracking branch 'origin/master' into next
commit 7c26f07dabd486f1723615e2546f52c825f8899b Merge: b9d494e77 26d07ee5d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 23 21:18:44 2019 +0100
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit b9d494e7736ab1fa543903542f2b922ac370331f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 23 18:38:14 2019 +0100
kernel: update to 4.14.95
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/linux | 8 ++++---- lfs/xtables-addons | 2 ++ .../xtables-addons-3.2-fix-database-generation.patch | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/patches/xtables-addons-3.2-fix-database-generation.patch
Difference in files: diff --git a/lfs/linux b/lfs/linux index dac7e5516..7d16f939e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-VER = 4.14.94 -ARM_PATCHES = 4.14.94-ipfire0 +VER = 4.14.95 +ARM_PATCHES = 4.14.95-ipfire0
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,8 +82,8 @@ 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 = 2b06ce0be8f5dcdf0db0d4c63270aab8 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = d8b93abb38fcea15bed335fef46f745d +$(DL_FILE)_MD5 = 581f25286b695c77c7fc20711f2d3c89 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 1b7d72e71b8923d39eb2fede46c66d0c
install : $(TARGET)
diff --git a/lfs/xtables-addons b/lfs/xtables-addons index 260820955..4cf220c4e 100644 --- a/lfs/xtables-addons +++ b/lfs/xtables-addons @@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch + # Only build the specified modules. cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \ $(DIR_APP)/mconfig diff --git a/src/patches/xtables-addons-3.2-fix-database-generation.patch b/src/patches/xtables-addons-3.2-fix-database-generation.patch new file mode 100644 index 000000000..5574e200d --- /dev/null +++ b/src/patches/xtables-addons-3.2-fix-database-generation.patch @@ -0,0 +1,18 @@ +diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build +index 3b15875..7bc42f3 100755 +--- a/geoip/xt_geoip_build ++++ b/geoip/xt_geoip_build +@@ -259,7 +259,12 @@ sub writeCountry + my ($start, $end) = split('-', $range); + $start = inet_pton($family, $start); + $end = inet_pton($family, $end); +- print $fh $start, $end; ++ ++ if ($family == AF_INET) { ++ print $fh substr($start, 0, 4), substr($end, 0, 4); ++ } else { ++ print $fh $start, $end; ++ } + } + close $fh; + }
hooks/post-receive -- IPFire 2.x development tree