Upstream-Status: Inappropriate [configuration]

export the rpc symbols and headers again until we can get libtirpc sorted
out as a proper and full replacement

patch from fedora (if redhat can't get it to work as the maintainers of all
these packages, then what chance do we have!)

Index: libc/NEWS
===================================================================
--- libc.orig/NEWS	2011-09-09 10:46:36.000000000 -0700
+++ libc/NEWS	2011-09-09 10:58:21.196279725 -0700
@@ -20,16 +20,6 @@
   12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
   12795, 12811, 12813, 12814, 12841
 
-* The RPC implementation in libc is obsoleted.  Old programs keep working
-  but new programs cannot be linked with the routines in libc anymore.
-  Programs in need of RPC functionality must be linked against TI-RPC.
-  The TI-RPC implementation is IPv6 enabled and there are other benefits.
-
-  Visible changes of this change include (obviously) the inability to link
-  programs using RPC functions without referencing the TI-RPC library and the
-  removal of the RPC headers from the glibc headers.
-  Implemented by Ulrich Drepper.
-
 * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
   syncfs, setns, sendmmsg
 
Index: libc/include/libc-symbols.h
===================================================================
--- libc.orig/include/libc-symbols.h	2011-09-09 10:45:34.000000000 -0700
+++ libc/include/libc-symbols.h	2011-09-09 10:58:21.196279725 -0700
@@ -656,7 +656,7 @@
 # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
 # define libc_hidden_def(name) hidden_def (name)
 # define libc_hidden_weak(name) hidden_weak (name)
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
+# define libc_hidden_nolink(name, version) hidden_def (name)
 # define libc_hidden_ver(local, name) hidden_ver (local, name)
 # define libc_hidden_data_def(name) hidden_data_def (name)
 # define libc_hidden_data_weak(name) hidden_data_weak (name)
Index: libc/nis/Makefile
===================================================================
--- libc.orig/nis/Makefile	2011-09-09 10:46:34.000000000 -0700
+++ libc/nis/Makefile	2011-09-09 10:58:21.196279725 -0700
@@ -25,9 +25,9 @@
 
 aux			:= nis_hash
 
+headers			:= $(wildcard rpcsvc/*.[hx])
 distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
-			   nisplus-parser.h nis_xdr.h nss \
-			   $(wildcard rpcsvc/*.[hx])
+			   nisplus-parser.h nis_xdr.h nss
 
 # These are the databases available for the nis (and perhaps later nisplus)
 # service.  This must be a superset of the services in nss.
Index: libc/sunrpc/Makefile
===================================================================
--- libc.orig/sunrpc/Makefile	2011-09-09 10:46:30.000000000 -0700
+++ libc/sunrpc/Makefile	2011-09-09 10:59:10.726352375 -0700
@@ -55,7 +55,7 @@
 				    des_crypt.h)
 headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
-headers = rpc/netdb.h
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
 generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
 generated-dirs := rpcsvc