This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.27/master updated. glibc-2.27-53-g0cd4a5e
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 May 2018 06:42:55 -0000
- Subject: GNU C Library master sources branch release/2.27/master updated. glibc-2.27-53-g0cd4a5e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.27/master has been updated
via 0cd4a5e87f6885a2f15fe8e7eb7378d010cdb606 (commit)
from 8af3185d3e0c4293fdd7251b0db4e4eefe92d08a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0cd4a5e87f6885a2f15fe8e7eb7378d010cdb606
commit 0cd4a5e87f6885a2f15fe8e7eb7378d010cdb606
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 15 08:21:11 2018 +0200
sunrpc: Remove stray exports without --enable-obsolete-rpc [BZ #23166]
This is needed to avoid a warning when linking against libtirpc:
/lib64/libc.so.6: warning: common of `rpc_createerr@@TIRPC_0.3.0' overridden by definition
/usr/lib64/libtirpc.so: warning: defined here
This ld warning is not enabled by default; -Wl,--warn-common enables it.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit 89aacb513eb77549a29df2638913a0f8178cf3f5)
diff --git a/ChangeLog b/ChangeLog
index 23675e7..fa0394c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-05-11 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #23166]
+ * include/rpc/clnt.h (rpc_createerr): Declare hidden alias.
+ * include/rpc/svc.h (svc_pollfd, svc_max_pollfd, svc_fdset):
+ Likewise.
+ * sunrpc/rpc_common.c (svc_fdset, rpc_createerr, svc_pollfd)
+ (svc_max_pollfd): Add nocommon attribute and hidden alias. Do not
+ export without --enable-obsolete-rpc.
+ * sunrpc/svcauth_des.c (svcauthdes_stats): Turn into compatibility
+ symbol. This should not have been exported, ever.
+
2018-05-11 Rafal Luzynski <digitalfreak@lingonborough.com>
[BZ #23152]
diff --git a/NEWS b/NEWS
index f82b94f..57f6714 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ The following bugs are resolved with this release:
[23137] s390: pthread_join sometimes block indefinitely (on 31bit and libc
build with -Os)
[23152] gd_GB: Fix typo in "May" (abbreviated)
+ [23166] sunrpc: Remove stray exports without --enable-obsolete-rpc
Version 2.27
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index a397023..80be0a9 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,6 +28,7 @@ libc_hidden_proto (clntudp_create)
libc_hidden_proto (get_myaddress)
libc_hidden_proto (clntunix_create)
libc_hidden_proto (__libc_clntudp_bufcreate)
+libc_hidden_proto (rpc_createerr)
# endif /* !_ISOMAC */
#endif
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 465bf44..40ba254 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -3,6 +3,10 @@
# ifndef _ISOMAC
+libc_hidden_proto (svc_pollfd)
+libc_hidden_proto (svc_max_pollfd)
+libc_hidden_proto (svc_fdset)
+
libc_hidden_proto (xprt_register)
libc_hidden_proto (xprt_unregister)
libc_hidden_proto (svc_register)
diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
index 7101911..2d42827 100644
--- a/sunrpc/rpc_common.c
+++ b/sunrpc/rpc_common.c
@@ -46,7 +46,14 @@
the variable is declared. So we use the section attribute. */
struct opaque_auth _null_auth __attribute__ ((nocommon));
libc_hidden_nolink_sunrpc (_null_auth, GLIBC_2_0)
-fd_set svc_fdset;
-struct rpc_createerr rpc_createerr;
-struct pollfd *svc_pollfd;
-int svc_max_pollfd;
+
+/* The variables need the nocommon attribute, so that it is possible
+ to create aliases and specify symbol versions. */
+fd_set svc_fdset __attribute__ ((nocommon));
+libc_hidden_nolink_sunrpc (svc_fdset, GLIBC_2_0)
+struct rpc_createerr rpc_createerr __attribute__ ((nocommon));
+libc_hidden_nolink_sunrpc (rpc_createerr, GLIBC_2_0)
+struct pollfd *svc_pollfd __attribute__ ((nocommon));
+libc_hidden_nolink_sunrpc (svc_pollfd, GLIBC_2_2)
+int svc_max_pollfd __attribute__ ((nocommon));
+libc_hidden_nolink_sunrpc (svc_max_pollfd, GLIBC_2_2)
diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
index f99a5a3..9ce4804 100644
--- a/sunrpc/svcauth_des.c
+++ b/sunrpc/svcauth_des.c
@@ -87,16 +87,21 @@ static void cache_ref (uint32_t sid); /* note that sid was ref'd */
static void invalidate (char *cred); /* invalidate entry in cache */
-/*
- * cache statistics
- */
+/* Cache statistics. Accidental historic export without a matching
+ declaration in any header file. */
+#ifndef SHARED
+static
+#endif
struct
{
u_long ncachehits; /* times cache hit, and is not replay */
u_long ncachereplays; /* times cache hit, and is replay */
u_long ncachemisses; /* times cache missed */
}
-svcauthdes_stats;
+svcauthdes_stats __attribute__ ((nocommon));
+#ifdef SHARED
+compat_symbol (libc, svcauthdes_stats, svcauthdes_stats, GLIBC_2_0);
+#endif
/*
* Service side authenticator for AUTH_DES
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 12 ++++++++++++
NEWS | 1 +
include/rpc/clnt.h | 1 +
include/rpc/svc.h | 4 ++++
sunrpc/rpc_common.c | 15 +++++++++++----
sunrpc/svcauth_des.c | 13 +++++++++----
6 files changed, 38 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources