summaryrefslogtreecommitdiffstats
path: root/source/a/gzip
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-12-30 20:33:37 +0000
committer Eric Hameleers <alien@slackware.com>2018-12-31 08:59:45 +0100
commit8e734711287e3db171361903b19d2a758f325bfc (patch)
treeeb4b7eb8c1246713f1215b473777b7d8a29fa670 /source/a/gzip
parent527328c5da0d2375ca5dfc2a053c9fe328839918 (diff)
downloadcurrent-8e734711287e3db171361903b19d2a758f325bfc.tar.gz
current-8e734711287e3db171361903b19d2a758f325bfc.tar.xz
Sun Dec 30 20:33:37 UTC 201820181230203337
a/gzip-1.10-x86_64-1.txz: Upgraded. a/lvm2-2.03.02-x86_64-1.txz: Upgraded. a/os-prober-1.77-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-24.txz: Rebuilt. rc.6: Don't umount /dev/shm or tmpfs mounts under /run as it causes long warnings/timeouts at shutdown/reboot on systems using LVM. Don't use --ignorelockingfailure when deactivating LVM. l/gc-8.0.2-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_21-x86_64-1.txz: Upgraded. l/libclc-20181127_1ecb16d-x86_64-1.txz: Upgraded. l/librsvg-2.44.11-x86_64-1.txz: Upgraded. l/zstd-1.3.8-x86_64-1.txz: Upgraded. xap/blueman-2.0.7-x86_64-1.txz: Upgraded. xap/xscreensaver-5.42-x86_64-1.txz: Upgraded. xfce/xfce4-taskmanager-1.2.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/gzip')
-rwxr-xr-xsource/a/gzip/gzip.SlackBuild4
-rw-r--r--source/a/gzip/gzip.glibc228.diff126
2 files changed, 1 insertions, 129 deletions
diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild
index 4afb707fa..0c6163d3f 100755
--- a/source/a/gzip/gzip.SlackBuild
+++ b/source/a/gzip/gzip.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gzip
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -70,8 +70,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
cd ${PKGNAM}-$VERSION
-zcat $CWD/gzip.glibc228.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
diff --git a/source/a/gzip/gzip.glibc228.diff b/source/a/gzip/gzip.glibc228.diff
deleted file mode 100644
index 6197f8910..000000000
--- a/source/a/gzip/gzip.glibc228.diff
+++ /dev/null
@@ -1,126 +0,0 @@
---- ./lib/stdio-impl.h.orig 2018-01-03 18:38:53.000000000 -0600
-+++ ./lib/stdio-impl.h 2018-09-18 18:49:17.349062298 -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 2018-01-03 18:38:53.000000000 -0600
-+++ ./lib/freading.c 2018-09-18 18:49:17.347062298 -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 2018-01-03 18:38:53.000000000 -0600
-+++ ./lib/fflush.c 2018-09-18 18:49:17.345062298 -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, Minix 3, 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/fpurge.c.orig 2018-01-03 18:38:53.000000000 -0600
-+++ ./lib/fpurge.c 2018-09-18 18:49:17.346062298 -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 2018-01-06 18:03:28.000000000 -0600
-+++ ./lib/fseeko.c 2018-09-18 18:49:17.348062298 -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__
---- ./lib/fseterr.c.orig 2018-01-03 18:38:53.000000000 -0600
-+++ ./lib/fseterr.c 2018-09-18 18:49:17.349062298 -0500
-@@ -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 || __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, Minix 3, Android */
---- ./ChangeLog.orig 2018-01-07 16:33:52.000000000 -0600
-+++ ./ChangeLog 2018-09-18 18:49:17.343062298 -0500
-@@ -1,3 +1,26 @@
-+2018-03-05 Paul Eggert <address@hidden>
-+
-+ fflush: adjust to glibc 2.28 libio.h removal
-+ Problem reported by Daniel P. Berrangé in:
-+ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-+ * lib/fbufmode.c (fbufmode):
-+ * lib/fflush.c (clear_ungetc_buffer_preserving_position)
-+ (disable_seek_optimization, rpl_fflush):
-+ * lib/fpending.c (__fpending):
-+ * lib/fpurge.c (fpurge):
-+ * lib/freadable.c (freadable):
-+ * lib/freadahead.c (freadahead):
-+ * lib/freading.c (freading):
-+ * lib/freadptr.c (freadptr):
-+ * lib/freadseek.c (freadptrinc):
-+ * lib/fseeko.c (fseeko):
-+ * lib/fseterr.c (fseterr):
-+ * lib/fwritable.c (fwritable):
-+ * lib/fwriting.c (fwriting):
-+ Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-+ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-+ Define if not already defined.
-+
- 2018-01-07 Jim Meyering <meyering@fb.com>
-
- version 1.9