From patchwork Sun Aug 16 10:29:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3357 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 4BTtly74brz3x0m for ; Sun, 16 Aug 2020 10:32: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 4BTtjx0Gvgz11F; Sun, 16 Aug 2020 10:30:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BTtjw1kLjz2yDq; Sun, 16 Aug 2020 10:30:44 +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 4BTtjv2qyZz2xjj for ; Sun, 16 Aug 2020 10:30:43 +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 4BTtjq0KdCzyv; Sun, 16 Aug 2020 10:30:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1597573839; 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=fcfggNh25gqPrAUg0xCt1ByVuzvTPunjCPWX91gIgfg=; b=Smdtgnrl4AnZmhqo+yRY7spiiEOCXEn7BBi0Bg1Uh9OriWOU7wW46D8UrHrPYYV/wPIwWq u38P7LONAuFXzfDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1597573839; 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=fcfggNh25gqPrAUg0xCt1ByVuzvTPunjCPWX91gIgfg=; b=EC7AL+9FyXMU/A63RxRuuh9E1PNFFM4HCHavrDcRco721lTqMpehywkuGgaU5t3jyYAlON 0AkPlNlatgp/2wcpk2qmQGYcUJ05BTR5kdIThmlErWGZCBWQp8d+lGE3Sm8WbMEIKy9Ws4 W8bRknZNv7mkSTx2FWq+SCW2CJxUp6jekRUkMHHKKeOamZt1aBCpeTnUCMDnJcUvZ1DuDo aiC8xJZtHqcws7pupLZQmvyuk6zyDKbDfpEXo5z7YJibGNyA+I7ePUan33wma55zaHtmYa 1ZQMNo+/l3ACKi9zRotjJXIOLyZBJRjWIszoqdEpNcHk1uOMGJ07LzkL98mcMw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 51/62] nfs: Update to 2.5.1 and remove bundled libnfsidmap Date: Sun, 16 Aug 2020 10:29:42 +0000 Message-Id: <20200816102953.3881-51-michael.tremer@ipfire.org> In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org> References: <20200816102953.3881-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" Signed-off-by: Michael Tremer --- config/rootfiles/packages/nfs | 27 +++++++++++---------------- lfs/nfs | 26 ++++++-------------------- 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index 16059abdc..dba272c8a 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -2,32 +2,25 @@ etc/rc.d/init.d/nfs-server sbin/mount.nfs sbin/mount.nfs4 sbin/nfsdcltrack -sbin/osd_login sbin/umount.nfs sbin/umount.nfs4 -#usr/include/nfsidmap.h #usr/include/nfsidmap_plugin.h -#usr/lib/libnfsidmap #usr/lib/libnfsidmap.a -#usr/lib/libnfsidmap.la -#usr/lib/libnfsidmap.so -usr/lib/libnfsidmap.so.0 -usr/lib/libnfsidmap.so.0.3.0 usr/lib/libnfsidmap.so.1 usr/lib/libnfsidmap.so.1.0.0 #usr/lib/libnfsidmap/nsswitch.a -#usr/lib/libnfsidmap/nsswitch.la -usr/lib/libnfsidmap/nsswitch.so +#usr/lib/libnfsidmap/regex.a +#usr/lib/libnfsidmap/regex.la +usr/lib/libnfsidmap/regex.so #usr/lib/libnfsidmap/static.a -#usr/lib/libnfsidmap/static.la -usr/lib/libnfsidmap/static.so #usr/lib/libnfsidmap/umich_ldap.a -#usr/lib/libnfsidmap/umich_ldap.la -usr/lib/libnfsidmap/umich_ldap.so -#usr/lib/pkgconfig/libnfsidmap.pc +#usr/sbin/blkmapd usr/sbin/exportfs usr/sbin/mountstats usr/sbin/nfsconf +usr/sbin/nfsdcld +usr/sbin/nfsdclddb +usr/sbin/nfsdclnts usr/sbin/nfsidmap usr/sbin/nfsiostat usr/sbin/nfsstat @@ -39,14 +32,13 @@ usr/sbin/rpcdebug usr/sbin/showmount usr/sbin/sm-notify usr/sbin/start-statd -#usr/share/man/man3/nfs4_uid_to_name.3 #usr/share/man/man5/exports.5 -#usr/share/man/man5/idmapd.conf.5 #usr/share/man/man5/nfs.5 #usr/share/man/man5/nfs.conf.5 #usr/share/man/man5/nfsmount.conf.5 #usr/share/man/man7/nfs.systemd.7 #usr/share/man/man7/nfsd.7 +#usr/share/man/man8/blkmapd.8 #usr/share/man/man8/exportfs.8 #usr/share/man/man8/idmapd.8 #usr/share/man/man8/mount.nfs.8 @@ -54,6 +46,9 @@ usr/sbin/start-statd #usr/share/man/man8/mountstats.8 #usr/share/man/man8/nfsconf.8 #usr/share/man/man8/nfsd.8 +#usr/share/man/man8/nfsdcld.8 +#usr/share/man/man8/nfsdclddb.8 +#usr/share/man/man8/nfsdclnts.8 #usr/share/man/man8/nfsdcltrack.8 #usr/share/man/man8/nfsidmap.8 #usr/share/man/man8/nfsiostat.8 diff --git a/lfs/nfs b/lfs/nfs index 882792684..3e2f56b7e 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,7 +24,7 @@ include Config -VER = 2.3.3 +VER = 2.5.1 THISAPP = nfs-utils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,24 +32,19 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 13 +PAK_VER = 14 -DEPS = rpcbind - -LIBNFSIDMAP = 0.25 +DEPS = libnfsidmap rpcbind ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - libnfsidmap-$(LIBNFSIDMAP).tar.gz +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz -$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99 -libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab +$(DL_FILE)_MD5 = d14294d5efcd9aada28f4dab871a44a6 install : $(TARGET) @@ -82,23 +77,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz - - $(UPDATE_AUTOMAKE) - cd $(DIR_APP)/libnfsidmap* && ./configure --prefix=/usr - cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP)/libnfsidmap* && make install - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-gss \ - --disable-tirpc \ - --disable-nfsv41 \ --without-tcp-wrappers \ --disable-ipv6 - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install # Install initscript