From patchwork Thu Oct 31 07:49:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2562 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 473ctp6ytJz43TQ for ; Thu, 31 Oct 2019 07:50:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 473ctn4hvjz6Bp; Thu, 31 Oct 2019 07:50:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 473ctn38GGz2yWt; Thu, 31 Oct 2019 07:50:25 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 473ctl4Qlrz2yHm for ; Thu, 31 Oct 2019 07:50:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 473ctg6Hp6z6Bp; Thu, 31 Oct 2019 07:50:09 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1572508220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=OLWYtjwOUMiQJZ+fBcY8TBw2YewXNuAVMDIsHwfczXU=; b=Pp1jEv8am8L65wBtfJb6JfgJnhaFwy0JGZRAfLm01UC73Z/OaZNGBjg+pfaW4urjjYXZQF SSXaz72++BK4BFDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1572508220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=OLWYtjwOUMiQJZ+fBcY8TBw2YewXNuAVMDIsHwfczXU=; b=GajgR9h+uUUmn+L8NoFnrASDaEvwd6RNJwwZbqaYG+GFQQUFOA0CigRBK/35+p0PKUIuoO S1CARjmF1zo/kKjD+aMWs8egARr4CB3C51+Xr34kipbLRMy+ncmNmuzEOvbfewb2qGbI+n JCyFrYgpDG4EJNTe7vO7EpBjU/0dua/81/gGdvCZtBtNur2UbtaWspEOBMMEj8ABOzgBVK 7CVUOkbu/abdNKZptYOJRSbAl+oTadCAGe/xxLh/ZQX3lxoduoEuIivw4DeMOm8VbX7Kbl 1mmSUC4UQYRs2jP4YqG2pfwiHMSoJZmj3NnGMQrX3g+v0YJMx9d8QN4P9WKvPg== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] lz4: Update to version 1.9.2 Date: Thu, 31 Oct 2019 08:49:55 +0100 Message-Id: <20191031074955.4913-1-ummeegge@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Reviewed-by: Michael Tremer --- config/rootfiles/common/lz4 | 2 +- lfs/lz4 | 8 ++++---- src/patches/lz4-1.9.2_mod_install_path.patch | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 src/patches/lz4-1.9.2_mod_install_path.patch diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4 index 0902a47fe..ab03c65f7 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 aff8f25bb..17b10cfed 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2019 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.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 000000000..2eee0462e --- /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)