On 02/24/2012 07:39 PM, Eric Blake wrote:
It's been a while, and we're between releases, so now's
as good
a time as any to resync. I didn't notice any showstopper bugs
being fixed, but we definitely get some improvements, such as
tighter syntax checks.
I just noticed this hasn't been ACKed/pushed yet.
Sounds like a good idea to me. ACK.
* .gnulib: Update to latest.
* bootstrap: Resync.
* cfg.mk (sc_prohibit_strncmp): Copy upstream changes to
sc_prohibit_strcmp.
---
* .gnulib e9e8aba...be29134 (47):
> stdalign: @samp -> @code in doc for consistency
> stdnoreturn: new module
> regex: fix false multibyte matches in some regular expressions
> maint.mk: tell sc_prohibit_strcmp to ding "0 == strcmp (...)", too
> streq: Rename macro.
> regex: fix typo in definition of MIN
> acl: Don't use ACL_CNT and similar ops, since they are unreliable.
> acl: Don't use GETACLCNT and similar ops, since they are unreliable.
> acl: Fix endless loop on Solaris with vxfs.
> acl: Fix copy-acl test failure on Solaris 11 2011-11.
> acl: Update doc references.
> Fix test failure in many locales on Solaris 11.
> gnulib-tool: Improve usage message.
> autoupdate
> README-release: make it easier to execute commands
> GNUmakefile: simplify detection of unconfigured trees
> autoupdate
> autoupdate
> autoupdate
> gnulib-tool: Doc fix.
> bootstrap: don't exit 0 upon gnulib-tool failure
> README-release: various improvements
> autoupdate
> maint: replace FSF snail-mail addresses with URLs
> README-release: capitalize a word and split a line
> fatal-signal: use C prototypes (with explicit void).
> regex: spelling fix
> regex: rely on stdint.h for SIZE_MAX
> regex: merge glibc changes
> maint.mk: also prohibit lower-case @var@
> autoupdate
> maint: spelling fixes
> canonicalize: avoid uninitialized memory use
> isatty: Fix test failure of ptsname_r on native Windows.
> spawn-pipe tests: Fix a NULL program name in a diagnostic.
> nonblocking-socket tests: Fix a NULL program name in a diagnostic.
> nonblocking-pipe tests: Fix a NULL program name in a diagnostic.
> canonicalize-lgpl: fix // handling
> canonicalize: fix // handling
> ioctl: Fix test failure on native Windows.
> fsync: Avoid test failure on native Windows.
> * lib/sys_select.in.h [OpenBSD]: When /usr/include/pthread.h is
> sys_select: Avoid syntax error on OpenBSD 5.0.
> get-rusage-as, get-rusage-data tests: Avoid test failure with gcc-4.7.
> stdioext: Fix last commit.
> stdioext: Add tentative support for Plan9.
> file-has-acl: suppress a warning from gcc -Wsuggest-attribute=const
.gnulib | 2 +-
bootstrap | 6 +++---
cfg.mk | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gnulib b/.gnulib
index e9e8aba..be29134 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit e9e8aba12af3c903edd422fa036a356c5b2f313a
+Subproject commit be29134ddd011e6bcf1d73b4ae3d7ee7da60276f
diff --git a/bootstrap b/bootstrap
index 6910abf..31eb651 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-01-21.16; # UTC
+scriptversion=2012-02-11.09; # UTC
# Bootstrap this package from checked-out sources.
@@ -423,7 +423,7 @@ check_versions() {
$use_git || continue
fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+ appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR
case $appvar in
GZIP) ;; # Do not use $GZIP: it contains gzip options.
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
fi
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
# Get translations.
diff --git a/cfg.mk b/cfg.mk
index 9759d87..ac6c527 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -346,8 +346,9 @@ sc_prohibit_access_xok:
# Similar to the gnulib maint.mk rule for sc_prohibit_strcmp
# Use STREQLEN or STRPREFIX rather than comparing strncmp == 0, or != 0.
+snp_ = strncmp *\(.+\)
sc_prohibit_strncmp:
- @grep -nE '! *str''ncmp *\(|\<str''ncmp *\(.+\) *[!=]=' \
+ @grep -nE '! *strncmp *\(|\<$(snp_) *[!=]=|[!=]= *$(snp_)' \
$$($(VC_LIST_EXCEPT)) \
| grep -vE ':# *define STR(N?EQLEN|PREFIX)\(' && \
{ echo '$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \