CVS commit: pkgsrc/devel/m4

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/m4
From: "David H. Gutteridge" <gutteridge%netbsd.org@localhost>
Date: Sun, 6 Jan 2019 05:45:30 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Jan  6 05:45:30 UTC 2019

Modified Files:
        pkgsrc/devel/m4: distinfo
        pkgsrc/devel/m4/patches: patch-lib_fseeko.c patch-lib_stdio-impl.h
Added Files:
        pkgsrc/devel/m4/patches: patch-lib_fflush.c patch-lib_fpending.c
            patch-lib_fpurge.c patch-lib_freadahead.c patch-lib_freading.c

Log Message:
devel/m4: add patches to fix building with glibc >= 2.27

Addresses PR pkg/53826, further details are provided there. This is a
temporary fix, until the next m4 release. No PKGREVISION, because
there should be no change to existing packages, it addresses build
failures only.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/m4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/m4/patches/patch-lib_fflush.c \
    pkgsrc/devel/m4/patches/patch-lib_fpending.c \
    pkgsrc/devel/m4/patches/patch-lib_fpurge.c \
    pkgsrc/devel/m4/patches/patch-lib_freadahead.c \
    pkgsrc/devel/m4/patches/patch-lib_freading.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/m4/patches/patch-lib_fseeko.c \
    pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/m4/distinfo
diff -u pkgsrc/devel/m4/distinfo:1.45 pkgsrc/devel/m4/distinfo:1.46
--- pkgsrc/devel/m4/distinfo:1.45       Sun Oct 28 20:53:44 2018
+++ pkgsrc/devel/m4/distinfo    Sun Jan  6 05:45:29 2019
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.45 2018/10/28 20:53:44 sevan Exp $
+$NetBSD: distinfo,v 1.46 2019/01/06 05:45:29 gutteridge Exp $
 
 SHA1 (m4-1.4.18.tar.gz) = 2f76f8105a45b05c8cfede97b3193cd88b31c657
 RMD160 (m4-1.4.18.tar.gz) = 16396a6ffbb2105cdd0a36c773b44d16854ed740
 SHA512 (m4-1.4.18.tar.gz) = 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae
 Size (m4-1.4.18.tar.gz) = 2006643 bytes
 SHA1 (patch-isnan.c) = a960f35e5168bed47c5924e36bfb254dc1a44621
-SHA1 (patch-lib_fseeko.c) = d8531a1f7e0a941228deddc1eba522f0263ca783
+SHA1 (patch-lib_fflush.c) = 137acee69f093c4a97c9b35ef683785950af98c1
+SHA1 (patch-lib_fpending.c) = b44147cfc707be434237c6102a95290e3f444ae6
+SHA1 (patch-lib_fpurge.c) = 8c9f83d5f0be42bdddbb57b17b60a1108a6966f8
+SHA1 (patch-lib_freadahead.c) = 112fe7901d0103ab2336bd1a3455603ade99e202
+SHA1 (patch-lib_freading.c) = dd2497aaf6680cdc1fb76182bef193fae00a5333
+SHA1 (patch-lib_fseeko.c) = 6edb69d85da7c709ac952eab67cc14ef1fde7654
 SHA1 (patch-lib_getprogname.c) = 3a8e7c028342ef3a9f86839f1a5ae36571a65f12
-SHA1 (patch-lib_stdio-impl.h) = 8b58d52439a5f9d23043c22c702fd4c41f781fda
+SHA1 (patch-lib_stdio-impl.h) = 918520e029277a12e66b3644740ffca2e9754f38
 SHA1 (patch-lib_stdio.in.h) = 21557ea9d86dbeb36062df4e62cb71735b06480b
 SHA1 (patch-lib_vasnprintf.c) = 2bced6c121efc9bc5894174c7745ba89e8f53033
 SHA1 (patch-lib_xalloc-oversized.h) = 9e74adec2f43770d419f60d5c3e7bdea2424daa6

Index: pkgsrc/devel/m4/patches/patch-lib_fseeko.c
diff -u pkgsrc/devel/m4/patches/patch-lib_fseeko.c:1.1 pkgsrc/devel/m4/patches/patch-lib_fseeko.c:1.2
--- pkgsrc/devel/m4/patches/patch-lib_fseeko.c:1.1      Sun Oct 28 20:53:44 2018
+++ pkgsrc/devel/m4/patches/patch-lib_fseeko.c  Sun Jan  6 05:45:30 2019
@@ -1,10 +1,30 @@
-$NetBSD: patch-lib_fseeko.c,v 1.1 2018/10/28 20:53:44 sevan Exp $
+$NetBSD: patch-lib_fseeko.c,v 1.2 2019/01/06 05:45:30 gutteridge Exp $
 
 Treat Minix 3 same as NetBSD
 
---- lib/fseeko.c.orig  2018-10-28 20:33:23.728090000 +0000
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/fseeko.c.orig  2016-12-31 13:54:41.000000000 +0000
 +++ lib/fseeko.c
-@@ -128,7 +128,7 @@ fseeko (FILE *fp, off_t offset, int when
+@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int when
+ #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)
+@@ -123,12 +124,13 @@ fseeko (FILE *fp, off_t offset, int when
+           return -1;
+         }
+ 
+-#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_EOF_SEEN;
        fp->_offset = pos;
  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
        /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
Index: pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h
diff -u pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h:1.1 pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h:1.2
--- pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h:1.1  Sun Oct 28 20:53:44 2018
+++ pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h      Sun Jan  6 05:45:30 2019
@@ -1,10 +1,26 @@
-$NetBSD: patch-lib_stdio-impl.h,v 1.1 2018/10/28 20:53:44 sevan Exp $
+$NetBSD: patch-lib_stdio-impl.h,v 1.2 2019/01/06 05:45:30 gutteridge Exp $
 
 Treat Minix 3 same as NetBSD
 
---- lib/stdio-impl.h.orig      2018-10-28 20:27:54.933015000 +0000
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
+
+--- lib/stdio-impl.h.orig      2016-12-31 13:54:42.000000000 +0000
 +++ lib/stdio-impl.h
-@@ -58,7 +58,7 @@
+@@ -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.  */
+ 
+@@ -58,7 +64,7 @@
  #  define fp_ fp
  # endif
  

Added files:

Index: pkgsrc/devel/m4/patches/patch-lib_fflush.c
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_fflush.c:1.1
--- /dev/null   Sun Jan  6 05:45:30 2019
+++ pkgsrc/devel/m4/patches/patch-lib_fflush.c  Sun Jan  6 05:45:30 2019
@@ -0,0 +1,37 @@
+$NetBSD: patch-lib_fflush.c,v 1.1 2019/01/06 05:45:30 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/fflush.c.orig  2016-12-31 13:54:41.000000000 +0000
++++ lib/fflush.c
+@@ -33,7 +33,8 @@
+ #undef fflush
+ 
+ 
+-#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 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,8 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#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 (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,8 @@ rpl_fflush (FILE *stream)
+   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 || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
Index: pkgsrc/devel/m4/patches/patch-lib_fpending.c
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_fpending.c:1.1
--- /dev/null   Sun Jan  6 05:45:30 2019
+++ pkgsrc/devel/m4/patches/patch-lib_fpending.c        Sun Jan  6 05:45:30 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_fpending.c,v 1.1 2019/01/06 05:45:30 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/fpending.c.orig        2016-12-31 13:54:41.000000000 +0000
++++ lib/fpending.c
+@@ -32,7 +32,8 @@ __fpending (FILE *fp)
+   /* 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 */
+   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 */
Index: pkgsrc/devel/m4/patches/patch-lib_fpurge.c
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_fpurge.c:1.1
--- /dev/null   Sun Jan  6 05:45:30 2019
+++ pkgsrc/devel/m4/patches/patch-lib_fpurge.c  Sun Jan  6 05:45:30 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_fpurge.c,v 1.1 2019/01/06 05:45:30 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/fpurge.c.orig  2016-12-31 13:54:41.000000000 +0000
++++ lib/fpurge.c
+@@ -62,7 +62,8 @@ fpurge (FILE *fp)
+   /* 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->_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.  */
Index: pkgsrc/devel/m4/patches/patch-lib_freadahead.c
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_freadahead.c:1.1
--- /dev/null   Sun Jan  6 05:45:30 2019
+++ pkgsrc/devel/m4/patches/patch-lib_freadahead.c      Sun Jan  6 05:45:30 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_freadahead.c,v 1.1 2019/01/06 05:45:30 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/freadahead.c.orig      2016-12-31 13:54:41.000000000 +0000
++++ lib/freadahead.c
+@@ -25,7 +25,8 @@
+ 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)
Index: pkgsrc/devel/m4/patches/patch-lib_freading.c
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_freading.c:1.1
--- /dev/null   Sun Jan  6 05:45:30 2019
+++ pkgsrc/devel/m4/patches/patch-lib_freading.c        Sun Jan  6 05:45:30 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_freading.c,v 1.1 2019/01/06 05:45:30 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/freading.c.orig        2016-12-31 13:54:41.000000000 +0000
++++ lib/freading.c
+@@ -31,7 +31,8 @@ freading (FILE *fp)
+   /* 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 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));

Prev by Date: CVS commit: pkgsrc/converters/libfreehand
Next by Date: CVS commit: pkgsrc/graphics/inkscape
Previous by Thread: CVS commit: pkgsrc/converters/libfreehand
Next by Thread: CVS commit: pkgsrc/graphics/inkscape
Indexes:

Home | Main Index | Thread Index | Old Index