From patchwork Fri Apr 24 10:28:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3000 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 497r3y1r5wz3yCc for ; Fri, 24 Apr 2020 10:28:30 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 497r3x0N1bz2Ld; Fri, 24 Apr 2020 10:28:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 497r3w4mLyz30G7; Fri, 24 Apr 2020 10:28:28 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 497r3t5KxNz2xl3 for ; Fri, 24 Apr 2020 10:28:26 +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 497r3r5jvsz1cQ; Fri, 24 Apr 2020 10:28:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1587724104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tR9vmA3lxF2cQpIYOvkGIHFQwrPkp7PTp7UyIkMYb8c=; b=e9R/0/XMKWxlr4CyCjYZgkIy3vY9BlyvqFDbjRHjK+Y9fA9GiQHwTuMcA6sCMDpzTXrHIE pxTnLJIzwROFUsCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1587724104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tR9vmA3lxF2cQpIYOvkGIHFQwrPkp7PTp7UyIkMYb8c=; b=rOXMEydvaX6TQ40SB3EygX68h/Kuz6UiR2G0S9l+YbVo0DTzPcr67kF6ohE6MNXZDk+qKG P9zzWWU9SR/mkANwQooZO6fi+uni4LrUF+2mIewgJr88DYnFDYe07i5QPkdwUofElACOT/ 4bk7RrY68EsPmxHR6mA/xBXrRdLkyjvQyiqaTtoUwxrML5cGd7Mzx+pzjOzra+BvqQem3D nWIUTFkNKjt67cBHr8E3g/+V8eLL15f4suiKXuu8sulAWkQQw4cJCK1HISZnBw1FGlg6xM 6tsEKl328t71zJnwflDhKcZeOj0gbFNVLuW6IE9FnoG931MP3i8OMZ3y51RjAw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/5] berkeley: Re-add 4.4 as compat package Date: Fri, 24 Apr 2020 10:28:11 +0000 Message-Id: <20200424102812.16820-4-michael.tremer@ipfire.org> In-Reply-To: <20200424102812.16820-1-michael.tremer@ipfire.org> References: <20200424102812.16820-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" We have loads of packages linked against the older version which is difficult to update. Signed-off-by: Michael Tremer --- config/rootfiles/common/berkeley-compat | 4 ++ lfs/berkeley-compat | 83 +++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 88 insertions(+) create mode 100644 config/rootfiles/common/berkeley-compat create mode 100644 lfs/berkeley-compat diff --git a/config/rootfiles/common/berkeley-compat b/config/rootfiles/common/berkeley-compat new file mode 100644 index 000000000..1b149915c --- /dev/null +++ b/config/rootfiles/common/berkeley-compat @@ -0,0 +1,4 @@ +usr/lib/libdb-4.4.so +usr/lib/libdb-4.so +usr/lib/libdb_cxx-4.4.so +usr/lib/libdb_cxx-4.so diff --git a/lfs/berkeley-compat b/lfs/berkeley-compat new file mode 100644 index 000000000..9e148e53a --- /dev/null +++ b/lfs/berkeley-compat @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.4.20 + +THISAPP = db-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d84dff288a19186b136b0daf7067ade3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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/db-4.4.20-fixes-1.patch + cd $(DIR_APP)/build_unix && ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx + cd $(DIR_APP)/build_unix && make $(MAKETUNING) + + # Install the libraries inly + cd $(DIR_APP)/build_unix && install -v -m 755 .libs/{libdb-4.4.so,libdb_cxx-4.4.so} /usr/lib/ + ln -svf libdb-4.4.so /usr/lib/libdb-4.so + ln -svf libdb_cxx-4.4.so /usr/lib/libdb_cxx-4.so + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 636289cd4..9f05ee8ce 100755 --- a/make.sh +++ b/make.sh @@ -1084,6 +1084,7 @@ buildbase() { lfsmake2 autoconf lfsmake2 automake lfsmake2 berkeley + lfsmake2 berkeley-compat lfsmake2 coreutils lfsmake2 iana-etc lfsmake2 m4