summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-05-31 23:21:18 +0000
committer Eric Hameleers <alien@slackware.com>2021-06-01 09:00:03 +0200
commit4a0325ea9df51bdbd0e80ec2fb542bfc35b4b4d3 (patch)
treeacd6bd8b6e2b5815648b70e3e03b98f824341d3d /source/d
parentfd2449f9042a890d8e469b4ba88a3d754aa9710a (diff)
downloadcurrent-4a0325ea9df51bdbd0e80ec2fb542bfc35b4b4d3.tar.gz
current-4a0325ea9df51bdbd0e80ec2fb542bfc35b4b4d3.tar.xz
Mon May 31 23:21:18 UTC 202120210531232118
ap/alsa-utils-1.2.5-x86_64-1.txz: Upgraded. ap/ispell-3.4.03-x86_64-1.txz: Upgraded. d/m4-1.4.19-x86_64-1.txz: Upgraded. l/alsa-lib-1.2.5-x86_64-1.txz: Upgraded. l/alsa-plugins-1.2.5-x86_64-1.txz: Upgraded. l/imagemagick-7.0.11_14-x86_64-1.txz: Upgraded. l/libedit-20210522_3.1-x86_64-1.txz: Upgraded. l/python-certifi-2021.5.30-x86_64-1.txz: Upgraded. xap/mozilla-firefox-89.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/89.0/releasenotes/
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/m4/m4.SlackBuild6
-rw-r--r--source/d/m4/m4.glibc228.diff108
2 files changed, 2 insertions, 112 deletions
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index e725ccb0a..7f239602f 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=m4
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -74,8 +74,6 @@ rm -rf m4-$VERSION
tar xvf $CWD/m4-$VERSION.tar.xz || exit 1
cd m4-$VERSION || exit 1
-zcat $CWD/m4.glibc228.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/m4/m4.glibc228.diff b/source/d/m4/m4.glibc228.diff
deleted file mode 100644
index 544296686..000000000
--- a/source/d/m4/m4.glibc228.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- ./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__