diff options
Diffstat (limited to '')
17 files changed, 70 insertions, 98 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index b3a2b8663..3da0bab57 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -93,6 +93,8 @@ cd ${PKGNAM}-$VERSION || exit 1 # Fix mysql_install_db if PAM is not installed: if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.0 ]; then zcat $CWD/mysql_install_db.nopam.diff.gz | patch -p1 --verbose || exit 1 + # Also no PAM plugin then: + zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1 fi chown -R root:root . diff --git a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff new file mode 100644 index 000000000..34eedf5af --- /dev/null +++ b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff @@ -0,0 +1,11 @@ +--- ./cmake/build_configurations/mysql_release.cmake.orig 2019-09-08 16:02:29.000000000 -0500 ++++ ./cmake/build_configurations/mysql_release.cmake 2019-09-11 14:56:53.845129062 -0500 +@@ -124,7 +124,7 @@ + + IF(UNIX) + SET(WITH_EXTRA_CHARSETS all CACHE STRING "") +- SET(PLUGIN_AUTH_PAM YES) ++ SET(PLUGIN_AUTH_PAM NO) + + IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + IF(NOT IGNORE_AIO_CHECK) diff --git a/source/n/curl/cacert.pem b/source/n/curl/cacert.pem index 8e92f772f..65be2181d 100644 --- a/source/n/curl/cacert.pem +++ b/source/n/curl/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed May 15 03:12:09 2019 GMT +## Certificate data from Mozilla as of: Wed Aug 28 03:12:10 2019 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.27. -## SHA256: 61eaa79ac46d923f2f74dfe401189424e96fa8736102b47ba2cdb4ea19af2cc8 +## SHA256: fffa309937c3be940649293f749b8207fabc6eb224e50e4bb3f2c5e44e0d6a6b ## @@ -2613,37 +2613,6 @@ kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su -----END CERTIFICATE----- -Certinomis - Root CA -==================== ------BEGIN CERTIFICATE----- -MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK -Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg -LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx -EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD -ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos -P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo -d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap -z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00 -8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x -RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE -6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t -FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV -PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH -i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj -YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I -6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF -AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV -WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw -Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX -lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ -y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9 -Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng -DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi -I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM -cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr -hkIGuUE= ------END CERTIFICATE----- - OISTE WISeKey Global Root GB CA =============================== -----BEGIN CERTIFICATE----- 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] |