From patchwork Fri Feb 4 16:47:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5061 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1gg6JZXz3xHT for ; Fri, 4 Feb 2022 16:48:15 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jr1gN6ZXQz5QV; Fri, 4 Feb 2022 16:48:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jr1gM4qZkz32MZ; Fri, 4 Feb 2022 16:47:59 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1gK1GbJz32KP for ; Fri, 4 Feb 2022 16:47:57 +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 4Jr1gJ6k64z4YJ; Fri, 4 Feb 2022 16:47:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643993276; 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=kekSp1irW78LgMiBGbujVHEmIcDSZX+vEhRNQAH7zXA=; b=mnYjke76kspTLDPLTckadQ/st88keZoafXq4Cwh4BiJl8i+x8sJN986xA0G0Te3oCmnJTm MIUVGVlqdOf7b0Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643993276; 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=kekSp1irW78LgMiBGbujVHEmIcDSZX+vEhRNQAH7zXA=; b=QfNQDiJ/wqRtPId+WeHAlSV3CJTHZzCd8hn6XkJkRX3cvZ4UCVL5yGQsU5aikaqyN9NAkU o1azy6C0Mgj6nF5lgJUjv68wbgarfRfJfFvL4l6sQg+OCaOfUV5lLBFmRsg/J1HZX6d7gr Q1+nMfmkTSc26hfWjTtLsPrzWzuxIMaPZyBRnesOgLPM4euege1bSblwJxYTZhHMM91x14 Ca5x8hR6E++gNzKCjoZBg1x2eI6uysIazlMH1V1A6lhe9j2NElayXGoIfvkTwjxdOwpdeI mfXR2YLc40Ql0tMdrZSinoj16GAMShgHErxk2WRb+v4aDz71TFtFHYX6N8FftA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/28] libnfsidmap: Drop package Date: Fri, 4 Feb 2022 16:47:30 +0000 Message-Id: <20220204164748.315559-10-michael.tremer@ipfire.org> In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org> References: <20220204164748.315559-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" This is now bundled in nfs-utils. This patch needs a rootfile update for nfs Signed-off-by: Michael Tremer Reviewed-by: Adolf Belka --- config/rootfiles/packages/libnfsidmap | 15 ----- lfs/libnfsidmap | 88 --------------------------- lfs/nfs | 4 +- make.sh | 1 - 4 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 config/rootfiles/packages/libnfsidmap delete mode 100644 lfs/libnfsidmap diff --git a/config/rootfiles/packages/libnfsidmap b/config/rootfiles/packages/libnfsidmap deleted file mode 100644 index 0c9d3ab12..000000000 --- a/config/rootfiles/packages/libnfsidmap +++ /dev/null @@ -1,15 +0,0 @@ -#usr/include/nfsidmap.h -#usr/lib/libnfsidmap -#usr/lib/libnfsidmap.la -#usr/lib/libnfsidmap.so -usr/lib/libnfsidmap.so.0 -usr/lib/libnfsidmap.so.0.3.0 -#usr/lib/libnfsidmap/nsswitch.la -usr/lib/libnfsidmap/nsswitch.so -#usr/lib/libnfsidmap/static.la -usr/lib/libnfsidmap/static.so -#usr/lib/libnfsidmap/umich_ldap.la -usr/lib/libnfsidmap/umich_ldap.so -#usr/lib/pkgconfig/libnfsidmap.pc -#usr/share/man/man3/nfs4_uid_to_name.3 -#usr/share/man/man5/idmapd.conf.5 diff --git a/lfs/libnfsidmap b/lfs/libnfsidmap deleted file mode 100644 index 1980d9306..000000000 --- a/lfs/libnfsidmap +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# # -# 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 = 0.27 - -THISAPP = libnfsidmap-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libnfsidmap -PAK_VER = 2 - -#CFLAGS += -I/usr/include/tirpc - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 27cfb22f1ee85e51b863b71858a97da0 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/nfs b/lfs/nfs index 55accfb28..702f7116f 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 15 +PAK_VER = 16 -DEPS = libnfsidmap rpcbind +DEPS = rpcbind ############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 5930699f0..d9240a008 100755 --- a/make.sh +++ b/make.sh @@ -1496,7 +1496,6 @@ buildipfire() { lfsmake2 rsync lfsmake2 rpcbind lfsmake2 keyutils - lfsmake2 libnfsidmap lfsmake2 nfs lfsmake2 gnu-netcat lfsmake2 ncat