From 0f03f1b385050b37bf9e0adc1f93b6e45788b99b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 24 Mar 2021 04:29:15 +0000 Subject: Wed Mar 24 04:29:15 UTC 2021 ap/mpg123-1.26.5-x86_64-1.txz: Upgraded. d/cmake-3.20.0-x86_64-1.txz: Upgraded. kde/krita-4.4.3-x86_64-1.txz: Upgraded. l/mozjs78-78.9.0esr-x86_64-1.txz: Upgraded. n/libassuan-2.5.5-x86_64-1.txz: Upgraded. x/libva-2.11.0-x86_64-1.txz: Upgraded. x/libva-utils-2.11.0-x86_64-1.txz: Upgraded. xap/mozilla-firefox-87.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/87.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-10/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23981 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23982 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23983 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23984 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23985 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23986 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23987 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23988 (* Security fix *) --- source/ap/mpg123/mpg123.SlackBuild | 2 +- source/d/cmake/extract-manpages-from-binary.sh | 8 ++--- source/kde/kde/build/krita | 2 +- source/n/libassuan/libassuan.SlackBuild | 8 ++--- source/x/libva-utils/libva-utils.SlackBuild | 2 +- source/x/libva/libva.SlackBuild | 2 +- ...able-LTO-for-Rust-when-complete-build-use.patch | 34 ++++++++++++++++++++++ .../xap/mozilla-firefox/mozilla-firefox.SlackBuild | 25 +++++++++++----- .../mozilla-thunderbird.SlackBuild | 22 +++++++++----- 9 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 source/xap/mozilla-firefox/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch (limited to 'source') diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild index 7b27abb1..8111ee5f 100755 --- a/source/ap/mpg123/mpg123.SlackBuild +++ b/source/ap/mpg123/mpg123.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mpg123 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/cmake/extract-manpages-from-binary.sh b/source/d/cmake/extract-manpages-from-binary.sh index 59dc561b..24f2145e 100755 --- a/source/d/cmake/extract-manpages-from-binary.sh +++ b/source/d/cmake/extract-manpages-from-binary.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +25,9 @@ rm -rf tmp-manpages mkdir tmp-manpages -tar xf cmake-*-Linux-x86_64.tar.?z -mv cmake-*-Linux-x86_64/man tmp-manpages -rm -r cmake-*-Linux-x86_64 +tar xf cmake-*-?inux-x86_64.tar.?z +mv cmake-*-?inux-x86_64/man tmp-manpages +rm -r cmake-*-?inux-x86_64 mkdir tmp-manpages/usr mv tmp-manpages/man tmp-manpages/usr chown -R root:root tmp-manpages diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index b8626c4c..d00491fd 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -4 +1 diff --git a/source/n/libassuan/libassuan.SlackBuild b/source/n/libassuan/libassuan.SlackBuild index f7e36ea1..f88d99b7 100755 --- a/source/n/libassuan/libassuan.SlackBuild +++ b/source/n/libassuan/libassuan.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2006-2007, 2014 Robby Workman, Tuscaloosa, AL, USA -# Copyright 2007, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libassuan -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild index b81b2aa2..fbd41bc7 100755 --- a/source/x/libva-utils/libva-utils.SlackBuild +++ b/source/x/libva-utils/libva-utils.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libva-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild index a581edc6..677a2fa1 100755 --- a/source/x/libva/libva.SlackBuild +++ b/source/x/libva/libva.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libva VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xap/mozilla-firefox/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/source/xap/mozilla-firefox/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch new file mode 100644 index 00000000..387a65ad --- /dev/null +++ b/source/xap/mozilla-firefox/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch @@ -0,0 +1,34 @@ +From 8ae6defd8340a13d88977d9973abd79495a99fcd Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sat, 29 Aug 2020 22:30:59 +0200 +Subject: [PATCH 27/30] LTO: Only enable LTO for Rust when complete build uses + LTO + +Signed-off-by: Thomas Deutschmann +--- + config/makefiles/rust.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 92f3070a85..0d72914c43 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -64,6 +64,7 @@ endif + # These flags are passed via `cargo rustc` and only apply to the final rustc + # invocation (i.e., only the top-level crate, not its dependencies). + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) ++ifdef MOZ_LTO + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds, but not when linking +@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes + endif + endif + endif ++endif + + ifdef CARGO_INCREMENTAL + export CARGO_INCREMENTAL +-- +2.31.0 + diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index d95b38ba..b589706f 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -88,13 +88,20 @@ fi export CC=${CC:-clang} export CXX=${CXX:-clang++} -# Keep memory usage as low as possible when linking: -SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" -export LDFLAGS="$SLKLDFLAGS" -export MOZ_LINK_FLAGS="$SLKLDFLAGS" - # Set linker to use: -LINKER=bfd +if [ "$CC" = "clang" ]; then + # Upstream default: + LINKER=lld +else + LINKER=bfd +fi + +# Keep memory usage as low as possible when linking: +if [ ! "$LINKER" = "lld" ]; then + SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" + export LDFLAGS="$SLKLDFLAGS" + export MOZ_LINK_FLAGS="$SLKLDFLAGS" +fi # Put Rust objects on a diet to keep the linker from running into memory # issues (especially on 32-bit): @@ -198,6 +205,9 @@ sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \ # Retain GTK+ v2 scrolling behavior: zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 +# Don't enable LTO for Rust unless the whole build uses it: +zcat $CWD/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch.gz | patch -p1 --verbose || exit 1 + # Fetch localization, if requested # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then @@ -238,6 +248,7 @@ OPTIONS="\ --disable-crashreporter \ --disable-debug-symbols \ --disable-debug \ + --disable-elf-hack \ --disable-updater \ --disable-optimize" # Complains about missing APNG support in Slackware's libpng: diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 469b0e32..e81df3bd 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -117,13 +117,20 @@ fi export CC=${CC:-clang} export CXX=${CXX:-clang++} -# Keep memory usage as low as possible when linking: -SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" -export LDFLAGS="$SLKLDFLAGS" -export MOZ_LINK_FLAGS="$SLKLDFLAGS" - # Set linker to use: -LINKER=bfd +if [ "$CC" = "clang" ]; then + # Upstream default: + LINKER=lld +else + LINKER=bfd +fi + +# Keep memory usage as low as possible when linking: +if [ ! "$LINKER" = "lld" ]; then + SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" + export LDFLAGS="$SLKLDFLAGS" + export MOZ_LINK_FLAGS="$SLKLDFLAGS" +fi # Put Rust objects on a diet to keep the linker from running into memory # issues (especially on 32-bit): @@ -219,6 +226,7 @@ OPTIONS="\ --disable-crashreporter \ --disable-debug-symbols \ --disable-debug \ + --disable-elf-hack \ --disable-tests \ --disable-updater \ --host=$ARCH-slackware-linux \ -- cgit v1.2.3