From: Michael Tremer <michael.tremer@ipfire.org>
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 [thread overview]
Message-ID: <20200816102953.3881-51-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4293 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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
--
2.20.1
next prev parent reply other threads:[~2020-08-16 10:29 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 10:28 [PATCH 01/62] bison: Update to 3.7.1 Michael Tremer
2020-08-16 10:28 ` [PATCH 02/62] minicom: Update to 2.7.1 Michael Tremer
2020-08-16 10:28 ` [PATCH 03/62] fping: Update to 5.0 Michael Tremer
2020-08-16 10:28 ` [PATCH 04/62] xfsprogs: Update to 5.7.0 Michael Tremer
2020-08-16 10:28 ` [PATCH 05/62] lsof: Update to 4.91 Michael Tremer
2020-08-16 10:28 ` [PATCH 06/62] dnsdist: Update to 1.5.0 Michael Tremer
2020-08-16 10:28 ` [PATCH 07/62] spandsp: Update to 0.0.6 Michael Tremer
2020-08-16 10:28 ` [PATCH 08/62] watchdog: Update to 5.16 Michael Tremer
2020-08-16 10:29 ` [PATCH 09/62] cpio: Package won't build with GCC 10 without -fcommon Michael Tremer
2020-08-16 10:29 ` [PATCH 10/62] dhcp: Fix compiling with GCC 10 Michael Tremer
2020-08-16 10:29 ` [PATCH 11/62] efivar: Fix build " Michael Tremer
2020-08-16 10:29 ` [PATCH 12/62] linux-atm: " Michael Tremer
2020-08-16 10:29 ` [PATCH 13/62] gnupg: Fix building " Michael Tremer
2020-08-16 10:29 ` [PATCH 14/62] cdrkit: Fix build " Michael Tremer
2020-08-16 10:29 ` [PATCH 15/62] logrotate: " Michael Tremer
2020-08-16 10:29 ` [PATCH 16/62] libtirpc: " Michael Tremer
2020-08-16 10:29 ` [PATCH 17/62] sysfsutils: " Michael Tremer
2020-08-16 10:29 ` [PATCH 18/62] cups-filters: " Michael Tremer
2020-08-16 10:29 ` [PATCH 19/62] foomatic: " Michael Tremer
2020-08-16 10:29 ` [PATCH 20/62] htop: " Michael Tremer
2020-08-16 10:29 ` [PATCH 21/62] squidguard: " Michael Tremer
2020-08-16 10:29 ` [PATCH 22/62] netatalk: " Michael Tremer
2020-08-16 10:29 ` [PATCH 23/62] 7zip: Fix build against " Michael Tremer
2020-08-16 10:29 ` [PATCH 24/62] collectd: Fix build with " Michael Tremer
2020-08-16 10:29 ` [PATCH 25/62] icinga: " Michael Tremer
2020-08-16 10:29 ` [PATCH 26/62] openvmtools: Update to 11.1.0 Michael Tremer
2020-08-16 10:29 ` [PATCH 27/62] motion: Fix build with GCC 10 Michael Tremer
2020-08-16 10:29 ` [PATCH 28/62] tftpd: " Michael Tremer
2020-08-16 10:29 ` [PATCH 29/62] w_scan: " Michael Tremer
2020-08-16 10:29 ` [PATCH 30/62] minidlna: " Michael Tremer
2020-08-16 10:29 ` [PATCH 31/62] sarg: " Michael Tremer
2020-08-16 10:29 ` [PATCH 32/62] bird: " Michael Tremer
2020-08-16 10:29 ` [PATCH 33/62] frr: " Michael Tremer
2020-08-16 10:29 ` [PATCH 34/62] iftop: " Michael Tremer
2020-08-16 10:29 ` [PATCH 35/62] lcdproc: " Michael Tremer
2020-08-16 10:29 ` [PATCH 36/62] ipfire-netboot: " Michael Tremer
2020-08-16 10:29 ` [PATCH 37/62] syslinux: " Michael Tremer
2020-08-16 10:29 ` [PATCH 38/62] u-boot: " Michael Tremer
2020-08-16 10:29 ` [PATCH 39/62] kbd: Update to 2.2.0 Michael Tremer
2020-08-16 10:29 ` [PATCH 40/62] bacula: Fix build with GCC 10 Michael Tremer
2020-08-16 10:29 ` [PATCH 42/62] make.sh: Remove -mindirect-branch=thunk and -mfunction-return=thunk as default Michael Tremer
2020-08-16 10:29 ` [PATCH 43/62] Update glibc to 2.32 Michael Tremer
2020-08-16 10:29 ` [PATCH 44/62] rpcsvc-proto: New package Michael Tremer
2020-08-16 10:29 ` [PATCH 45/62] Build libtirpc earlier because RPC does not come with glibc any more Michael Tremer
2020-08-16 10:29 ` [PATCH 46/62] python(2/3): Remove nis module Michael Tremer
2020-08-16 10:29 ` [PATCH 47/62] squid: Remove basic_nis_auth Michael Tremer
2020-08-16 10:29 ` [PATCH 48/62] conntrack-tools: Fix build against libtirpc Michael Tremer
2020-08-16 10:29 ` [PATCH 49/62] xinetd: Fix build against glibc 2.32 (without RPC) Michael Tremer
2020-08-16 10:29 ` [PATCH 50/62] libnfsidmap: Split into a separate package Michael Tremer
2020-08-16 10:29 ` Michael Tremer [this message]
2020-08-16 10:29 ` [PATCH 52/62] cmake: Do not limit compile processes to only two Michael Tremer
2020-08-16 10:29 ` [PATCH 53/62] mpfr: Update to 4.1.0 Michael Tremer
2020-08-16 10:29 ` [PATCH 54/62] gcc: Bundle against OS versions of gmp/mpfr Michael Tremer
2020-08-16 10:29 ` [PATCH 55/62] make.sh: Enable -fstack-clash-protection for x86_64/aarch64 Michael Tremer
2020-08-16 10:29 ` [PATCH 56/62] make.sh: Add -fcf-protection for x86_64/i586 Michael Tremer
2020-08-16 10:29 ` [PATCH 57/62] make.sh: Bump toolchain version Michael Tremer
2020-08-16 10:29 ` [PATCH 58/62] glibc: Drop any custom CFLAGS Michael Tremer
2020-08-16 10:29 ` [PATCH 59/62] glibc: Pass -Wno-error=maybe-uninitialized Michael Tremer
2020-08-16 10:29 ` [PATCH 60/62] make: Run autoreconf after applying patches Michael Tremer
2020-08-16 10:29 ` [PATCH 61/62] perl: Fix build in toolchain stage Michael Tremer
2020-08-16 10:29 ` [PATCH 62/62] make.sh: Increase maximum size of ramdisk to 8GB Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200816102953.3881-51-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox