Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28. Based on this upstream gnulib patch: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e --- a/liboath/gl/fflush.c +++ b/liboath/gl/fflush.c @@ -33,7 +33,7 @@ #undef fflush -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ static void @@ -72,7 +72,7 @@ #endif -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ @@ -148,7 +148,7 @@ if (stream == NULL || ! freading (stream)) return fflush (stream); -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ clear_ungetc_buffer_preserving_position (stream); --- a/liboath/gl/fpurge.c +++ b/liboath/gl/fpurge.c @@ -62,7 +62,7 @@ /* Most systems provide FILE as a struct and the necessary bitmask in , 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_IO_read_end = fp->_IO_read_ptr; fp->_IO_write_ptr = fp->_IO_write_base; /* Avoid memory leak when there is an active ungetc buffer. */ --- a/libaoth/gl/freading.c +++ b/liboath/gl/freading.c @@ -31,7 +31,7 @@ /* Most systems provide FILE as a struct and the necessary bitmask in , 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); --- a/liboath/gl/fseeko.c +++ b/liboath/gl/fseeko.c @@ -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 || __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) @@ -123,7 +123,7 @@ return -1; } -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ --- a/liboath/gl/stdio-impl.h +++ b/liboath/gl/stdio-impl.h @@ -18,6 +18,11 @@ 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, so define it here for now. */ +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN +# define _IO_IN_BACKUP 0x100 +#endif + /* BSD stdio derived implementations. */ #if defined __NetBSD__ /* NetBSD */ 005609c1717ead0c16ad6fba1577b0305df9f1a9'>images: novena: Make boot settings and RTC accessible....Danny Milosavljevic 2020-12-03images: novena: Replace agetty-service by term-auto....Danny Milosavljevic 2020-12-03images: Add novena-image-type, novena-barebones-raw-image, novena-barebones-os....Danny Milosavljevic 2020-11-20image: Add pinebook-pro support....Mathieu Othacehe 2020-10-06images: Add pine64-barebones-raw-image....Mathieu Othacehe 2020-10-05images: Add pine64 support....Mathieu Othacehe 2020-09-30system: image: Add image-type support....Mathieu Othacehe 2020-09-29images: hurd: Add hurd-barebones-qcow2-image....Mathieu Othacehe 2020-07-11image: Do not set journal_model=WAL for the Hurd....Jan (janneke) Nieuwenhuizen 2020-06-25image: hurd: Initialize root partition for the Hurd....Jan (janneke) Nieuwenhuizen 2020-06-25image: hurd: Create hurd-compatible ext2 file-system....Jan (janneke) Nieuwenhuizen 2020-06-24image: Move hurd image definition to a dedicated file....Mathieu Othacehe