diff mbox series

Move <rpc/netdb.h> from sunrpc to inet

Message ID 871rlebd8y.fsf@oldenburg2.str.redhat.com
State Superseded
Headers show
Series Move <rpc/netdb.h> from sunrpc to inet | expand

Commit Message

Florian Weimer July 14, 2020, 10:30 a.m. UTC
Restore <rpc/netdb.h> as an installed header. Delete the dummy header
resolv/rpc/netdb.h because inet is not an optional glibc component
(so its <rpc/netdb.h> is always available).

Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
non-deprecated RPC-related functions from sunrpc to inet") in
combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
("Remove --enable-obsolete-rpc configure flag").

Tested on i686-linux-gnu.  Manually verified that
/usr/include/rpc/netdb.h is installed.

---
 include/rpc/netdb.h          | 2 +-
 inet/Makefile                | 3 ++-
 {sunrpc => inet}/rpc/netdb.h | 0
 resolv/rpc/netdb.h           | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

Comments

Andreas Schwab July 14, 2020, 11:54 a.m. UTC | #1
On Jul 14 2020, Florian Weimer wrote:

> Restore <rpc/netdb.h> as an installed header. Delete the dummy header
> resolv/rpc/netdb.h because inet is not an optional glibc component
> (so its <rpc/netdb.h> is always available).

This is ok.  Though, I wonder wheather we actually need rpc/netdb.h,
instead of putting its contents into netdb.h.

There is also a stale comment in resolv/netdb.h.

Andreas.
Florian Weimer July 14, 2020, 12:20 p.m. UTC | #2
* Andreas Schwab:

> On Jul 14 2020, Florian Weimer wrote:
>
>> Restore <rpc/netdb.h> as an installed header. Delete the dummy header
>> resolv/rpc/netdb.h because inet is not an optional glibc component
>> (so its <rpc/netdb.h> is always available).
>
> This is ok.  Though, I wonder wheather we actually need rpc/netdb.h,
> instead of putting its contents into netdb.h.

Yes, we should probably deprecate that header.

> There is also a stale comment in resolv/netdb.h.

Which comment is stale?  This one?

/* This is necessary to make this include file properly replace the
   Sun version.  */

It's old, but probably still technically correct?

Thanks,
Florian
Szabolcs Nagy July 17, 2020, 7:53 a.m. UTC | #3
The 07/14/2020 12:30, Florian Weimer via Libc-alpha wrote:
> Restore <rpc/netdb.h> as an installed header. Delete the dummy header
> resolv/rpc/netdb.h because inet is not an optional glibc component
> (so its <rpc/netdb.h> is always available).
> 
> Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
> non-deprecated RPC-related functions from sunrpc to inet") in
> combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
> ("Remove --enable-obsolete-rpc configure flag").
> 
> Tested on i686-linux-gnu.  Manually verified that
> /usr/include/rpc/netdb.h is installed.

what's the status of this?

we have some build breakage without this.

it looks OK to me.
Florian Weimer July 17, 2020, 7:56 a.m. UTC | #4
* Szabolcs Nagy:

> The 07/14/2020 12:30, Florian Weimer via Libc-alpha wrote:
>> Restore <rpc/netdb.h> as an installed header. Delete the dummy header
>> resolv/rpc/netdb.h because inet is not an optional glibc component
>> (so its <rpc/netdb.h> is always available).
>> 
>> Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
>> non-deprecated RPC-related functions from sunrpc to inet") in
>> combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
>> ("Remove --enable-obsolete-rpc configure flag").
>> 
>> Tested on i686-linux-gnu.  Manually verified that
>> /usr/include/rpc/netdb.h is installed.
>
> what's the status of this?
>
> we have some build breakage without this.
>
> it looks OK to me.

It's blocked, pending release manager approval.

Thanks,
Florian
Carlos O'Donell July 17, 2020, 1:15 p.m. UTC | #5
On 7/17/20 3:56 AM, Florian Weimer wrote:
> * Szabolcs Nagy:
> 
>> The 07/14/2020 12:30, Florian Weimer via Libc-alpha wrote:
>>> Restore <rpc/netdb.h> as an installed header. Delete the dummy header
>>> resolv/rpc/netdb.h because inet is not an optional glibc component
>>> (so its <rpc/netdb.h> is always available).
>>>
>>> Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
>>> non-deprecated RPC-related functions from sunrpc to inet") in
>>> combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
>>> ("Remove --enable-obsolete-rpc configure flag").
>>>
>>> Tested on i686-linux-gnu.  Manually verified that
>>> /usr/include/rpc/netdb.h is installed.
>>
>> what's the status of this?
>>
>> we have some build breakage without this.
>>
>> it looks OK to me.
> 
> It's blocked, pending release manager approval.

Approved for 2.32. Please push with fixed resolv/Makefile stale
reference fixed.
diff mbox series

Patch

diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h
index dc0d0e26b9..5ddd776691 100644
--- a/include/rpc/netdb.h
+++ b/include/rpc/netdb.h
@@ -1,5 +1,5 @@ 
 #ifndef _RPC_NETDB_H
-#include <sunrpc/rpc/netdb.h>
+#include <inet/rpc/netdb.h>
 
 # ifndef _ISOMAC
 
diff --git a/inet/Makefile b/inet/Makefile
index 1ca06bba80..7a807fe805 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -25,7 +25,8 @@  include ../Makeconfig
 headers	:= netinet/ether.h netinet/in.h netinet/in_systm.h \
 	   netinet/if_ether.h netinet/igmp.h \
 	   netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
-	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h
+	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h \
+	   rpc/netdb.h
 
 routines := htonl htons		\
 	    inet_lnaof inet_mkadr	\
diff --git a/sunrpc/rpc/netdb.h b/inet/rpc/netdb.h
similarity index 100%
rename from sunrpc/rpc/netdb.h
rename to inet/rpc/netdb.h
diff --git a/resolv/rpc/netdb.h b/resolv/rpc/netdb.h
deleted file mode 100644
index eecea3cb06..0000000000
--- a/resolv/rpc/netdb.h
+++ /dev/null
@@ -1,3 +0,0 @@ 
-/* This is a dummy file for <rpc/netdb.h>, which is included by <netdb.h>.
-   This file is installed when the C library does not support the SunRPC
-   interfaces (including 'struct rpcent' et al) at all.  */