From: Michael Olbrich Date: Wed, 2 Nov 2011 17:47:58 +0100 Subject: [PATCH] revert sunrpc removal Packages like busybox still need this. We can drop this patch later when the packages are adapted to use libtirpc. This patch was taken from OpenSUSE. Signed-off-by: Michael Olbrich --- NEWS | 10 ---------- include/libc-symbols.h | 2 +- nis/Makefile | 4 ++-- sunrpc/Makefile | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index bb517c2..6504f81 100644 --- a/NEWS +++ b/NEWS @@ -27,16 +27,6 @@ Version 2.14 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 diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 8cefa67..1b21447 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -635,7 +635,7 @@ for linking") # 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) diff --git a/nis/Makefile b/nis/Makefile index 3a01142..5256d61 100644 --- a/nis/Makefile +++ b/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis 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. diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 85dcdb1..925b862 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ 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) install-others = $(inst_sysconfdir)/rpc generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen