Le Sun, Aug 15, 2021 at 12:19:14PM +0200, Landry Breuil a écrit : > Hi, > > here's an update to the just-released thunderbird 91, cf > https://www.thunderbird.net/en-US/thunderbird/91.0/releasenotes/ and > https://blog.thunderbird.net/2021/08/thunderbird-91-available-now/ for > details. This is a major update from thunderbird 78, based off the > firefox 91 esr branch. I plan to commit it before 7.0 is locked > (probably in the coming month or at the next point release) so that it > gets security updates.
diff for thunderbird 91.0.2 below. Feedback still welcome :)
? build.log ? patch-comm_mail_base_content_msgHdrView_js Index: Makefile =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v retrieving revision 1.357 diff -u -p -r1.357 Makefile --- Makefile 15 Aug 2021 06:30:24 -0000 1.357 +++ Makefile 21 Aug 2021 06:33:50 -0000 @@ -5,7 +5,7 @@ COMMENT = Mozilla e-mail, calendar, rss # Don't forget to bump mail/thunderbird-i18n after updates. -MOZILLA_VERSION = 78.13.0 +MOZILLA_VERSION = 91.0.2 MOZILLA_BRANCH = release MOZILLA_PROJECT = thunderbird MOZILLA_CODENAME = comm/mail @@ -17,7 +17,7 @@ DWZ = : HOMEPAGE = https://www.thunderbird.net/ -SO_VERSION = 35.0 +SO_VERSION = 36.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. @@ -41,12 +41,19 @@ MOZILLA_USE_BUNDLED_ICU = Yes BUILD_DEPENDS += lang/node # 63 requires cbindgen #1478813 BUILD_DEPENDS += devel/cbindgen +.if (${MACHINE_ARCH}==amd64) || (${MACHINE_ARCH}==i386) +# 67 requires nasm for bundled libdav1d +BUILD_DEPENDS += devel/nasm +.endif +#1670807 +BUILD_DEPENDS += devel/m4 WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//} NO_TEST = Yes CONFIGURE_STYLE = simple +CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py CONFIGURE_ARGS += --prefix=${PREFIX} # pledge strings to be defined, and no multiprocess anyway.. CONFIGURE_ARGS += --disable-sandbox @@ -62,15 +69,13 @@ CONFIGURE_ARGS += --disable-debug-symbol DEBUG_CONFIGURE_ARGS += --enable-debug-symbols \ --disable-install-strip MAKE_ENV += BUILD_VERBOSE_LOG="1" CARGOFLAGS="-j${MAKE_JOBS}" +CONFIGURE_ENV += M4=/usr/local/bin/gm4 LIB_DEPENDS += security/botan2 \ devel/libffi \ devel/json-c WANTLIB += X11-xcb Xcursor Xi botan-2 bz2 ffi harfbuzz intl json-c xcb xcb-shm - -# build lightning -CONFIGURE_ARGS += --enable-calendar ALL_TARGET = default Index: distinfo =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/distinfo,v retrieving revision 1.181 diff -u -p -r1.181 distinfo --- distinfo 15 Aug 2021 06:30:24 -0000 1.181 +++ distinfo 21 Aug 2021 06:33:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (mozilla/thunderbird-78.13.0.source.tar.xz) = t+QHblzlYbBq2c2JAFmJ7XH9ckzoPEiIz1adwpMNkOk= -SIZE (mozilla/thunderbird-78.13.0.source.tar.xz) = 354497644 +SHA256 (mozilla/thunderbird-91.0.2.source.tar.xz) = ltCV7fHFwigrDYoLGgYg9ePOfvnm2CJc8GzthLfoYSw= +SIZE (mozilla/thunderbird-91.0.2.source.tar.xz) = 407428980 Index: patches/patch-config_makefiles_rust_mk =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-config_makefiles_rust_mk,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_makefiles_rust_mk --- patches/patch-config_makefiles_rust_mk 24 Sep 2020 15:47:40 -0000 1.3 +++ patches/patch-config_makefiles_rust_mk 21 Aug 2021 06:33:50 -0000 @@ -5,12 +5,12 @@ try to consume less memory when linking Index: config/makefiles/rust.mk --- config/makefiles/rust.mk.orig +++ config/makefiles/rust.mk -@@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. +@@ -70,7 +70,7 @@ ifndef MOZ_DEBUG_RUST + # gkrust_gtest. And not when doing cross-language LTO. + ifndef MOZ_LTO_RUST_CROSS ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -cargo_rustc_flags += -Clto +cargo_rustc_flags += -Clto=thin endif - # Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when - # using -Clto. + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes Index: patches/patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c --- patches/patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c 3 Oct 2018 06:43:10 -0000 1.4 +++ patches/patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c 21 Aug 2021 06:33:50 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-mozilla_js_src_ctypes_li Index: js/src/ctypes/libffi/src/dlmalloc.c --- js/src/ctypes/libffi/src/dlmalloc.c.orig +++ js/src/ctypes/libffi/src/dlmalloc.c -@@ -2520,7 +2520,6 @@ static int init_mparams(void) { +@@ -2525,7 +2525,6 @@ static int init_mparams(void) { #if (FOOTERS && !INSECURE) { @@ -11,7 +11,7 @@ Index: js/src/ctypes/libffi/src/dlmalloc int fd; unsigned char buf[sizeof(size_t)]; /* Try to use /dev/urandom, else fall back on using time */ -@@ -2530,7 +2529,6 @@ static int init_mparams(void) { +@@ -2535,7 +2534,6 @@ static int init_mparams(void) { close(fd); } else Index: patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h,v retrieving revision 1.6 diff -u -p -r1.6 patch-mozilla_js_src_jit_ProcessExecutableMemory_h --- patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 7 Oct 2019 13:43:06 -0000 1.6 +++ patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 21 Aug 2021 06:33:50 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-mozilla_js_src_jit_Proce Index: js/src/jit/ProcessExecutableMemory.h --- js/src/jit/ProcessExecutableMemory.h.orig +++ js/src/jit/ProcessExecutableMemory.h -@@ -16,7 +16,7 @@ namespace jit { +@@ -14,7 +14,7 @@ namespace jit { // Limit on the number of bytes of executable memory to prevent JIT spraying // attacks. Index: patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v retrieving revision 1.10 diff -u -p -r1.10 patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js --- patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js 7 Oct 2019 13:43:06 -0000 1.10 +++ patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js 21 Aug 2021 06:33:50 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-mozilla_security_manager Index: security/manager/pki/resources/content/exceptionDialog.js --- security/manager/pki/resources/content/exceptionDialog.js.orig +++ security/manager/pki/resources/content/exceptionDialog.js -@@ -248,6 +248,7 @@ function updateCertStatus() { +@@ -250,6 +250,7 @@ function updateCertStatus() { // In these cases, we do want to enable the "Add Exception" button gDialog.getButton("extra1").disabled = false; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST,v retrieving revision 1.23 diff -u -p -r1.23 PLIST --- pkg/PLIST 16 Aug 2021 06:16:59 -0000 1.23 +++ pkg/PLIST 21 Aug 2021 06:33:50 -0000 @@ -9,11 +9,6 @@ lib/${MOZILLA_PROJECT}/application.ini lib/${MOZILLA_PROJECT}/chrome/ lib/${MOZILLA_PROJECT}/chrome/icons/ lib/${MOZILLA_PROJECT}/chrome/icons/default/ -lib/${MOZILLA_PROJECT}/chrome/icons/default/calendar-alarm-dialog.png -lib/${MOZILLA_PROJECT}/chrome/icons/default/calendar-event-dialog.png -lib/${MOZILLA_PROJECT}/chrome/icons/default/calendar-event-summary-dialog.png -lib/${MOZILLA_PROJECT}/chrome/icons/default/calendar-task-dialog.png -lib/${MOZILLA_PROJECT}/chrome/icons/default/calendar-task-summary-dialog.png lib/${MOZILLA_PROJECT}/chrome/icons/default/default128.png lib/${MOZILLA_PROJECT}/chrome/icons/default/default16.png lib/${MOZILLA_PROJECT}/chrome/icons/default/default22.png @@ -31,8 +26,6 @@ lib/${MOZILLA_PROJECT}/defaults/pref/cha lib/${MOZILLA_PROJECT}/dependentlibs.list lib/${MOZILLA_PROJECT}/distribution/ lib/${MOZILLA_PROJECT}/distribution/distribution.ini -lib/${MOZILLA_PROJECT}/gtk2/ -@lib lib/${MOZILLA_PROJECT}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION} lib/${MOZILLA_PROJECT}/isp/ lib/${MOZILLA_PROJECT}/isp/Bogofilter.sfd lib/${MOZILLA_PROJECT}/isp/DSPAM.sfd
