3 files changed, 21 insertions, 6 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 0a4c14cb95c..17c56dc7e9e 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -152,7 +152,6 @@ HAVE_ENVIRON_DECL
 HAVE_EUIDACCESS
 HAVE_FCNTL_H
 HAVE_FORK
-HAVE_FPATHCONF
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 496e1c1bb6a..4eb413e948f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,16 @@
+2012-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove no-longer-used pty_max_bytes variable.
+        * CPP-DEFINES (HAVE_FPATHCONF): Remove.
+
+2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use faccessat, not access, when checking file permissions (Bug#12632).
+        * merge-gnulib (GNULIB_MODULES): Add faccessat.
+        (GNULIB_TOOL_FLAGS): Avoid at-internal, fchdir, malloc-posix,
+        openat-die, openat-h, save-cwd.  Do not avoid fcntl-h.
+        Omit gnulib's m4/fcntl-o.m4.
+
 2012-11-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume at least POSIX.1-1988 for getpgrp, setpgid, setsid (Bug#12800).
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 901daf4e442..f7a675e5101 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -28,7 +28,7 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dtotimespec dup2 environ execinfo
+  dtoastr dtotimespec dup2 environ execinfo faccessat
   filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings mktime pselect pthread_sigmask readlink
@@ -39,9 +39,12 @@ GNULIB_MODULES='
 '
 
 GNULIB_TOOL_FLAGS='
-  --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat
-  --avoid=msvc-inval --avoid=msvc-nothrow
-  --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types
+  --avoid=at-internal
+  --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
+  --avoid=openat-die --avoid=openat-h
+  --avoid=raise
+  --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
   --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk
@@ -85,7 +88,7 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
 }
 
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
-rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
+rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
 autoreconf -i -I m4 -- ${src:+"$src"}