From patchwork Tue Jul 14 10:30:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 40093 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EFD913857030; Tue, 14 Jul 2020 10:30:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFD913857030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594722615; bh=EIV2YVa33Kr8LDWeDBO+UF2/BU97vM1LBpGz4h9zZnw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=o3NbRzuT4NALZnGXSuyv08/KhsEnpPxQXd19ClePpqnKbg1jyU+T+28s42PG2qxQD R/eSt8Lw+mMhub03t5GfMFJpXaqbBC4JsNyYWMREHEy+07ea3FhmGadPi37WhDq38y LqmIJGPrVE09S9xy4OnOJueTrwvaF3Q24rojClF0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id CCA2F3858D37 for ; Tue, 14 Jul 2020 10:30:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CCA2F3858D37 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-11-gDV6T1ZhOrWW1t304ipBWA-1; Tue, 14 Jul 2020 06:30:08 -0400 X-MC-Unique: gDV6T1ZhOrWW1t304ipBWA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4779107BEF5; Tue, 14 Jul 2020 10:30:07 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-246.ams2.redhat.com [10.36.112.246]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33FFF72E67; Tue, 14 Jul 2020 10:30:07 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Move from sunrpc to inet Date: Tue, 14 Jul 2020 12:30:05 +0200 Message-ID: <871rlebd8y.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: Andreas Schwab Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Restore as an installed header. Delete the dummy header resolv/rpc/netdb.h because inet is not an optional glibc component (so its 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 +#include # 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 , which is included by . - This file is installed when the C library does not support the SunRPC - interfaces (including 'struct rpcent' et al) at all. */