From: Erik Kapfer <ummeegge@ipfire.org>
Date: Thu, 31 Oct 2019 07:49:55 +0000 (+0100)
Subject: lz4: Update to version 1.9.2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bc456dd750a09b8d86089d00f27308a17145f10d

lz4: Update to version 1.9.2

Several fixes and improvements has been integrated. The changes list through the different versions since
the current version 1.8.1.2 can be found in here --> https://github.com/lz4/lz4/releases

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4
index 0902a47fed..ab03c65f71 100644
--- a/config/rootfiles/common/lz4
+++ b/config/rootfiles/common/lz4
@@ -9,7 +9,7 @@ usr/bin/lz4
 #usr/lib/liblz4.a
 #usr/lib/liblz4.so
 usr/lib/liblz4.so.1
-usr/lib/liblz4.so.1.8.1
+usr/lib/liblz4.so.1.9.2
 #usr/lib/pkgconfig/liblz4.pc
 #usr/share/man/man1/lz4.1
 #usr/share/man/man1/lz4c.1
diff --git a/lfs/lz4 b/lfs/lz4
index aff8f25bb6..17b10cfedd 100644
--- a/lfs/lz4
+++ b/lfs/lz4
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.8.1.2
+VER        = 1.9.2
 
 THISAPP    = lz4-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343538e69ba752a386c669b1a28111e2
+$(DL_FILE)_MD5 = 3898c56c82fb3d9455aefd48db48eaad
 
 install : $(TARGET)
 
@@ -74,7 +74,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.8.1.2_mod_install_path.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.2_mod_install_path.patch
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/src/patches/lz4-1.9.2_mod_install_path.patch b/src/patches/lz4-1.9.2_mod_install_path.patch
new file mode 100644
index 0000000000..2eee0462ec
--- /dev/null
+++ b/src/patches/lz4-1.9.2_mod_install_path.patch
@@ -0,0 +1,24 @@
+diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile
+--- lz4-1.9.2.orig/lib/Makefile	2019-10-29 08:14:03.167415441 +0000
++++ lz4-1.9.2/lib/Makefile	2019-10-29 08:14:43.243864994 +0000
+@@ -144,7 +144,7 @@
+ # directory variables : GNU conventions prefer lowercase
+ # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
+ # support both lower and uppercase (BSD), use lower in script
+-PREFIX      ?= /usr/local
++PREFIX      ?= /usr
+ prefix      ?= $(PREFIX)
+ EXEC_PREFIX ?= $(prefix)
+ exec_prefix ?= $(EXEC_PREFIX)
+diff -Nur lz4-1.9.2.orig/programs/Makefile lz4-1.9.2/programs/Makefile
+--- lz4-1.9.2.orig/programs/Makefile	2019-10-29 08:14:03.177415386 +0000
++++ lz4-1.9.2/programs/Makefile	2019-10-29 08:14:30.267268628 +0000
+@@ -132,7 +132,7 @@
+ # directory variables : GNU conventions prefer lowercase
+ # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
+ # support both lower and uppercase (BSD), use lowercase in script
+-PREFIX      ?= /usr/local
++PREFIX      ?= /usr
+ prefix      ?= $(PREFIX)
+ EXEC_PREFIX ?= $(prefix)
+ exec_prefix ?= $(EXEC_PREFIX)