diff options
Diffstat (limited to 'source')
36 files changed, 439 insertions, 38 deletions
diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog index 5b7bff05..7d3f26cb 100644 --- a/source/ap/FTBFSlog +++ b/source/ap/FTBFSlog @@ -1,3 +1,6 @@ +Tue Sep 10 17:52:32 UTC 2019 + jove: patch to fix breakage from removal of stropts.h in glibc-2.30. ++--------------------------+ Mon Feb 12 23:18:35 UTC 2018 All AP packages tested and found to build properly. +--------------------------+ diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild index b3a71e76..f30d7ce7 100755 --- a/source/ap/jove/jove.SlackBuild +++ b/source/ap/jove/jove.SlackBuild @@ -79,6 +79,9 @@ find . \ zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup || exit 1 +# Patch due to removal of stropts.h: +zcat $CWD/jove.glibc-2.30.diff.gz | patch -p1 --verbose --backup || exit 1 + # More patching needed now: sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \ -e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile diff --git a/source/ap/jove/jove.glibc-2.30.diff b/source/ap/jove/jove.glibc-2.30.diff new file mode 100644 index 00000000..684e73d4 --- /dev/null +++ b/source/ap/jove/jove.glibc-2.30.diff @@ -0,0 +1,17 @@ +--- ./iproc.c.orig 2008-05-20 21:35:18.000000000 -0500 ++++ ./iproc.c 2019-08-19 17:28:01.899194246 -0500 +@@ -536,14 +536,6 @@ + + # ifdef SVR4_PTYS + # include <stdlib.h> /* for grantpt and unlockpt, at least in Solaris 2.3 */ +-# if _XOPEN_SOURCE >= 500 +- /* Linux/glibc no longer pretends to support STREAMS (XSR) (2008) */ +-# if _XOPEN_STREAMS != -1 +-# include <stropts.h> +-# endif +-# else +-# include <sys/stropts.h> +-# endif + extern char *ptsname proto((int /*filedes*/)); /* get name of slave */ + # endif + diff --git a/source/k/kernel-configs/config-generic-4.19.71 b/source/k/kernel-configs/config-generic-4.19.72 index 8e805b2b..7f859298 100644 --- a/source/k/kernel-configs/config-generic-4.19.71 +++ b/source/k/kernel-configs/config-generic-4.19.72 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.71.x64 b/source/k/kernel-configs/config-generic-4.19.72.x64 index 49df6c8d..015a52b2 100644 --- a/source/k/kernel-configs/config-generic-4.19.71.x64 +++ b/source/k/kernel-configs/config-generic-4.19.72.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.71-smp b/source/k/kernel-configs/config-generic-smp-4.19.72-smp index 43ca5802..6d93e5d8 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.71-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.72-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.71 b/source/k/kernel-configs/config-huge-4.19.72 index dbe00a6e..a1bdcac6 100644 --- a/source/k/kernel-configs/config-huge-4.19.71 +++ b/source/k/kernel-configs/config-huge-4.19.72 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.71.x64 b/source/k/kernel-configs/config-huge-4.19.72.x64 index 2a84cc73..3cb668b6 100644 --- a/source/k/kernel-configs/config-huge-4.19.71.x64 +++ b/source/k/kernel-configs/config-huge-4.19.72.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.71-smp b/source/k/kernel-configs/config-huge-smp-4.19.72-smp index 4b26a643..a9841a5c 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.71-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.72-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.71 Kernel Configuration +# Linux/x86 4.19.72 Kernel Configuration # # 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 <eggert@cs.ucla.edu> +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 <fweimer@redhat.com> +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 <carlos@redhat.com> + +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, "\ + <size from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\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?= <mail@nh2.me> +Date: Thu, 8 Aug 2019 22:02:27 +0200 +Subject: [PATCH] malloc: Fix missing accounting of top chunk in malloc_info + [BZ #24026] + +Fixes `<total type="rest" size="..."> 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 <system type="current" size="...">. That result being wrong +makes investigating memory fragmentation issues like +<https://bugzilla.redhat.com/show_bug.cgi?id=843478> 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 <adhemerval.zanella@linaro.org> +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 <nicolas.dufresne@collabora.com> +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 <linux/types.h> ++#include <asm/ioctl.h> ++ ++#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 \ diff --git a/source/n/FTBFSlog b/source/n/FTBFSlog index 1929a4f3..8aa6243a 100644 --- a/source/n/FTBFSlog +++ b/source/n/FTBFSlog @@ -1,3 +1,6 @@ +Tue Sep 10 17:59:49 UTC 2019 + nn: patch to fix breakage from removal of stropts.h in glibc-2.30. ++--------------------------+ Sat Apr 13 19:02:01 UTC 2019 libgpg-error: 'namespace' is a builtin in gawk5, so change it to 'libgpg_error_namespace'. diff --git a/source/n/libmilter/libmilter.SlackBuild b/source/n/libmilter/libmilter.SlackBuild index 81a64f92..bd43e776 100755 --- a/source/n/libmilter/libmilter.SlackBuild +++ b/source/n/libmilter/libmilter.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libmilter VERSION=${VERSION:-8.15.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,6 +81,8 @@ find -L . \ cat $CWD/site.config.m4 | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX," \ > devtools/Site/site.config.m4 +zcat $CWD/sendmail-8.15.2-gethostbyname2.patch.gz | patch -p1 --verbose || exit 1 + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/include/$PKGNAM make -C $PKGNAM O="$SLKCFLAGS" install DESTDIR=$PKG || exit 1 diff --git a/source/n/libmilter/sendmail-8.15.2-gethostbyname2.patch b/source/n/libmilter/sendmail-8.15.2-gethostbyname2.patch new file mode 100644 index 00000000..03ff909d --- /dev/null +++ b/source/n/libmilter/sendmail-8.15.2-gethostbyname2.patch @@ -0,0 +1,39 @@ +diff --git a/libmilter/sm_gethost.c b/libmilter/sm_gethost.c +index a025c8f..cd0ef31 100644 +--- a/libmilter/sm_gethost.c ++++ b/libmilter/sm_gethost.c +@@ -49,8 +49,16 @@ sm_getipnodebyname(name, family, flags, err) + int flags; + int *err; + { +- bool resv6 = true; + struct hostent *h; ++# if HAS_GETHOSTBYNAME2 ++ ++ h = gethostbyname2(name, family); ++ if (h == NULL) ++ *err = h_errno; ++ return h; ++ ++# else /* HAS_GETHOSTBYNAME2 */ ++ bool resv6 = true; + + if (family == AF_INET6) + { +@@ -60,7 +68,7 @@ sm_getipnodebyname(name, family, flags, err) + } + SM_SET_H_ERRNO(0); + h = gethostbyname(name); +- if (family == AF_INET6 && !resv6) ++ if (!resv6) + _res.options &= ~RES_USE_INET6; + + /* the function is supposed to return only the requested family */ +@@ -75,6 +83,7 @@ sm_getipnodebyname(name, family, flags, err) + else + *err = h_errno; + return h; ++# endif /* HAS_GETHOSTBYNAME2 */ + } + + void diff --git a/source/n/libmilter/site.config.m4 b/source/n/libmilter/site.config.m4 index 5e95b201..1c2202b6 100644 --- a/source/n/libmilter/site.config.m4 +++ b/source/n/libmilter/site.config.m4 @@ -2,5 +2,6 @@ APPENDDEF(`conf_libmilter_ENVDEF',`-DNETINET6=1') APPENDDEF(`conf_libmilter_ENVDEF',`-D_FFR_WORKERS_POOL=1 -DMIN_WORKERS=4') APPENDDEF(`conf_libmilter_ENVDEF',`-DSM_CONF_POLL=1') APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER') -APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_MILTER_ROOT_UNSAFE ') +APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_MILTER_ROOT_UNSAFE') +APPENDDEF(`conf_libmilter_ENVDEF', `-DHAS_GETHOSTBYNAME2') APPENDDEF(`confLIBDIR', `/usr/lib@LIBDIRSUFFIX@ ') diff --git a/source/n/nn/nn.SlackBuild b/source/n/nn/nn.SlackBuild index 880545ae..9ca6283b 100755 --- a/source/n/nn/nn.SlackBuild +++ b/source/n/nn/nn.SlackBuild @@ -84,6 +84,7 @@ if [ $ARCH = "x86_64" ]; then zcat $CWD/m-x86_64.h.gz > conf/m-x86_64.h fi zcat $CWD/nn.badnntphost.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/nn.glibc-2.30.diff.gz | patch -p1 --verbose || exit 1 cat config.h-dist | sed -e "s#m-sparc.h#${MFILE}#" > config.h make all || exit 1 diff --git a/source/n/nn/nn.glibc-2.30.diff b/source/n/nn/nn.glibc-2.30.diff new file mode 100644 index 00000000..ed638e24 --- /dev/null +++ b/source/n/nn/nn.glibc-2.30.diff @@ -0,0 +1,15 @@ +--- ./term.c.orig 2005-06-29 16:40:27.000000000 -0500 ++++ ./term.c 2019-08-19 17:33:19.458203667 -0500 +@@ -25,12 +25,6 @@ + #include "regexp.h" + #include "nn_term.h" + +-#if !defined(__FreeBSD__) && !(__NetBSD__) && !defined(NeXT) +-#include <stropts.h> +-#else +-#include <sys/ioctl.h> +-#endif +- + #ifdef RESIZING + #include <sys/ioctl.h> /* for TIOCGWINSZ */ + diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index 8651934d..edb68a50 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=postfix VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -102,6 +102,9 @@ zcat $CWD/postfix.only.warn.regular.files.diff.gz | patch -p1 --verbose || exit # Make the postfix startup message look more like the other boot notices: zcat $CWD/postfix.script.starting.message.diff.gz | patch -p1 --verbose || exit 1 +# Fix dropped RES macros with glibc-2.30: +zcat $CWD/postfix.res-macros-fix.patch.gz | patch -p1 --verbose || exit 1 + # Postfix does not use a ./configure script (no GNU autoconf) # # The AUXLIBS variable is for dynamic library linking, which as of this diff --git a/source/n/postfix/postfix.res-macros-fix.patch b/source/n/postfix/postfix.res-macros-fix.patch new file mode 100644 index 00000000..1034c85f --- /dev/null +++ b/source/n/postfix/postfix.res-macros-fix.patch @@ -0,0 +1,21 @@ +diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c +index 5f2cce5..df32345 100644 +--- a/src/dns/dns_str_resflags.c ++++ b/src/dns/dns_str_resflags.c +@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { + "RES_DEFNAMES", RES_DEFNAMES, + "RES_STAYOPEN", RES_STAYOPEN, + "RES_DNSRCH", RES_DNSRCH, ++#ifdef RES_INSECURE1 + "RES_INSECURE1", RES_INSECURE1, ++#endif ++#ifdef RES_INSECURE2 + "RES_INSECURE2", RES_INSECURE2, ++#endif + "RES_NOALIASES", RES_NOALIASES, ++#ifdef RES_USE_INET6 + "RES_USE_INET6", RES_USE_INET6, ++#endif + #ifdef RES_ROTATE + "RES_ROTATE", RES_ROTATE, + #endif diff --git a/source/n/yptools/ypbind-mt.gettid.diff b/source/n/yptools/ypbind-mt.gettid.diff new file mode 100644 index 00000000..37496d85 --- /dev/null +++ b/source/n/yptools/ypbind-mt.gettid.diff @@ -0,0 +1,22 @@ +--- ./src/log_msg.c.orig 2011-08-31 08:13:22.000000000 -0500 ++++ ./src/log_msg.c 2019-08-20 12:44:45.474253136 -0500 +@@ -30,19 +30,6 @@ + #include "log_msg.h" + + #include <sys/syscall.h> +-#ifdef __NR_gettid +-static pid_t +-gettid (void) +-{ +- return syscall (__NR_gettid); +-} +-#else +-pid_t +-gettid (void) +-{ +- return getpid (); +-} +-#endif + + int debug_flag = 0; + int logfile_flag = 0; diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild index ad9323a1..37919427 100755 --- a/source/n/yptools/yptools.SlackBuild +++ b/source/n/yptools/yptools.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) # Package version number: PKGNAM=yptools VERSION=2.14 -BUILD=${BUILD:-11} +BUILD=${BUILD:-12} YPTOOLS=$VERSION YPBINDMT=1.38 @@ -77,7 +77,7 @@ mkdir -p $PKG/etc # Add etc/nsswitch.conf-nis as a full NIS+ example config file: zcat $CWD/nsswitch.conf-nis.gz > $PKG/etc/nsswitch.conf-nis.new rm -rf yp-tools-$YPTOOLS -tar xvf $CWD/yp-tools-$YPTOOLS.tar.bz2 || exit 1 +tar xvf $CWD/yp-tools-$YPTOOLS.tar.?z || exit 1 cd yp-tools-$YPTOOLS || exit 1 zcat $CWD/yp-tools-2.14-glibc217-crypt.diff.gz | patch -p1 --verbose || exit 1 ./configure \ @@ -139,8 +139,9 @@ echo "| ypbind-mt-$YPBINDMT |" echo "+================+" cd $TMP rm -rf ypbind-mt-$YPBINDMT -tar xvf $CWD/ypbind-mt-$YPBINDMT.tar.bz2 || exit 1 +tar xvf $CWD/ypbind-mt-$YPBINDMT.tar.?z || exit 1 cd ypbind-mt-$YPBINDMT || exit 1 +zcat $CWD/ypbind-mt.gettid.diff.gz | patch -p1 --verbose || exit 1 ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -175,7 +176,7 @@ chmod 644 $PKG/usr/doc/ypbind-mt-$YPBINDMT/* #echo "+=============+" #cd $TMP #rm -rf ypmake-$YPMAKE -#tar xvf $CWD/ypmake-$YPMAKE.tar.bz2 || exit 1 +#tar xvf $CWD/ypmake-$YPMAKE.tar.?z || exit 1 #cd ypmake-$YPMAKE || exit 1 #./configure ## I'm just not taking chances with the cleanliness of these sources anymore... @@ -201,7 +202,7 @@ echo "| ypserv-$YPSERV |" echo "+============+" cd $TMP rm -rf ypserv-$YPSERV -tar xvf $CWD/ypserv-$YPSERV.tar.bz2 || exit 1 +tar xvf $CWD/ypserv-$YPSERV.tar.?z || exit 1 cd ypserv-$YPSERV || exit 1 # --with-ndbm=yes # Support for this was discontinued upstream diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog index 439fc119..4661e1ad 100644 --- a/source/xap/FTBFSlog +++ b/source/xap/FTBFSlog @@ -1,3 +1,9 @@ +Tue Sep 10 16:55:23 UTC 2019 + gftp: patch to fix breakage from removal of stropts.h in glibc-2.30. + mozilla-firefox: Compile with gcc/g++ for glibc-2.30. + mozilla-thunderbird: Fix for glibc-2.30's included gettid(). + seamonkey: Fix for glibc-2.30's included gettid(). ++--------------------------+ Mon May 20 20:36:17 UTC 2019 seamonkey: compile with: -Wformat -Wno-format-overflow -fno-delete-null-pointer-checks diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index 2246e8cc..9768b20c 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -27,9 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=blackbox SRCNAM=blackbox -VERSION=${VERSION:-0.74} +VERSION=${VERSION:-0.75} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild index a87db063..1ab04df3 100755 --- a/source/xap/gftp/gftp.SlackBuild +++ b/source/xap/gftp/gftp.SlackBuild @@ -72,6 +72,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/gftp.glibc-2.30.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/xap/gftp/gftp.glibc-2.30.diff b/source/xap/gftp/gftp.glibc-2.30.diff new file mode 100644 index 00000000..efefcfe2 --- /dev/null +++ b/source/xap/gftp/gftp.glibc-2.30.diff @@ -0,0 +1,13 @@ +--- ./lib/pty.c.orig 2007-03-12 20:56:43.000000000 -0500 ++++ ./lib/pty.c 2019-08-19 17:30:51.858199288 -0500 +@@ -61,10 +61,6 @@ + + #elif HAVE_GRANTPT + +-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)) +-#include <stropts.h> +-#endif +- + char * + gftp_get_pty_impl (void) + { diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index 857e3ef5..92bdc7e0 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -75,8 +75,8 @@ if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32- fi # Choose a compiler (gcc/g++ or clang/clang++): -export CC=${CC:-clang} -export CXX=${CXX:-clang++} +export CC=${CC:-gcc} +export CXX=${CXX:-g++} # Keep memory usage as low as possible when linking: SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats" diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index b03c373b..6047eb6e 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -164,6 +164,9 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1 # Fix building with latest Rust: zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 +# Fix for glibc-2.30's new gettid() definition: +zcat $CWD/mozilla-thunderbird.gettid.diff.gz | patch -p1 --verbose || exit 1 + # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff b/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff new file mode 100644 index 00000000..83d607a5 --- /dev/null +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff @@ -0,0 +1,10 @@ +--- ./tools/profiler/core/platform.h.orig 2019-07-03 10:25:38.000000000 -0500 ++++ ./tools/profiler/core/platform.h 2019-08-20 13:15:02.648307043 -0500 +@@ -47,7 +47,6 @@ + #if defined(__GLIBC__) + #include <unistd.h> + #include <sys/syscall.h> +-static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); } + #elif defined(GP_OS_darwin) + #include <unistd.h> + #include <sys/syscall.h> diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 71712cd6..aa7c2cc5 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -109,6 +109,9 @@ cd seamonkey-${TARBALLVER} || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/sm.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 +# Fix for glibc-2.30's included gettid(): +zcat $CWD/seamonkey.gettid.patch.gz | patch -p1 --verbose || exit 1 + # Don't complain if Rust is i686: zcat $CWD/seamonkey.i686.triplet.fix.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/seamonkey/seamonkey.gettid.patch b/source/xap/seamonkey/seamonkey.gettid.patch new file mode 100644 index 00000000..81d5eabf --- /dev/null +++ b/source/xap/seamonkey/seamonkey.gettid.patch @@ -0,0 +1,15 @@ +diff -Nrbu seamonkey-2.49.4/seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h seamonkey-2.49.4-OK/seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h +--- seamonkey-2.49.4/seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h 2018-07-12 05:19:15.000000000 +0300 ++++ seamonkey-2.49.4-OK/seamonkey-2.49.4/mozilla/tools/profiler/core/platform.h 2019-07-27 20:31:47.675086876 +0300 +@@ -65,10 +65,7 @@ + #include <unistd.h> + #if !defined(__BIONIC__) + #include <sys/syscall.h> +-static inline pid_t gettid() +-{ +- return (pid_t) syscall(SYS_gettid); +-} ++ + #endif + #endif + |