slackware-current/source/d/m4/m4.glibc228.diff
Patrick J Volkerding 48e09f463d Fri Sep 21 18:51:07 UTC 2018
a/eudev-3.2.6-x86_64-1.txz:  Upgraded.
a/glibc-solibs-2.28-x86_64-2.txz:  Upgraded.
a/grub-2.02-x86_64-3.txz:  Rebuilt.
  Patched to fix compatibility with recent xfsprogs. Thanks to Markus Wiesner.
a/kernel-generic-4.14.71-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.71-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.71-x86_64-1.txz:  Upgraded.
ap/opus-tools-0.2-x86_64-1.txz:  Upgraded.
ap/sqlite-3.25.1-x86_64-1.txz:  Upgraded.
d/icecream-20180905_cdc6ff8-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.71-x86-1.txz:  Upgraded.
d/llvm-7.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
k/kernel-source-4.14.71-noarch-1.txz:  Upgraded.
l/ffmpeg-3.4.4-x86_64-2.txz:  Rebuilt.
  Don't try to link with Samba since the latest version is not compatible.
l/glibc-2.28-x86_64-2.txz:  Upgraded.
  All packages have been patched where needed for glibc-2.28 and compile
  tested here. Thanks to nobodino for the help.
l/glibc-i18n-2.28-x86_64-2.txz:  Upgraded.
l/glibc-profile-2.28-x86_64-2.txz:  Upgraded.
l/gst-plugins-base-1.14.3-x86_64-1.txz:  Upgraded.
l/gst-plugins-good-1.14.3-x86_64-1.txz:  Upgraded.
l/gst-plugins-libav-1.14.3-x86_64-1.txz:  Upgraded.
l/gstreamer-1.14.3-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_11-x86_64-1.txz:  Upgraded.
l/libopusenc-0.2-x86_64-1.txz:  Added.
l/librsvg-2.44.3-x86_64-1.txz:  Upgraded.
l/opus-1.3_rc2-x86_64-1.txz:  Upgraded.
l/opusfile-0.11-x86_64-1.txz:  Upgraded.
l/soprano-2.9.4-x86_64-3.txz:  Rebuilt.
  Recompiled to drop virtuoso dependency.
l/virtuoso-ose-6.1.8-x86_64-9.txz:  Removed.
  Even KDE4 has migrated away from actually using this for anything. The last
  thing in Slackware that was dependent on it was Soprano, which has been
  recompiled to no longer use it.
n/postfix-3.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled so that it quits whining about OpenSSL. Thanks to shastah.
x/mesa-18.2.1-x86_64-1.txz:  Upgraded.
  Compiled against llvm-7.0.0.
x/xf86-video-vmware-13.3.0-x86_64-2.txz:  Rebuilt.
  Recompiled against llvm-7.0.0.
x/xterm-336-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/ffmpeg-3.4.4-x86_64-2_alsa.txz:  Rebuilt.
  Don't try to link with Samba since the latest version is not compatible.
extra/pure-alsa-system/gst-plugins-good-1.14.3-x86_64-1_alsa.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2018-09-22 09:00:39 +02:00

108 lines
5 KiB
Diff

--- ./lib/stdio-impl.h.orig 2016-12-31 07:54:42.000000000 -0600
+++ ./lib/stdio-impl.h 2018-09-18 18:53:02.236064705 -0500
@@ -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. */
--- ./lib/freading.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/freading.c 2018-09-18 18:53:02.234064705 -0500
@@ -31,7 +31,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 || __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));
--- ./lib/fflush.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/fflush.c 2018-09-18 18:53:02.229064705 -0500
@@ -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);
--- ./lib/freadahead.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/freadahead.c 2018-09-18 18:53:02.234064705 -0500
@@ -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 || __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)
--- ./lib/fpending.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/fpending.c 2018-09-18 18:53:02.231064705 -0500
@@ -32,7 +32,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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return fp->_IO_write_ptr - fp->_IO_write_base;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
--- ./lib/fpurge.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/fpurge.c 2018-09-18 18:53:02.233064705 -0500
@@ -62,7 +62,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 || __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. */
--- ./lib/fseeko.c.orig 2016-12-31 07:54:41.000000000 -0600
+++ ./lib/fseeko.c 2018-09-18 18:53:02.235064705 -0500
@@ -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__