From patchwork Tue Nov 12 15:59:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 2589 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 47CC9q414rz43Tf for ; Tue, 12 Nov 2019 15:59:43 +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 47CC9n6klcz280; Tue, 12 Nov 2019 15:59:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47CC9n4N3Mz2xyg; Tue, 12 Nov 2019 15:59:41 +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 47CC9l5WMRz2yCL for ; Tue, 12 Nov 2019 15:59:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 47CC9j08tRz280; Tue, 12 Nov 2019 15:59:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1573574379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOur5+2HLp4Cgxz1EWMWYd5Dw1HhMtvpzeNgYZw+F4U=; b=2+85pq7Vx2Ad6pbKXQ5Zj+047nXStqBM0WtQN7dbsvF7prxzCgoKZv5xGXV8xNdim4zW0X /wJeIQSEpE5ARVBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1573574379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOur5+2HLp4Cgxz1EWMWYd5Dw1HhMtvpzeNgYZw+F4U=; b=YLsue0QkVxZ8aaLRrWOd0L7J+1t9nMSAAh+s47XY3BhvwMyf0xOJM9FH/c0MMtkvA19V7V WMtjFRoA944gTyaxOpHk8hZIkdKi3wUfGjAAcP2puWzs6t8T1e3Qu2HzxWA4G46yPgrMm3 5haZRpYpNYUNr3WZbdosEIkYRmE7fVX4A6NKu1CZSQls5wUxA4BYe1wgWhKGT5HXVQmjX6 tUVQ7DEC2lMSlTE+q8XRvxgFhS9X3o1uH/aVrQCaXxKgui7b6t9s1XdsBM8itNizHyPqzT 1lJxJb4AZmw9rQRVHdeoOdb3iDlDFwg+YvZXtVrR56JN6rXLYjZ7VUfPQOmLxw== To: "IPFire: Development-List" , Arne Fitzenreiter From: peter.mueller@ipfire.org Subject: [PATCH] readline-compat: update to 6.3 Message-ID: <4af98cfb-cd25-b2d0-39db-11649836bcb8@ipfire.org> Date: Tue, 12 Nov 2019 15:59:00 +0000 MIME-Version: 1.0 Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=pmueller smtp.mailfrom=peter.mueller@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" This is necessary as many add-ons still need readline-compat as they cannot link against readline 8.0, yet. Reported-by: Arne Fitzenreiter Signed-off-by: Peter Müller --- config/rootfiles/common/readline-compat | 8 ++++---- lfs/readline-compat | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/common/readline-compat b/config/rootfiles/common/readline-compat index 1ff73257c..9ef128a47 100644 --- a/config/rootfiles/common/readline-compat +++ b/config/rootfiles/common/readline-compat @@ -1,4 +1,4 @@ -lib/libhistory.so.5 -lib/libhistory.so.5.2 -lib/libreadline.so.5 -lib/libreadline.so.5.2 +lib/libhistory.so.6 +lib/libhistory.so.6.3 +lib/libreadline.so.6 +lib/libreadline.so.6.3 diff --git a/lfs/readline-compat b/lfs/readline-compat index e7a49c306..248f522c4 100644 --- a/lfs/readline-compat +++ b/lfs/readline-compat @@ -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 = 5.2 +VER = 6.3 THISAPP = readline-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e39331f32ad14009b9ff49cc10c5e751 +$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a install : $(TARGET) @@ -72,8 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - for i in $$(seq 1 14); do \ - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline52-$$(printf "%03d" "$${i}") || exit 1; \ + for i in $$(seq 1 6); do \ + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \ done cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib --disable-static @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/shlib && install -m 755 libreadline.so.$(VER) /lib cd $(DIR_APP)/shlib && install -m 755 libhistory.so.$(VER) /lib - ln -svf libreadline.so.$(VER) /lib/libreadline.so.5 - ln -svf libhistory.so.$(VER) /lib/libhistory.so.5 + ln -svf libreadline.so.$(VER) /lib/libreadline.so.6 + ln -svf libhistory.so.$(VER) /lib/libhistory.so.6 @rm -rf $(DIR_APP) @$(POSTBUILD)