diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4 index 9a8abcd2b..4864814ec 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.9.3 +usr/lib/liblz4.so.1.9.4 #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 7f3f87144..f15b962c9 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # 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.9.3 +VER = 1.9.4 THISAPP = lz4-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 +$(DL_FILE)_BLAKE2 = 2289cdce36acd35283bf2f02ef4d6d8f4805563be6d5a3492f3d6ea7975fb6bd14e1ac2e505df9747776edf8bcf0da7ba4ae7084b150e3ec08a52a9885f92ad5 install : $(TARGET) @@ -74,7 +74,7 @@ $(subst %,%_BLAKE2,$(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.9.3_mod_install_path.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.4_mod_install_path.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/lz4-1.9.3_mod_install_path.patch b/src/patches/lz4-1.9.4_mod_install_path.patch similarity index 60% rename from src/patches/lz4-1.9.3_mod_install_path.patch rename to src/patches/lz4-1.9.4_mod_install_path.patch index 3b674c4d8..5bd227259 100644 --- a/src/patches/lz4-1.9.3_mod_install_path.patch +++ b/src/patches/lz4-1.9.4_mod_install_path.patch @@ -1,7 +1,7 @@ -diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile ---- lz4-1.9.3/lib/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 -+++ lz4-1.9.3/lib/Makefile 2021-02-08 13:05:10.478443593 +0100 -@@ -144,7 +144,7 @@ +diff -Naur lz4-1.9.4.orig/lib/Makefile lz4-1.9.4/lib/Makefile +--- lz4-1.9.4.orig/lib/Makefile 2022-08-16 00:45:31.000000000 +0200 ++++ lz4-1.9.4/lib/Makefile 2023-01-25 14:31:42.117296250 +0100 +@@ -151,7 +151,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 @@ -10,10 +10,10 @@ diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile prefix ?= $(PREFIX) EXEC_PREFIX ?= $(prefix) exec_prefix ?= $(EXEC_PREFIX) -diff -au lz4-1.9.3/programs/Makefile.orig lz4-1.9.3/programs/Makefile ---- lz4-1.9.3/programs/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 -+++ lz4-1.9.3/programs/Makefile 2021-02-08 13:05:55.475676260 +0100 -@@ -146,7 +146,7 @@ +diff -Naur lz4-1.9.4.orig/programs/Makefile lz4-1.9.4/programs/Makefile +--- lz4-1.9.4.orig/programs/Makefile 2022-08-16 00:45:31.000000000 +0200 ++++ lz4-1.9.4/programs/Makefile 2023-01-25 14:31:56.923590369 +0100 +@@ -157,7 +157,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