From patchwork Fri Jan 27 14:30:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6471 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4P3Kjb645cz3wkL for ; Fri, 27 Jan 2023 14:30:11 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4P3KjY5b2czpH; Fri, 27 Jan 2023 14:30:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4P3KjY3Kqzz2yVQ; Fri, 27 Jan 2023 14:30:09 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4P3KjX3zgjz2xNW for ; Fri, 27 Jan 2023 14:30:08 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4P3KjW4r5GzG4; Fri, 27 Jan 2023 14:30:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1674829807; 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; bh=3DVfN3caY5ortiEbre7p5YSsaPDH/zbJpUYOuDsvCaI=; b=ksou9smJADENnMybE57zfpWfHFYcAldL0J89fZ0Rb5LA+nVtjYS03nolIw8Kxfbtl7gdaD ApphUukGEacPG3Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1674829807; 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; bh=3DVfN3caY5ortiEbre7p5YSsaPDH/zbJpUYOuDsvCaI=; b=Scy552LkBdOS1Wuk8YcNFwKS64ZKGArZwn6lbJjUQLlXH836Az5Adga1Krs2WqWlFldFqh Qe5IJp6RLiC0tU4BKi0LyrKkC8JyoHTgwjGfoEYM8K0I657qHU8uMbIhIC9kt96NRC+AhQ VgPiDt3v3VG6Z2Rva1p4L87WiAldO2zRGckJ5vL+qmNJfo80RtjbSR5gR650MtiB9mRFP0 wuKvCxQ5+7a6zZMbgPbfFtuje52WDANdNUPMy+D1WrMENAOfP6NqOn2n+OiVio7DvVZTL7 Hz8rPWIE/g8x6OxHcTNBj4qUF0VdNlQeJ+QlHBBQF9eKgPCBes8+BY7d4jqwVA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] libtirpc: Convert from an addon to a core program - fixes Bug 13015 Date: Fri, 27 Jan 2023 15:30:02 +0100 Message-Id: <20230127143002.3442315-1-adolf.belka@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - libtirpc is required for lsof to work from CU172 onwards. rpc.h is no longer available from glibc. This would normally cause the lsof build to fail but libtirpc as an addon is built before lsof and so is present in the build and lsof is linked to it. When running lsof it fails as the linked libtirpc library is not present unless it has been installed as an addon. - This patch converts the libtirpc lfs from an addon to a core program and moves the rootfile from the packages directory to the common directory. - Tested out on my vm testbed. With CU172 lsof fails to run due to the missing libtirpc With the build based on this patch installed lsof works normally again. - Disabled the static library build in the configure options and updated the rootfile Tested-by: Adolf Belka Fixes: Bug#13015 Signed-off-by: Adolf Belka Reviewed-by: Bernhard Bitsch --- config/rootfiles/{packages => common}/libtirpc | 1 - lfs/libtirpc | 18 +++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) rename config/rootfiles/{packages => common}/libtirpc (98%) diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/libtirpc similarity index 98% rename from config/rootfiles/packages/libtirpc rename to config/rootfiles/common/libtirpc index ed7f33242..7e85a0a25 100644 --- a/config/rootfiles/packages/libtirpc +++ b/config/rootfiles/common/libtirpc @@ -34,7 +34,6 @@ etc/netconfig #usr/include/tirpc/rpcsvc #usr/include/tirpc/rpcsvc/crypt.h #usr/include/tirpc/rpcsvc/crypt.x -#usr/lib/libtirpc.a #usr/lib/libtirpc.la #usr/lib/libtirpc.so usr/lib/libtirpc.so.3 diff --git a/lfs/libtirpc b/lfs/libtirpc index ac897f2eb..09d7b6555 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -33,12 +33,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libtirpc -PAK_VER = 3 - -DEPS = - -SERVICES = CFLAGS += -fcommon @@ -60,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### @@ -84,7 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gssapi \ + --disable-ipv6 \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)