summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-09-12 03:58:53 +0000
committer Eric Hameleers <alien@slackware.com>2019-09-12 17:59:49 +0200
commit1c35025416b4295915f499a01d0cee8899971321 (patch)
tree8d77bc5a61777014d91d832adab49039955a8e64 /source/xap
parent5ff08990e972ccd99e36e94e44746710b95adba4 (diff)
downloadcurrent-1c35025416b4295915f499a01d0cee8899971321.tar.gz
current-1c35025416b4295915f499a01d0cee8899971321.tar.xz
Thu Sep 12 03:58:53 UTC 201920190912035853
a/glibc-zoneinfo-2019c-noarch-1.txz: Upgraded. This package provides the latest timezone updates. a/openssl-solibs-1.1.1d-x86_64-1.txz: Upgraded. a/openssl10-solibs-1.0.2t-x86_64-1.txz: Upgraded. ap/mariadb-10.4.8-x86_64-1.txz: Upgraded. l/netpbm-10.87.02-x86_64-1.txz: Upgraded. n/curl-7.66.0-x86_64-1.txz: Upgraded. This update fixes security issues: FTP-KRB double-free TFTP small blocksize heap buffer overflow For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5481 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5482 (* Security fix *) n/openssl-1.1.1d-x86_64-1.txz: Upgraded. This update fixes low severity security issues: Fixed a fork protection issue Fixed a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey Compute ECC cofactors if not provided during EC_GROUP construction For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-1549 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-1563 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-1547 (* Security fix *) n/openssl10-1.0.2t-x86_64-1.txz: Upgraded. This update fixes low severity security issues: Fixed a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey Compute ECC cofactors if not provided during EC_GROUP construction For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-1563 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-1547 (* Security fix *) n/p11-kit-0.23.17-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-68.1.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/68.1.0/releasenotes/ https://www.mozilla.org/security/known-vulnerabilities/thunderbird.html (* Security fix *) extra/google-chrome/google-chrome.SlackBuild: Upgraded. Patched the packaging script to account for the internal change of control.tar.gz to control.tar.xz. Thanks to _RDS_ and Tim Thomas who both provided the same patch.
Diffstat (limited to '')
-rwxr-xr-xsource/xap/mozilla-thunderbird/build-deps.sh (renamed from testing/source/mozilla-thunderbird/build-deps.sh)0
-rw-r--r--source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch (renamed from testing/source/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch)0
-rwxr-xr-xsource/xap/mozilla-thunderbird/build-deps/autoconf/autoconf.build (renamed from testing/source/mozilla-thunderbird/build-deps/autoconf/autoconf.build)0
-rwxr-xr-xsource/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build (renamed from testing/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build)0
-rwxr-xr-xsource/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build (renamed from testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build)0
-rw-r--r--source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url (renamed from testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.url)0
-rw-r--r--source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff (renamed from testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff)0
l---------[-rwxr-xr-x]source/xap/mozilla-thunderbird/gold/gold3
l---------source/xap/mozilla-thunderbird/gold/ld2
-rwxr-xr-xsource/xap/mozilla-thunderbird/gold/ld.gold (renamed from testing/source/mozilla-thunderbird/gold/ld.gold)0
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild70
-rw-r--r--source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff10
-rw-r--r--source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff12
-rw-r--r--source/xap/mozilla-thunderbird/unbreakdocs.diff23
14 files changed, 55 insertions, 65 deletions
diff --git a/testing/source/mozilla-thunderbird/build-deps.sh b/source/xap/mozilla-thunderbird/build-deps.sh
index 69d1a8b29..69d1a8b29 100755
--- a/testing/source/mozilla-thunderbird/build-deps.sh
+++ b/source/xap/mozilla-thunderbird/build-deps.sh
diff --git a/testing/source/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
index 5e7b23113..5e7b23113 100644
--- a/testing/source/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch
+++ b/source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
diff --git a/testing/source/mozilla-thunderbird/build-deps/autoconf/autoconf.build b/source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf.build
index b3bf16699..b3bf16699 100755
--- a/testing/source/mozilla-thunderbird/build-deps/autoconf/autoconf.build
+++ b/source/xap/mozilla-thunderbird/build-deps/autoconf/autoconf.build
diff --git a/testing/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build
index 06116e435..06116e435 100755
--- a/testing/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build
+++ b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build
diff --git a/testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build
index 6f98074fe..6f98074fe 100755
--- a/testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build
+++ b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build
diff --git a/testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.url b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url
index 75f7f4d38..75f7f4d38 100644
--- a/testing/source/mozilla-thunderbird/build-deps/nodejs/nodejs.url
+++ b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url
diff --git a/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff b/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff
index e2f3f98d3..e2f3f98d3 100644
--- a/testing/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff
+++ b/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff
diff --git a/source/xap/mozilla-thunderbird/gold/gold b/source/xap/mozilla-thunderbird/gold/gold
index 8c86d3b06..6cd03701c 100755..120000
--- a/source/xap/mozilla-thunderbird/gold/gold
+++ b/source/xap/mozilla-thunderbird/gold/gold
@@ -1,2 +1 @@
-#!/bin/bash
-/usr/bin/ld.gold "$@"
+ld.gold \ No newline at end of file
diff --git a/source/xap/mozilla-thunderbird/gold/ld b/source/xap/mozilla-thunderbird/gold/ld
index 78a06a2a1..6cd03701c 120000
--- a/source/xap/mozilla-thunderbird/gold/ld
+++ b/source/xap/mozilla-thunderbird/gold/ld
@@ -1 +1 @@
-gold \ No newline at end of file
+ld.gold \ No newline at end of file
diff --git a/testing/source/mozilla-thunderbird/gold/ld.gold b/source/xap/mozilla-thunderbird/gold/ld.gold
index f1d76b3a4..f1d76b3a4 100755
--- a/testing/source/mozilla-thunderbird/gold/ld.gold
+++ b/source/xap/mozilla-thunderbird/gold/ld.gold
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 6047eb6ec..9b6c6e69b 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 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -36,7 +36,7 @@ BUILD=${BUILD:-1}
# For example, to build a version of Thunderbird with Italian support, run
# the build script like this:
#
-# MOZLOCALIZE=it ./mozilla-firefox.SlackBuild
+# MOZLOCALIZE=it ./mozilla-thunderbird.SlackBuild
#
MOZLOCALIZE=${MOZLOCALIZE:-}
@@ -74,23 +74,23 @@ fi
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS=""
LIBDIRSUFFIX=""
- OPTIMIZE=${OPTIMIZE:-"-O1"}
+ OPTIMIZE=${OPTIMIZE:-"-Os"}
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS=""
LIBDIRSUFFIX=""
- OPTIMIZE=${OPTIMIZE:-"-O1"}
+ OPTIMIZE=${OPTIMIZE:-"-Os"}
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-fPIC"
LIBDIRSUFFIX="64"
- OPTIMIZE=${OPTIMIZE:-"-O1"}
+ OPTIMIZE=${OPTIMIZE:-"-O2"}
elif [ "$ARCH" = "arm" ]; then
SLKCFLAGS="-march=armv4 -mtune=xscale"
LIBDIRSUFFIX=""
- OPTIMIZE=${OPTIMIZE:-"-O1"}
+ OPTIMIZE=${OPTIMIZE:-"-O2"}
else
SLKCFLAGS=""
LIBDIRSUFFIX=""
- OPTIMIZE=${OPTIMIZE:-"-O1"}
+ OPTIMIZE=${OPTIMIZE:-"-O2"}
fi
# Thunderbird has been requiring more and more memory, especially while linking
@@ -101,27 +101,30 @@ fi
if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then
COMPILE_X86_UNDER_X86_64=true
ARCH=i686
- # Also use the gold linker for this:
- PATH="$(pwd)/gold:$PATH"
- export CC=${CC:-"gcc -B$(pwd)/gold"}
- export CXX=${CXX:-"g++ -B$(pwd)/gold"}
-elif [ "$ARCH" = "i686" ]; then
- # This might also help with the linker memory situation on some $ARCH. Feel free
- # to match any other $ARCH that could benefit from this.
- SLKLDFLAGS=" -Wl,--as-needed -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--stats"
- export LDFLAGS="$SLKLDFLAGS"
- export MOZ_LINK_FLAGS="$SLKLDFLAGS"
-else
- # Link using gold. This also helps prevent running out of memory on 32-bit
- # systems, and avoids a recurring build failure with GNU ld on other systems.
- PATH="$(pwd)/gold:$PATH"
- export CC=${CC:-"gcc -B$(pwd)/gold"}
- export CXX=${CXX:-"g++ -B$(pwd)/gold"}
fi
+# Choose a compiler (gcc/g++ or clang/clang++):
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
+
+## Link using gold. This avoids running out of memory on 32-bit systems, and
+## avoids a recurring build failure with GNU ld on other systems.
+#PATH="$(pwd)/gold:$PATH"
+#export CC="$CC -B$(pwd)/gold"
+#export CXX="$CXX -B$(pwd)/gold"
+
+# Keep memory usage as low as possible when linking:
+SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
+export LDFLAGS="$SLKLDFLAGS"
+export MOZ_LINK_FLAGS="$SLKLDFLAGS"
+
+# If you don't give this _something_ then it defaults to -g, causing more
+# link time memory issues:
+export MOZ_DEBUG_FLAGS="-g0"
+
# Put Rust objects on a diet to keep the linker from running into memory
# issues (especially on 32-bit):
-export RUSTFLAGS="-Cdebuginfo=0"
+export RUSTFLAGS="-Cdebuginfo=0 -Copt-level=0"
TMP=${TMP:-/tmp}
PKG=$TMP/package-mozilla-thunderbird
@@ -142,9 +145,8 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
-# We need to use the incredibly ancient autoconf-2.13 for this :/
-( cd $CWD/autoconf ; ./autoconf.build )
-PATH=$TMP/autoconf-tmp/usr/bin:$PATH
+# Build or unpack build-time dependencies:
+. build-deps.sh
cd $TMP
rm -rf thunderbird-$RELEASEVER
@@ -158,14 +160,17 @@ cd ..
rm -rf thunderbird-unpack
cd thunderbird-$RELEASEVER || exit 1
+# Delete object directory if it was mistakenly included in the tarball:
+rm -rf obj-x86_64-pc-linux-gnu
+
# Retain GTK+ v2 scrolling behavior:
-zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1
+zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --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
+# Bypass a test that fails the build:
+zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1
# Fetch localization, if requested:
if [ ! -z $MOZLOCALIZE ]; then
@@ -179,7 +184,7 @@ fi
# Arch-dependent patches:
case "$ARCH" in
armv7hl) ARCH_CONFIG="--with-arch=armv7-a --with-float-abi=hard --with-fpu=vfpv3-d16 --disable-elf-hack"
- # Make firefox compile on ARM platforms lacking neon support:
+ # Make Thunderbird compile on ARM platforms lacking neon support:
zcat $CWD/mozilla-firefox.xpcom_arm.patch.gz | patch -p1 --verbose || exit 1
;;
*) ARCH_CONFIG=" "
@@ -272,6 +277,9 @@ echo "ac_add_options --disable-tests" >> .mozconfig
./mach buildsymbols || exit 1
DESTDIR=$PKG ./mach install || exit 1
+# Clean up the build time dependencies:
+rm -rf $TMP/mozilla-thunderbird-build-deps
+
# We don't need these (just symlinks anyway):
rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-devel-$RELEASEVER
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff b/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff
deleted file mode 100644
index 83d607a5d..000000000
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.gettid.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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/mozilla-thunderbird/tb.ui.scrollToClick.diff b/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff
index d3eb0e1e1..3997ee633 100644
--- a/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff
+++ b/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff
@@ -1,12 +1,12 @@
---- ./mozilla/modules/libpref/init/all.js.orig 2017-06-12 15:12:08.000000000 -0500
-+++ ./mozilla/modules/libpref/init/all.js 2017-06-14 18:42:42.342920194 -0500
-@@ -235,6 +235,9 @@
+--- ./modules/libpref/init/all.js.orig 2019-08-26 16:32:16.000000000 -0500
++++ ./modules/libpref/init/all.js 2019-08-27 11:34:41.749716932 -0500
+@@ -258,6 +258,9 @@
// If true, all popups won't hide automatically on blur
pref("ui.popup.disable_autohide", false);
+// Default to GTK+ v2 type scrolling:
+pref("ui.scrollToClick", 0);
+
- pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always
- // 0 = default: always, except in high contrast mode
- // 1 = always
+ #ifdef XP_MACOSX
+ pref("ui.touchbar.layout", "Back,Forward,Reload,OpenLocation,NewTab,Share");
+ #endif
diff --git a/source/xap/mozilla-thunderbird/unbreakdocs.diff b/source/xap/mozilla-thunderbird/unbreakdocs.diff
index b76dc71d7..03d8e6b42 100644
--- a/source/xap/mozilla-thunderbird/unbreakdocs.diff
+++ b/source/xap/mozilla-thunderbird/unbreakdocs.diff
@@ -1,11 +1,5 @@
-
-https://lists.freebsd.org/pipermail/freebsd-gecko/2019-March/009206.html
-https://github.com/grahamperrin/Waterfox/pull/7/files
-
-
-diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo/components/style/lib.rs
---- firefox-60.6.0_orig/servo/components/style/lib.rs 2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style/lib.rs 2019-03-20 13:06:18.611024453 +0000
+--- ./servo/components/style/lib.rs.orig 2019-07-05 20:44:35.000000000 -0500
++++ ./servo/components/style/lib.rs 2019-07-08 13:51:55.460242952 -0500
@@ -23,7 +23,7 @@
//! [cssparser]: ../cssparser/index.html
//! [selectors]: ../selectors/index.html
@@ -15,7 +9,7 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
extern crate app_units;
extern crate arrayvec;
-@@ -148,7 +148,7 @@
+@@ -196,7 +196,7 @@
/// Generated from the properties.mako.rs template by build.rs
#[macro_use]
#[allow(unsafe_code)]
@@ -24,15 +18,14 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
pub mod properties {
include!(concat!(env!("OUT_DIR"), "/properties.rs"));
}
-diff -urN firefox-60.6.0_orig/servo/components/style_traits/lib.rs firefox-60.6.0/servo/components/style_traits/lib.rs
---- firefox-60.6.0_orig/servo/components/style_traits/lib.rs 2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style_traits/lib.rs 2019-03-20 13:06:47.137024070 +0000
-@@ -9,7 +9,7 @@
+--- ./servo/components/style_traits/lib.rs.orig 2019-07-08 13:51:55.462242953 -0500
++++ ./servo/components/style_traits/lib.rs 2019-07-08 13:53:44.853249956 -0500
+@@ -8,7 +8,7 @@
+
#![crate_name = "style_traits"]
#![crate_type = "rlib"]
-
-#![deny(unsafe_code, missing_docs)]
+#![deny(unsafe_code)]
extern crate app_units;
- #[macro_use] extern crate bitflags;
+ #[macro_use]