svn commit: r368692 - in head: include/xlocale lib/libc/include lib/libc/nls lib/libc/string

[Antoine Brodin]

On Thu, Dec 17, 2020 at 11:07 AM Konstantin Belousov
<kostikbel at gmail.com> wrote:
>
> On Thu, Dec 17, 2020 at 10:32:14AM +0100, Antoine Brodin wrote:
> > On Wed, Dec 16, 2020 at 10:02 AM Konstantin Belousov <kib at freebsd.org> wrote:
> > >
> > > Author: kib
> > > Date: Wed Dec 16 09:02:09 2020
> > > New Revision: 368692
> > > URL: https://svnweb.freebsd.org/changeset/base/368692
> > >
> > > Log:
> > >   Implement strerror_l().
> > >
> > >   Only for the arches that provide user-mode TLS.
> > >
> > >   PR: 251651
> > >   Requested by: yuri
> > >   Discussed with:       emaste, jilles, tijl
> > >   Sponsored by: The FreeBSD Foundation
> > >   Differential revision:        https://reviews.freebsd.org/D27495
> > >   MFC after:    2 weeks
> >
> > Hi,
> >
> > It seems that this change broke some ports.
> > For instance:
> > http://gohan03.nyi.freebsd.org/data/head-amd64-default-baseline/p558245_s368709/logs/errors/p11-kit-0.23.22.log
>
> p11-kit does strange/stupid thing.  It checks for strerror_l() without
> namespace restriction, but then in common/message.c, before actually using it,
> it does
> #define _POSIX_C_SOURCE 200112L
>
> Could you please try the following, which might be a right thing to do
> regardless p11-kit quirk.

Hi,

This change fixes p11-kit.

Cheers,

Antoine

> diff --git a/include/string.h b/include/string.h
> index 3c5cceaeb85..774cf5fe975 100644
> --- a/include/string.h
> +++ b/include/string.h
> @@ -140,7 +140,7 @@ int  timingsafe_bcmp(const void *, const void *, size_t);
>  int     timingsafe_memcmp(const void *, const void *, size_t);
>  #endif /* __BSD_VISIBLE */
>
> -#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
> +#if __POSIX_VISIBLE >= 200112 || defined(_XLOCALE_H_)
>  #include <xlocale/_string.h>
>  #endif
>