From 5ff08990e972ccd99e36e94e44746710b95adba4 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 10 Sep 2019 21:28:36 +0000 Subject: Tue Sep 10 21:28:36 UTC 2019 a/glibc-solibs-2.30-x86_64-1.txz: Upgraded. a/kernel-firmware-20190909_6c6918a-noarch-1.txz: Upgraded. a/kernel-generic-4.19.72-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.72-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.72-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.72-x86-1.txz: Upgraded. k/kernel-source-4.19.72-noarch-1.txz: Upgraded. l/gdk-pixbuf2-2.38.2-x86_64-1.txz: Upgraded. l/glibc-2.30-x86_64-1.txz: Upgraded. l/glibc-i18n-2.30-x86_64-1.txz: Upgraded. l/glibc-profile-2.30-x86_64-1.txz: Upgraded. n/libmilter-8.15.2-x86_64-3.txz: Rebuilt. Use gethostbyname2() since RES_USE_INET6 is removed in glibc-2.30. n/libqmi-1.22.6-x86_64-1.txz: Upgraded. n/postfix-3.4.6-x86_64-2.txz: Rebuilt. Patched to fix removed macros in glibc-2.30. n/yptools-2.14-x86_64-12.txz: Rebuilt. Patched ypbind-mt for gettid() included in glibc-2.30. xap/blackbox-0.75-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/l/FTBFSlog | 3 ++ source/l/glibc/glibc.SlackBuild | 37 ++++++------- ....8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch | 40 ++++++++++++++ ....b0f6679bcd738ea244a14acd879d974901e56c8e.patch | 28 ++++++++++ ....b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch | 37 +++++++++++++ ....e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch | 50 ++++++++++++++++++ .../gst-plugins-good-1.16.0-v4l2_fix-1.patch | 61 ++++++++++++++++++++++ .../l/gst-plugins-good/gst-plugins-good.SlackBuild | 2 + 8 files changed, 238 insertions(+), 20 deletions(-) create mode 100644 source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch create mode 100644 source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch create mode 100644 source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch create mode 100644 source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch create mode 100644 source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch (limited to 'source/l') diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index a9b36139..fd657199 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,6 @@ +Tue Sep 10 17:55:47 UTC 2019 + gst-plugins-good: Fix type compatibility issue with glibc 2.30. ++--------------------------+ Mon Jun 3 17:08:10 UTC 2019 glib: patch for gcc9. Thanks to Matteo Bernardini. Note that on 32-bit x86, xmms and normalize will not recompile until glib-1 diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 0d153064..ba5c01f3 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,14 +20,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -## build glibc-$VERSION for Slackware - cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -157,6 +155,10 @@ apply_patches() { zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 # Don't use AM/PM format for date(1). That's just plain crazy. zcat $CWD/glibc-2.29.en_US.no.am.pm.date.format.diff.gz | patch -p1 --verbose || exit 1 + # Other regression fixes from git: + for git_patch in $CWD/patches/*.patch.gz ; do + zcat $git_patch | patch -p1 --verbose || exit 1 + done } # This is going to be the initial $DESTDIR: @@ -195,32 +197,27 @@ mkdir -p $PKG/var/run/nscd cd $TMP rm -rf glibc-$CVSVER tar xvf $CWD/glibc-$CVSVER.tar.xz \ + || tar xvf $CWD/glibc-$CVSVER.tar.lz \ || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \ || tar xvf $CWD/glibc-$CVSVER.tar.gz cd glibc-$CVSVER -chown -R root:root . -find . -perm 666 -exec chmod 644 {} \; -find . -perm 664 -exec chmod 644 {} \; -find . -perm 600 -exec chmod 644 {} \; -find . -perm 444 -exec chmod 644 {} \; -find . -perm 400 -exec chmod 644 {} \; -find . -perm 440 -exec chmod 644 {} \; -find . -perm 777 -exec chmod 755 {} \; -find . -perm 775 -exec chmod 755 {} \; -find . -perm 511 -exec chmod 755 {} \; -find . -perm 711 -exec chmod 755 {} \; -find . -perm 555 -exec chmod 755 {} \; - -# Clean up leftover CVS directories: -find . -type d -name CVS -exec rm -r {} \; 2> /dev/null - # Apply patches; exit if any fail. apply_patches if [ ! $? = 0 ]; then exit 1 fi +# Clean up leftover CVS directories: +find . -type d -name CVS -exec rm -r {} \; 2> /dev/null + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + # Make build directory: mkdir build-glibc-$VERSION cd build-glibc-$VERSION || exit 1 diff --git a/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch b/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch new file mode 100644 index 00000000..2dbdbd9c --- /dev/null +++ b/source/l/glibc/patches/glibc.8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29.patch @@ -0,0 +1,40 @@ +From 8a80ee5e2bab17a1f8e1e78fab5c33ac7efa8b29 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 21 Aug 2019 09:25:22 -0700 +Subject: [PATCH] Fix bad pointer / leak in regex code + +This was found by Coverity (CID 1484201). [BZ#24844] +* posix/regex_internal.c (create_cd_newstate): Fix use of bad +pointer and/or memory leak when storage is exhausted. + +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index 9004ce8..f53ded9 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -1716,15 +1716,19 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, + { + if (newstate->entrance_nodes == &newstate->nodes) + { +- newstate->entrance_nodes = re_malloc (re_node_set, 1); +- if (__glibc_unlikely (newstate->entrance_nodes == NULL)) ++ re_node_set *entrance_nodes = re_malloc (re_node_set, 1); ++ if (__glibc_unlikely (entrance_nodes == NULL)) + { + free_state (newstate); + return NULL; + } ++ newstate->entrance_nodes = entrance_nodes; + if (re_node_set_init_copy (newstate->entrance_nodes, nodes) + != REG_NOERROR) +- return NULL; ++ { ++ free_state (newstate); ++ return NULL; ++ } + nctx_nodes = 0; + newstate->has_constraint = 1; + } +-- +2.9.3 + + diff --git a/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch b/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch new file mode 100644 index 00000000..24c22a39 --- /dev/null +++ b/source/l/glibc/patches/glibc.b0f6679bcd738ea244a14acd879d974901e56c8e.patch @@ -0,0 +1,28 @@ +From b0f6679bcd738ea244a14acd879d974901e56c8e Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 1 Aug 2019 14:06:24 +0200 +Subject: [PATCH] malloc: Remove unwanted leading whitespace in malloc_info [BZ + #24867] + +It was introduced in commit 6c8dbf00f536d78b1937b5af6f57be47fd376344 +("Reformat malloc to gnu style."). + +Reviewed-by: Carlos O'Donell + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 00ce48c..343d89f 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -5491,7 +5491,7 @@ __malloc_info (int options, FILE *fp) + + for (size_t i = 0; i < nsizes; ++i) + if (sizes[i].count != 0 && i != NFASTBINS) +- fprintf (fp, " \ ++ fprintf (fp, "\ + \n", + sizes[i].from, sizes[i].to, sizes[i].total, sizes[i].count); + +-- +2.9.3 + + diff --git a/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch b/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch new file mode 100644 index 00000000..b28c7943 --- /dev/null +++ b/source/l/glibc/patches/glibc.b6d2c4475d5abc05dd009575b90556bdd3c78ad0.patch @@ -0,0 +1,37 @@ +From b6d2c4475d5abc05dd009575b90556bdd3c78ad0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Niklas=20Hamb=C3=BCchen?= +Date: Thu, 8 Aug 2019 22:02:27 +0200 +Subject: [PATCH] malloc: Fix missing accounting of top chunk in malloc_info + [BZ #24026] + +Fixes ` incorrectly showing as 0 most +of the time. + +The rest value being wrong is significant because to compute the +actual amount of memory handed out via malloc, the user must subtract +it from . That result being wrong +makes investigating memory fragmentation issues like + close to +impossible. + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 343d89f..0e65d63 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -5406,6 +5406,12 @@ __malloc_info (int options, FILE *fp) + + __libc_lock_lock (ar_ptr->mutex); + ++ /* Account for top chunk. The top-most available chunk is ++ treated specially and is never in any bin. See "initial_top" ++ comments. */ ++ avail = chunksize (ar_ptr->top); ++ nblocks = 1; /* Top always exists. */ ++ + for (size_t i = 0; i < NFASTBINS; ++i) + { + mchunkptr p = fastbin (ar_ptr, i); +-- +2.9.3 + + diff --git a/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch b/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch new file mode 100644 index 00000000..d5dabb4a --- /dev/null +++ b/source/l/glibc/patches/glibc.e1df30fbc2e2167a982c0e77a7ebee28f4dd0800.patch @@ -0,0 +1,50 @@ +From e1df30fbc2e2167a982c0e77a7ebee28f4dd0800 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Thu, 25 Jul 2019 11:22:17 -0300 +Subject: [PATCH] Get new entropy on each attempt __gen_tempname (BZ #15813) + +This is missing bit for fully fix BZ#15813 (the other two were fixed +by 359653aaacad463). + +Checked on x86_64-linux-gnu. + + [BZ #15813] + sysdeps/posix/tempname.c (__gen_tempname): get entrypy on each + attempt. + +diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c +index de34694..310df3c 100644 +--- a/sysdeps/posix/tempname.c ++++ b/sysdeps/posix/tempname.c +@@ -186,7 +186,6 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) + { + int len; + char *XXXXXX; +- uint64_t value; + unsigned int count; + int fd = -1; + int save_errno = errno; +@@ -218,13 +217,13 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) + /* This is where the Xs start. */ + XXXXXX = &tmpl[len - 6 - suffixlen]; + +- /* Get some more or less random data. */ +- RANDOM_BITS (value); +- value ^= (uint64_t)__getpid () << 32; +- +- for (count = 0; count < attempts; value += 7777, ++count) ++ uint64_t pid = (uint64_t) __getpid () << 32; ++ for (count = 0; count < attempts; ++count) + { +- uint64_t v = value; ++ uint64_t v; ++ /* Get some more or less random data. */ ++ RANDOM_BITS (v); ++ v ^= pid; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; +-- +2.9.3 + + diff --git a/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch b/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch new file mode 100644 index 00000000..84dd8b22 --- /dev/null +++ b/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch @@ -0,0 +1,61 @@ +Submitted by: Pierre Labastie (pierre_DOT_labastie_AT_neuf_DOT_fr) +Date: 2019-08-12 +Initial Package Version: 1.16.0 +Upstream Status: Comitted +Origin: https://cgit.freedesktop.org/gstreamer/gst-plugins-good +Description: Fixes circular dependencies in headers introduced + by glibc-2.30 + +From 29c3570901e1c145dce57824ddc9276fddf0d808 Mon Sep 17 00:00:00 2001 +From: Nicolas Dufresne +Date: Tue, 6 Aug 2019 22:27:40 -0400 +Subject: [PATCH] v4l2: Fix type compatibility issue with glibc 2.30 + +From now on, we will use linux/types.h on Linux, and use typedef of the +various flavour of BSD. + +Fixes #635 +--- + sys/v4l2/ext/types-compat.h | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/sys/v4l2/ext/types-compat.h b/sys/v4l2/ext/types-compat.h +index d3673dd49..ea21c9513 100644 +--- a/sys/v4l2/ext/types-compat.h ++++ b/sys/v4l2/ext/types-compat.h +@@ -24,6 +24,11 @@ + #ifndef __TYPES_COMPAT_H__ + #define __TYPES_COMPAT_H__ + ++#ifdef __linux__ ++#include ++#include ++ ++#else /* One of the BSDs */ + /* From linux/types.h */ + #ifndef __bitwise__ + # ifdef __CHECKER__ +@@ -41,12 +46,14 @@ + # endif + #endif + +-#define __u64 guint64 +-#define __u32 guint32 +-#define __u16 guint16 +-#define __u8 guint8 +-#define __s64 gint64 +-#define __s32 gint32 +-#define __le32 guint32 __bitwise ++typedef guint8 __u8; ++typedef guint16 __u16; ++typedef gint32 __s32; ++typedef guint32 __u32; ++typedef gint64 __s64; ++typedef guint64 __u64; ++typedef guint32 __bitwise __le32; ++ ++#endif + + #endif /* __TYPES_COMPAT_H__ */ +-- +2.21.0 diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index 2444a964..da0de0d0 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -88,6 +88,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/gst-plugins-good-1.16.0-v4l2_fix-1.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ -- cgit v1.2.3