[PATCH] Make sunrpc code available for building again

[Carlos O'Donell]

On Wed, May 9, 2012 at 10:01 AM, Andreas Jaeger <aj@suse.de> wrote:
>
> As suggested, here's the "hacky" patch. I put it in git on a personal
> branch aj/revert-sunrpc,
>
> AFAIK this was done by Andreas Schwab, Andreas is this correct or how
> should I change the authorship?
>
> Ok to commit?
>
> Andreas
>
> 2012-05-09  Andreas Schwab  <schwab@linux-m68k.org>
>
>        * include/libc-symbols.h (libc_hidden_nolink): Redefine to
>        hidden_def to allow again linking against the symbols.
>        * sunrpc/Makefile (headers): Add rpc headers.
>        * nis/Makefile (headers): Add rpc headers.
>
> commit 2377a584a909c1db63eac178f879ab837328701c
> Author: Andreas Schwab <schwab@linux-m68k.org>
> Date:   Wed May 9 15:51:23 2012 +0200
>
>    Make sunrpc code usable again
>
>    This in effect reverts the obsoletion of the sunrpc code.
>
>        * include/libc-symbols.h (libc_hidden_nolink): Redefine to
>        hidden_def to allow again linking against the symbols.
>        * sunrpc/Makefile (headers): Add rpc headers.
>        * nis/Makefile (headers): Add rpc headers.
>
> diff --git a/ChangeLog b/ChangeLog
> index 81d17c9..36ac87f 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2012-05-09  Andreas Schwab  <schwab@linux-m68k.org>
> +
> +       * include/libc-symbols.h (libc_hidden_nolink): Redefine to
> +       hidden_def to allow again linking against the symbols.
> +       * sunrpc/Makefile (headers): Add rpc headers.
> +       * nis/Makefile (headers): Add rpc headers.
> +
>  2012-05-08  Ian Wienand  <ianw@vmware.com>
>
>        [BZ #14080]
> diff --git a/NEWS b/NEWS
> index ca1f753..e3133bb 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -56,7 +56,11 @@ Version 2.16
>
>  * More generic and 64-bit performance optimizations to math functions.
>   Implemented by Ulrich Drepper.
> -
> +
> +* Resurrect the RPC implementation in libc so that it can be used again for
> +  compilation of new programs. It will be removed once TI-RPC can fully
> +  replace the glibc RPC code.
> +
>  Version 2.15
>
>  * The following bugs are resolved with this release:
> diff --git a/include/libc-symbols.h b/include/libc-symbols.h
> index 951e46a..db0f995 100644
> --- a/include/libc-symbols.h
> +++ b/include/libc-symbols.h
> @@ -556,7 +556,9 @@ 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)
> +/* libc_hidden_nolink is only used in sunrpc code, for now
> +   export the symbols.  */

Given that this is a hack can we do a mechanical change here to ensure
this option doesn't ever get used by anyone else?

Can we call it `libc_hidden_nolink_sunrpc' and then mechanically
change the name used by all the interfaces?

That prevents downstream hackers from accidentally using the generic
sounding libc_hidden_nolink and having it not work.

Am I being overly paranoid?

> +# 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 a48753f..8e8b1ef 100644
> --- a/nis/Makefile
> +++ b/nis/Makefile
> @@ -22,6 +22,7 @@
>  subdir := nis
>
>  aux                    := nis_hash
> +headers                        := $(wildcard rpcsvc/*.[hx])
>
>  # 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 48790f4..e95271b 100644
> --- a/sunrpc/Makefile
> +++ b/sunrpc/Makefile
> @@ -52,7 +52,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
>
> --
>  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
>  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
>   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
>    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126