* [PATCH] Move <rpc/netdb.h> from sunrpc to inet
@ 2020-07-14 10:30 Florian Weimer
2020-07-14 11:54 ` Andreas Schwab
2020-07-17 7:53 ` Szabolcs Nagy
0 siblings, 2 replies; 6+ messages in thread
From: Florian Weimer @ 2020-07-14 10:30 UTC (permalink / raw)
To: libc-alpha; +Cc: Andreas Schwab
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(-)
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. */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Move <rpc/netdb.h> from sunrpc to inet
2020-07-14 10:30 [PATCH] Move <rpc/netdb.h> from sunrpc to inet Florian Weimer
@ 2020-07-14 11:54 ` Andreas Schwab
2020-07-14 12:20 ` Florian Weimer
2020-07-17 7:53 ` Szabolcs Nagy
1 sibling, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2020-07-14 11:54 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
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.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Move <rpc/netdb.h> from sunrpc to inet
2020-07-14 11:54 ` Andreas Schwab
@ 2020-07-14 12:20 ` Florian Weimer
0 siblings, 0 replies; 6+ messages in thread
From: Florian Weimer @ 2020-07-14 12:20 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Move <rpc/netdb.h> from sunrpc to inet
2020-07-14 10:30 [PATCH] Move <rpc/netdb.h> from sunrpc to inet Florian Weimer
2020-07-14 11:54 ` Andreas Schwab
@ 2020-07-17 7:53 ` Szabolcs Nagy
2020-07-17 7:56 ` Florian Weimer
1 sibling, 1 reply; 6+ messages in thread
From: Szabolcs Nagy @ 2020-07-17 7:53 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha, Andreas Schwab
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Move <rpc/netdb.h> from sunrpc to inet
2020-07-17 7:53 ` Szabolcs Nagy
@ 2020-07-17 7:56 ` Florian Weimer
2020-07-17 13:15 ` Carlos O'Donell
0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2020-07-17 7:56 UTC (permalink / raw)
To: Szabolcs Nagy; +Cc: Andreas Schwab, libc-alpha, Carlos O'Donell
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Move <rpc/netdb.h> from sunrpc to inet
2020-07-17 7:56 ` Florian Weimer
@ 2020-07-17 13:15 ` Carlos O'Donell
0 siblings, 0 replies; 6+ messages in thread
From: Carlos O'Donell @ 2020-07-17 13:15 UTC (permalink / raw)
To: Florian Weimer, Szabolcs Nagy; +Cc: Andreas Schwab, libc-alpha
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.
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-17 13:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-14 10:30 [PATCH] Move <rpc/netdb.h> from sunrpc to inet Florian Weimer
2020-07-14 11:54 ` Andreas Schwab
2020-07-14 12:20 ` Florian Weimer
2020-07-17 7:53 ` Szabolcs Nagy
2020-07-17 7:56 ` Florian Weimer
2020-07-17 13:15 ` Carlos O'Donell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).