Move non-deprecated RPC-related functions from sunrpc to inet

This includes bindresvport and the NSS-related RPC functions.  This will
simplify the removal of the sunrpc functionality because these functions
no longer have to be treated specially.

1 files changed, 9 insertions, 2 deletions

diff --git a/inet/Makefile b/inet/Makefile
index bd2fc317b5..1ca06bba80 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -36,10 +36,11 @@ routines := htonl htons		\
 	    getnetbynm_r \
 	    getproto getproto_r getprtent getprtent_r getprtname getprtname_r \
 	    getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \
-	    getservent_r	\
+	    getservent_r getrpcent getrpcbyname getrpcbynumber \
+	    getrpcent_r getrpcbyname_r getrpcbynumber_r \
 	    ether_aton ether_aton_r ether_hton ether_line \
 	    ether_ntoa ether_ntoa_r ether_ntoh \
-	    rcmd rexec ruserpass \
+	    rcmd rexec ruserpass bindresvport \
 	    getnetgrent_r getnetgrent \
 	    getaliasent_r getaliasent getaliasname getaliasname_r \
 	    in6_addr getnameinfo if_index ifaddrs inet6_option \
@@ -47,6 +48,8 @@ routines := htonl htons		\
 	    getsourcefilter setsourcefilter inet6_opt inet6_rth \
 	    inet6_scopeid_pton deadline idna idna_name_classify
 
+install-others = $(inst_sysconfdir)/rpc
+
 aux := check_pf check_native ifreq
 
 tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
@@ -108,6 +111,10 @@ CFLAGS-tst-sockaddr.c += -fno-strict-aliasing
 
 endif
 
+# Install the rpc database file.
+$(inst_sysconfdir)/rpc: etc.rpc $(+force)
+	$(do-install)
+
 ifeq ($(build-static-nss),yes)
 CFLAGS += -DSTATIC_NSS
 endif