Hello,
While trying to find out the first version with the 'seq' bug
(my previous email), I realized it has become quite hard to build
old coreutils version on newer glibc system.
In particular:
1. At some point 'gets' was removed from glibc, but old sources refer it.
2. Older gnulib used internal glibc symbols (libio.h) and the detection
method changed (_IO_ftrylockfile vs _IO_EOF_SEEN).
See: https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=74d9d6a2
3. Old coreutils defined 'futimens','tee','eaccess' functions which conflict
with later glibc functions of same name.
In short, it's not trivial to download a tarball from
https://ftp.gnu.org/gnu/coreutils/ and build it on modern systems
(and it seems even more complicated to build from git).
The attached patches enable building old tarballs on modern systems
(tested on Debian 10 with GLIBC 2.28-10, gcc 8.3.0-6).
The sequence should be:
wget https://ftp.gnu.org/gnu/coreutils/coreutils-5.97.tar.gz
tar -xf coreutils-5.97.tar.gz
cd coreutils-5.97
patch -p1 < ../coreutils-5.97-on-glibc-2.28.patch
./configure
make
Coreutils Versions Patch file
5.0 coreutils-5.0-on-glibc-2.28.patch
5.97 to 6.9 coreutils-5.97-on-glibc-2.28.patch
6.10 coreutils-6.10-on-glibc-2.28.patch
6.11 coreutils-6.11-on-glibc-2.28.patch
6.12 coreutils-6.12-on-glibc-2.28.patch
7.2 to 8.3 coreutils-7.2-on-glibc-2.28.patch
8.4 to 8.12 coreutils-8.4-on-glibc-2.28.patch
8.13 to 8.16 coreutils-8.13-on-glibc-2.28.patch
8.17 coreutils-8.17-on-glibc-2.28.patch
8.18 to 8.23 coreutils-8.18-on-glibc-2.28.patch
8.24 to 8.29 coreutils-8.24-on-glibc-2.28.patch
8.30 and newer [builds without patching]
Hope this helps someone.
regards,
- assaf
diff -r -U3 coreutils-5.0/src/Makefile.in coreutils-5.0-patched/src/Makefile.in
--- coreutils-5.0/src/Makefile.in 2003-04-02 07:46:19.000000000 -0700
+++ coreutils-5.0-patched/src/Makefile.in 2019-08-01 19:38:07.440997426
-0600
@@ -209,7 +209,7 @@
printf_LDADD = $(LDADD) @POW_LIB@ @LIBICONV@
# If necessary, add -lm to resolve use of floor, rint, modf.
-seq_LDADD = $(LDADD) @SEQ_LIBM@
+seq_LDADD = $(LDADD) @SEQ_LIBM@ -lm
# If necessary, add -lm to resolve the `pow' reference in lib/strtod.c
# or for the fesetround reference in programs using nanosec.c.
diff -r -U3 coreutils-5.0/src/tee.c coreutils-5.0-patched/src/tee.c
--- coreutils-5.0/src/tee.c 2002-12-15 07:21:45.000000000 -0700
+++ coreutils-5.0-patched/src/tee.c 2019-08-01 19:34:32.374301325 -0600
@@ -32,7 +32,7 @@
#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie")
-static int tee (int nfiles, const char **files);
+static int tee_FOO (int nfiles, const char **files);
/* If nonzero, append to output files rather than truncating them. */
static int append;
@@ -146,7 +146,7 @@
/* Do *not* warn if tee is given no file arguments.
POSIX requires that it work when given no arguments. */
- errs = tee (argc - optind, (const char **) &argv[optind]);
+ errs = tee_FOO (argc - optind, (const char **) &argv[optind]);
if (close (STDIN_FILENO) != 0)
error (EXIT_FAILURE, errno, _("standard input"));
@@ -158,7 +158,7 @@
Return 0 if successful, 1 if any errors occur. */
static int
-tee (int nfiles, const char **files)
+tee_FOO (int nfiles, const char **files)
{
FILE **descriptors;
char buffer[BUFSIZ];
diff -r -U3 coreutils-5.0/src/test.c coreutils-5.0-patched/src/test.c
--- coreutils-5.0/src/test.c 2003-02-10 02:19:09.000000000 -0700
+++ coreutils-5.0-patched/src/test.c 2019-08-01 19:35:52.871307966 -0600
@@ -139,7 +139,7 @@
/* Do the same thing access(2) does, but use the effective uid and gid. */
static int
-eaccess (char const *file, int mode)
+eaccess_FOO (char const *file, int mode)
{
static int have_ids;
static uid_t uid, euid;
@@ -635,17 +635,17 @@
case 'r': /* file is readable? */
unary_advance ();
- value = -1 != eaccess (argv[pos - 1], R_OK);
+ value = -1 != eaccess_FOO (argv[pos - 1], R_OK);
return (TRUE == value);
case 'w': /* File is writable? */
unary_advance ();
- value = -1 != eaccess (argv[pos - 1], W_OK);
+ value = -1 != eaccess_FOO (argv[pos - 1], W_OK);
return (TRUE == value);
case 'x': /* File is executable? */
unary_advance ();
- value = -1 != eaccess (argv[pos - 1], X_OK);
+ value = -1 != eaccess_FOO (argv[pos - 1], X_OK);
return (TRUE == value);
case 'O': /* File is owned by you? */
diff -r -U3 coreutils-6.4/lib/utimens.c coreutils-6.4-patched/lib/utimens.c
--- coreutils-6.4/lib/utimens.c 2006-09-14 03:53:59.000000000 -0600
+++ coreutils-6.4-patched/lib/utimens.c 2019-08-01 19:09:08.228883163 -0600
@@ -73,7 +73,7 @@
Return 0 on success, -1 (setting errno) on failure. */
int
-futimens (int fd ATTRIBUTE_UNUSED,
+futimens_FOO (int fd ATTRIBUTE_UNUSED,
char const *file, struct timespec const timespec[2])
{
/* There's currently no interface to set file timestamps with
@@ -166,5 +166,5 @@
int
utimens (char const *file, struct timespec const timespec[2])
{
- return futimens (-1, file, timespec);
+ return futimens_FOO (-1, file, timespec);
}
diff -r -U3 coreutils-6.4/lib/utimens.h coreutils-6.4-patched/lib/utimens.h
--- coreutils-6.4/lib/utimens.h 2004-11-23 14:39:48.000000000 -0700
+++ coreutils-6.4-patched/lib/utimens.h 2019-08-01 19:08:25.656313704 -0600
@@ -1,3 +1,3 @@
#include "timespec.h"
-int futimens (int, char const *, struct timespec const [2]);
+int futimens_FOO (int, char const *, struct timespec const [2]);
int utimens (char const *, struct timespec const [2]);
diff -r -U3 coreutils-6.4/src/copy.c coreutils-6.4-patched/src/copy.c
--- coreutils-6.4/src/copy.c 2006-10-22 10:54:15.000000000 -0600
+++ coreutils-6.4-patched/src/copy.c 2019-08-01 19:09:42.421340384 -0600
@@ -487,7 +487,7 @@
timespec[0] = get_stat_atime (src_sb);
timespec[1] = get_stat_mtime (src_sb);
- if (futimens (dest_desc, dst_name, timespec) != 0)
+ if (futimens_FOO (dest_desc, dst_name, timespec) != 0)
{
error (0, errno, _("preserving times for %s"), quote (dst_name));
if (x->require_preserve)
diff -r -U3 coreutils-6.4/src/touch.c coreutils-6.4-patched/src/touch.c
--- coreutils-6.4/src/touch.c 2006-10-22 10:54:15.000000000 -0600
+++ coreutils-6.4-patched/src/touch.c 2019-08-01 19:09:34.685236947 -0600
@@ -182,7 +182,7 @@
t = timespec;
}
- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+ ok = (futimens_FOO (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
if (fd == STDIN_FILENO)
{
diff -r -U3 coreutils-6.10/lib/freadahead.c
coreutils-6.10-patched/lib/freadahead.c
--- coreutils-6.10/lib/freadahead.c 2007-11-08 00:32:20.000000000 -0700
+++ coreutils-6.10-patched/lib/freadahead.c 2019-08-01 20:09:03.731243826
-0600
@@ -22,7 +22,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ferror_unlocked /* GNU libc, BeOS */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked /* GNU libc, BeOS
*/
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-6.10/lib/fseterr.c coreutils-6.10-patched/lib/fseterr.c
--- coreutils-6.10/lib/fseterr.c 2007-11-08 00:32:20.000000000 -0700
+++ coreutils-6.10-patched/lib/fseterr.c 2019-08-01 20:09:16.407416594
-0600
@@ -27,7 +27,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ferror_unlocked /* GNU libc, BeOS */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked /* GNU libc, BeOS
*/
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X,
Cygwin */
fp->_flags |= __SERR;
diff -r -U3 coreutils-6.11/lib/freadahead.c
coreutils-6.11-patched/lib/freadahead.c
--- coreutils-6.11/lib/freadahead.c 2008-04-17 03:59:17.000000000 -0600
+++ coreutils-6.11-patched/lib/freadahead.c 2019-08-01 20:20:12.712193242
-0600
@@ -19,10 +19,17 @@
/* Specification. */
#include "freadahead.h"
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
+
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-6.11/lib/fseterr.c coreutils-6.11-patched/lib/fseterr.c
--- coreutils-6.11/lib/fseterr.c 2008-04-17 03:59:17.000000000 -0600
+++ coreutils-6.11-patched/lib/fseterr.c 2019-08-01 20:20:37.868480486
-0600
@@ -27,7 +27,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X,
Cygwin */
fp->_flags |= __SERR;
diff -r -U3 coreutils-6.12/lib/freadahead.c
coreutils-6.12-patched/lib/freadahead.c
--- coreutils-6.12/lib/freadahead.c 2008-05-14 06:53:25.000000000 -0600
+++ coreutils-6.12-patched/lib/freadahead.c 2019-08-01 17:50:52.731658318
-0600
@@ -24,7 +24,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-6.12/lib/freadptr.c coreutils-6.12-patched/lib/freadptr.c
--- coreutils-6.12/lib/freadptr.c 2008-05-14 06:53:25.000000000 -0600
+++ coreutils-6.12-patched/lib/freadptr.c 2019-08-01 17:51:06.867856472
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-6.12/lib/freadseek.c
coreutils-6.12-patched/lib/freadseek.c
--- coreutils-6.12/lib/freadseek.c 2008-05-14 06:53:25.000000000 -0600
+++ coreutils-6.12-patched/lib/freadseek.c 2019-08-01 17:51:21.264058094
-0600
@@ -34,7 +34,7 @@
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-6.12/lib/fseterr.c coreutils-6.12-patched/lib/fseterr.c
--- coreutils-6.12/lib/fseterr.c 2008-05-14 06:53:25.000000000 -0600
+++ coreutils-6.12-patched/lib/fseterr.c 2019-08-01 17:51:36.668273645
-0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ferror_unlocked || __GNU_LIBRARY__ ==
1 /* GNU libc, BeOS, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-6.12/lib/stdio-impl.h
coreutils-6.12-patched/lib/stdio-impl.h
--- coreutils-6.12/lib/stdio-impl.h 2008-05-14 06:53:25.000000000 -0600
+++ coreutils-6.12-patched/lib/stdio-impl.h 2019-08-01 17:49:51.518798189
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-7.6/lib/freadahead.c
coreutils-7.6-patched/lib/freadahead.c
--- coreutils-7.6/lib/freadahead.c 2009-05-03 23:46:33.000000000 -0600
+++ coreutils-7.6-patched/lib/freadahead.c 2019-08-01 17:30:54.589238442
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-7.6/lib/freadptr.c coreutils-7.6-patched/lib/freadptr.c
--- coreutils-7.6/lib/freadptr.c 2009-05-03 23:46:33.000000000 -0600
+++ coreutils-7.6-patched/lib/freadptr.c 2019-08-01 17:34:10.692659598
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-7.6/lib/freadseek.c coreutils-7.6-patched/lib/freadseek.c
--- coreutils-7.6/lib/freadseek.c 2009-05-03 23:46:33.000000000 -0600
+++ coreutils-7.6-patched/lib/freadseek.c 2019-08-01 17:34:41.013164702
-0600
@@ -34,7 +34,7 @@
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-7.6/lib/fseeko.c coreutils-7.6-patched/lib/fseeko.c
--- coreutils-7.6/lib/fseeko.c 2009-08-09 10:16:11.000000000 -0600
+++ coreutils-7.6-patched/lib/fseeko.c 2019-08-01 17:36:11.030633785 -0600
@@ -44,7 +44,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-7.6/lib/fseterr.c coreutils-7.6-patched/lib/fseterr.c
--- coreutils-7.6/lib/fseterr.c 2009-05-03 23:46:33.000000000 -0600
+++ coreutils-7.6-patched/lib/fseterr.c 2019-08-01 17:34:57.285433551 -0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-7.6/lib/stdio-impl.h
coreutils-7.6-patched/lib/stdio-impl.h
--- coreutils-7.6/lib/stdio-impl.h 2009-05-03 23:46:34.000000000 -0600
+++ coreutils-7.6-patched/lib/stdio-impl.h 2019-08-01 17:32:36.431051254
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-8.5/lib/freadahead.c
coreutils-8.5-patched/lib/freadahead.c
--- coreutils-8.5/lib/freadahead.c 2010-04-23 07:44:00.000000000 -0600
+++ coreutils-8.5-patched/lib/freadahead.c 2019-08-01 18:35:31.580843463
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-8.5/lib/freadptr.c coreutils-8.5-patched/lib/freadptr.c
--- coreutils-8.5/lib/freadptr.c 2010-04-23 07:44:00.000000000 -0600
+++ coreutils-8.5-patched/lib/freadptr.c 2019-08-01 18:35:31.580843463
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-8.5/lib/freadseek.c coreutils-8.5-patched/lib/freadseek.c
--- coreutils-8.5/lib/freadseek.c 2010-04-23 07:44:00.000000000 -0600
+++ coreutils-8.5-patched/lib/freadseek.c 2019-08-01 18:35:31.580843463
-0600
@@ -34,7 +34,7 @@
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-8.5/lib/fseeko.c coreutils-8.5-patched/lib/fseeko.c
--- coreutils-8.5/lib/fseeko.c 2010-04-21 12:11:48.000000000 -0600
+++ coreutils-8.5-patched/lib/fseeko.c 2019-08-01 18:35:31.580843463 -0600
@@ -42,7 +42,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-8.5/lib/fseterr.c coreutils-8.5-patched/lib/fseterr.c
--- coreutils-8.5/lib/fseterr.c 2010-04-23 07:44:00.000000000 -0600
+++ coreutils-8.5-patched/lib/fseterr.c 2019-08-01 18:35:31.584843515 -0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-8.5/lib/stdio-impl.h
coreutils-8.5-patched/lib/stdio-impl.h
--- coreutils-8.5/lib/stdio-impl.h 2010-04-23 07:44:01.000000000 -0600
+++ coreutils-8.5-patched/lib/stdio-impl.h 2019-08-01 18:35:31.584843515
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-8.5/lib/stdio.in.h coreutils-8.5-patched/lib/stdio.in.h
--- coreutils-8.5/lib/stdio.in.h 2010-04-21 12:11:57.000000000 -0600
+++ coreutils-8.5-patched/lib/stdio.in.h 2019-08-01 18:26:34.113941755
-0600
@@ -139,7 +139,7 @@
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
diff -r -U3 coreutils-8.13/lib/freadahead.c
coreutils-8.13-patched/lib/freadahead.c
--- coreutils-8.13/lib/freadahead.c 2011-08-19 10:09:37.000000000 -0600
+++ coreutils-8.13-patched/lib/freadahead.c 2019-08-01 19:02:30.847557265
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-8.13/lib/freadptr.c coreutils-8.13-patched/lib/freadptr.c
--- coreutils-8.13/lib/freadptr.c 2011-08-19 10:09:37.000000000 -0600
+++ coreutils-8.13-patched/lib/freadptr.c 2019-08-01 19:02:30.851557318
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-8.13/lib/freadseek.c
coreutils-8.13-patched/lib/freadseek.c
--- coreutils-8.13/lib/freadseek.c 2011-08-19 10:09:37.000000000 -0600
+++ coreutils-8.13-patched/lib/freadseek.c 2019-08-01 19:02:30.851557318
-0600
@@ -34,7 +34,7 @@
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-8.13/lib/fseeko.c coreutils-8.13-patched/lib/fseeko.c
--- coreutils-8.13/lib/fseeko.c 2011-08-12 02:05:46.000000000 -0600
+++ coreutils-8.13-patched/lib/fseeko.c 2019-08-01 19:02:30.851557318 -0600
@@ -42,7 +42,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-8.13/lib/fseterr.c coreutils-8.13-patched/lib/fseterr.c
--- coreutils-8.13/lib/fseterr.c 2011-08-19 10:09:37.000000000 -0600
+++ coreutils-8.13-patched/lib/fseterr.c 2019-08-01 19:02:30.851557318
-0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-8.13/lib/stdio-impl.h
coreutils-8.13-patched/lib/stdio-impl.h
--- coreutils-8.13/lib/stdio-impl.h 2011-04-24 11:21:45.000000000 -0600
+++ coreutils-8.13-patched/lib/stdio-impl.h 2019-08-01 19:02:30.851557318
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-8.13/lib/stdio.in.h coreutils-8.13-patched/lib/stdio.in.h
--- coreutils-8.13/lib/stdio.in.h 2011-06-17 02:06:20.000000000 -0600
+++ coreutils-8.13-patched/lib/stdio.in.h 2019-08-01 19:03:47.484586570
-0600
@@ -697,7 +697,7 @@
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+/* _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); */
#endif
diff -r -U3 coreutils-8.17/lib/freadahead.c
coreutils-8.17-patched/lib/freadahead.c
--- coreutils-8.17/lib/freadahead.c 2012-02-11 02:43:22.000000000 -0700
+++ coreutils-8.17-patched/lib/freadahead.c 2019-08-01 19:19:11.975280339
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-8.17/lib/freadptr.c coreutils-8.17-patched/lib/freadptr.c
--- coreutils-8.17/lib/freadptr.c 2012-02-11 02:43:22.000000000 -0700
+++ coreutils-8.17-patched/lib/freadptr.c 2019-08-01 19:19:11.975280339
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-8.17/lib/freadseek.c
coreutils-8.17-patched/lib/freadseek.c
--- coreutils-8.17/lib/freadseek.c 2012-02-11 02:43:22.000000000 -0700
+++ coreutils-8.17-patched/lib/freadseek.c 2019-08-01 19:19:11.975280339
-0600
@@ -34,7 +34,7 @@
freadptrinc (FILE *fp, size_t increment)
{
/* Keep this code in sync with freadptr! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-8.17/lib/fseeko.c coreutils-8.17-patched/lib/fseeko.c
--- coreutils-8.17/lib/fseeko.c 2012-05-04 03:04:45.000000000 -0600
+++ coreutils-8.17-patched/lib/fseeko.c 2019-08-01 19:19:11.975280339 -0600
@@ -47,7 +47,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-8.17/lib/fseterr.c coreutils-8.17-patched/lib/fseterr.c
--- coreutils-8.17/lib/fseterr.c 2012-02-11 02:43:22.000000000 -0700
+++ coreutils-8.17-patched/lib/fseterr.c 2019-08-01 19:19:11.975280339
-0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-8.17/lib/stdio-impl.h
coreutils-8.17-patched/lib/stdio-impl.h
--- coreutils-8.17/lib/stdio-impl.h 2012-02-11 02:43:22.000000000 -0700
+++ coreutils-8.17-patched/lib/stdio-impl.h 2019-08-01 19:19:11.975280339
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-8.17/lib/stdio.in.h coreutils-8.17-patched/lib/stdio.in.h
--- coreutils-8.17/lib/stdio.in.h 2012-05-04 03:04:48.000000000 -0600
+++ coreutils-8.17-patched/lib/stdio.in.h 2019-08-01 19:19:37.183560130
-0600
@@ -704,7 +704,7 @@
removed it. */
#undef gets
#if HAVE_RAW_DECL_GETS
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
#endif
diff -r -U3 coreutils-8.18/lib/freadahead.c
coreutils-8.18-patched/lib/freadahead.c
--- coreutils-8.18/lib/freadahead.c 2012-07-15 06:26:12.000000000 -0600
+++ coreutils-8.18-patched/lib/freadahead.c 2019-08-01 19:22:13.169332844
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-8.18/lib/freadptr.c coreutils-8.18-patched/lib/freadptr.c
--- coreutils-8.18/lib/freadptr.c 2012-07-15 06:26:12.000000000 -0600
+++ coreutils-8.18-patched/lib/freadptr.c 2019-08-01 19:22:13.169332844
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-8.18/lib/freadseek.c
coreutils-8.18-patched/lib/freadseek.c
--- coreutils-8.18/lib/freadseek.c 2012-07-15 06:26:12.000000000 -0600
+++ coreutils-8.18-patched/lib/freadseek.c 2019-08-01 19:23:20.070111747
-0600
@@ -36,7 +36,7 @@
/* Keep this code in sync with freadptr! */
#if HAVE___FREADPTRINC /* musl libc */
__freadptrinc (fp, increment);
-#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
+#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_p += increment;
diff -r -U3 coreutils-8.18/lib/fseeko.c coreutils-8.18-patched/lib/fseeko.c
--- coreutils-8.18/lib/fseeko.c 2012-07-13 08:18:33.000000000 -0600
+++ coreutils-8.18-patched/lib/fseeko.c 2019-08-01 19:22:13.169332844 -0600
@@ -47,7 +47,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-8.18/lib/fseterr.c coreutils-8.18-patched/lib/fseterr.c
--- coreutils-8.18/lib/fseterr.c 2012-07-15 06:26:12.000000000 -0600
+++ coreutils-8.18-patched/lib/fseterr.c 2019-08-01 19:22:13.169332844
-0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_flags |= __SERR;
diff -r -U3 coreutils-8.18/lib/stdio-impl.h
coreutils-8.18-patched/lib/stdio-impl.h
--- coreutils-8.18/lib/stdio-impl.h 2012-07-15 06:26:12.000000000 -0600
+++ coreutils-8.18-patched/lib/stdio-impl.h 2019-08-01 19:22:13.169332844
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
diff -r -U3 coreutils-8.18/lib/stdio.in.h coreutils-8.18-patched/lib/stdio.in.h
--- coreutils-8.18/lib/stdio.in.h 2012-06-12 14:43:46.000000000 -0600
+++ coreutils-8.18-patched/lib/stdio.in.h 2019-08-01 19:22:13.169332844
-0600
@@ -704,7 +704,7 @@
removed it. */
#undef gets
#if HAVE_RAW_DECL_GETS
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
#endif
diff -r -U3 coreutils-8.24/lib/freadahead.c
coreutils-8.24-patched/lib/freadahead.c
--- coreutils-8.24/lib/freadahead.c 2015-06-15 23:00:37.000000000 -0600
+++ coreutils-8.24-patched/lib/freadahead.c 2019-08-01 19:47:31.412646436
-0600
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -r -U3 coreutils-8.24/lib/freadptr.c coreutils-8.24-patched/lib/freadptr.c
--- coreutils-8.24/lib/freadptr.c 2015-06-15 23:00:37.000000000 -0600
+++ coreutils-8.24-patched/lib/freadptr.c 2019-08-01 19:47:31.416646500
-0600
@@ -29,7 +29,7 @@
size_t size;
/* Keep this code in sync with freadahead! */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return NULL;
size = fp->_IO_read_end - fp->_IO_read_ptr;
diff -r -U3 coreutils-8.24/lib/freadseek.c
coreutils-8.24-patched/lib/freadseek.c
--- coreutils-8.24/lib/freadseek.c 2015-06-15 23:00:37.000000000 -0600
+++ coreutils-8.24-patched/lib/freadseek.c 2019-08-01 19:47:31.416646500
-0600
@@ -36,7 +36,7 @@
/* Keep this code in sync with freadptr! */
#if HAVE___FREADPTRINC /* musl libc */
__freadptrinc (fp, increment);
-#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
+#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
diff -r -U3 coreutils-8.24/lib/fseeko.c coreutils-8.24-patched/lib/fseeko.c
--- coreutils-8.24/lib/fseeko.c 2015-06-15 23:04:31.000000000 -0600
+++ coreutils-8.24-patched/lib/fseeko.c 2019-08-01 19:47:31.416646500 -0600
@@ -47,7 +47,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
diff -r -U3 coreutils-8.24/lib/fseterr.c coreutils-8.24-patched/lib/fseterr.c
--- coreutils-8.24/lib/fseterr.c 2015-06-15 23:00:37.000000000 -0600
+++ coreutils-8.24-patched/lib/fseterr.c 2019-08-01 19:47:31.416646500
-0600
@@ -29,7 +29,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
/* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
diff -r -U3 coreutils-8.24/lib/mountlist.c
coreutils-8.24-patched/lib/mountlist.c
--- coreutils-8.24/lib/mountlist.c 2015-07-01 09:08:30.000000000 -0600
+++ coreutils-8.24-patched/lib/mountlist.c 2019-08-01 19:49:22.354401380
-0600
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
+#include <sys/sysmacros.h>
#include "xalloc.h"
diff -r -U3 coreutils-8.24/lib/stdio-impl.h
coreutils-8.24-patched/lib/stdio-impl.h
--- coreutils-8.24/lib/stdio-impl.h 2015-06-15 23:00:37.000000000 -0600
+++ coreutils-8.24-patched/lib/stdio-impl.h 2019-08-01 19:47:31.416646500
-0600
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ * problem by defining it ourselves. FIXME: Do not rely on glibc
+ * internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */
