Hi,
assorted mozilla updates:
- firefox 69.0
- update firefox-esr to 68.0, as 60.0 is going EOL and if we want to
keep updating esr in 6.6-stable... note that esr will now be pledged
as mainline firefox.
- update thunderbird to 68.0 - maybe a bit early (cf
https://www.thunderbird.net/en-US/thunderbird/68.0/releasenotes/ for
the many changes) as there will probably be a 68.1 soon, but 60.0 will
soon be EOL too and i've been using 68.0 betas for the past months
without issues, so commiting it will force ppl to dogfood it.
Thoughts ? tests ? comments ? yay/nays/nobody cares ?
Landry
? notes-sandbox
? patches-cubebremote
? patches-debugvideo
? pledge-59.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.390
diff -u -r1.390 Makefile
--- Makefile 15 Aug 2019 05:47:59 -0000 1.390
+++ Makefile 28 Aug 2019 07:12:55 -0000
@@ -5,7 +5,7 @@
# Don't forget to bump www/firefox-i18n after updates.
-MOZILLA_VERSION = 68.0.2
+MOZILLA_VERSION = 69.0rc1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
@@ -48,7 +48,7 @@
# 63 requires node because why not #1483595
BUILD_DEPENDS += lang/node
# 63 requires cbindgen #1478813
-BUILD_DEPENDS += devel/cbindgen>=0.8.7
+BUILD_DEPENDS += devel/cbindgen>=0.9.0
# 67 requires nasm for bundled libav1d
BUILD_DEPENDS += devel/nasm
@@ -62,9 +62,6 @@
MAKE_ENV += BUILD_VERBOSE_LOG="1"
CONFIGURE_ARGS += --enable-release #1386371
-# rust-simd doesn't work with lang/rust>=1.33
-#CONFIGURE_ARGS += --enable-rust-simd #1261841
-CONFIGURE_ARGS += --enable-webrender=build
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg
target_feature=\"sse2\""
@@ -72,7 +69,7 @@
DPB_PROPERTIES = lonesome
.endif
CONFIGURE_ARGS += --enable-sandbox --enable-content-sandbox
-
+CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
SUBST_VARS += LOCALBASE X11BASE
show-commit:
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
retrieving revision 1.196
diff -u -r1.196 distinfo
--- distinfo 15 Aug 2019 05:47:59 -0000 1.196
+++ distinfo 28 Aug 2019 07:12:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-68.0.2.source.tar.xz) =
mz5tj5mBn57anrukA7ZEorltGUULQsrkIrv0OGkCqEA=
-SIZE (mozilla/firefox-68.0.2.source.tar.xz) = 311257408
+SHA256 (mozilla/firefox-69.0.source.tar.xz) =
XR5wO5HxxMmypiUbQGf1/tRXKMZA8lemlvMiihtlJ9s=
+SIZE (mozilla/firefox-69.0.source.tar.xz) = 315384680
Index: patches/patch-security_manager_pki_resources_content_exceptionDialog_js
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-security_manager_pki_resources_content_exceptionDialog_js,v
retrieving revision 1.22
diff -u -r1.22 patch-security_manager_pki_resources_content_exceptionDialog_js
--- patches/patch-security_manager_pki_resources_content_exceptionDialog_js
9 Jul 2019 18:04:16 -0000 1.22
+++ patches/patch-security_manager_pki_resources_content_exceptionDialog_js
28 Aug 2019 07:12:55 -0000
@@ -3,7 +3,7 @@
Index: security/manager/pki/resources/content/exceptionDialog.js
--- security/manager/pki/resources/content/exceptionDialog.js.orig
+++ security/manager/pki/resources/content/exceptionDialog.js
-@@ -239,6 +239,7 @@ function updateCertStatus() {
+@@ -248,6 +248,7 @@ function updateCertStatus() {
// In these cases, we do want to enable the "Add Exception" button
gDialog.getButton("extra1").disabled = false;
Index: patches/patch-widget_nsPrintSettingsImpl_cpp
===================================================================
RCS file:
/cvs/ports/www/mozilla-firefox/patches/patch-widget_nsPrintSettingsImpl_cpp,v
retrieving revision 1.6
diff -u -r1.6 patch-widget_nsPrintSettingsImpl_cpp
--- patches/patch-widget_nsPrintSettingsImpl_cpp 9 Jul 2019 18:04:16
-0000 1.6
+++ patches/patch-widget_nsPrintSettingsImpl_cpp 28 Aug 2019 07:12:55
-0000
@@ -2,7 +2,7 @@
Index: widget/nsPrintSettingsImpl.cpp
--- widget/nsPrintSettingsImpl.cpp.orig
+++ widget/nsPrintSettingsImpl.cpp
-@@ -26,7 +26,7 @@ nsPrintSettings::nsPrintSettings()
+@@ -23,7 +23,7 @@ nsPrintSettings::nsPrintSettings()
mIsCancelled(false),
mSaveOnCancel(true),
mPrintSilent(false),
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- Makefile 12 Jul 2019 20:50:46 -0000 1.102
+++ Makefile 28 Aug 2019 07:14:10 -0000
@@ -3,7 +3,7 @@
COMMENT = Firefox web browser, Extended Support Release
ONLY_FOR_ARCHS = amd64 i386
-MOZILLA_VERSION = 60.8.0esr
+MOZILLA_VERSION = 68.1.0esrrc1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
@@ -11,7 +11,7 @@
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
HOMEPAGE = https://www.mozilla.org/firefox/organizations/
PKGNAME = ${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//}
-SO_VERSION = 5.0
+SO_VERSION = 6.0
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
CATEGORIES = www
@@ -31,8 +31,6 @@
MOZILLA_USE_BUNDLED_LIBEVENT = Yes
# firefox >= 46 defaults to gtk+3
MOZILLA_USE_GTK3 = Yes
-# 56 requires 59.1
-MOZILLA_USE_BUNDLED_ICU = Yes
# 59 is broken with system cairo and the option is being dropped
MOZILLA_USE_BUNDLED_CAIRO = Yes
# #1460600
@@ -42,8 +40,16 @@
BUILD_DEPENDS += lang/rust
# stylo build needs LLVM
BUILD_DEPENDS += devel/llvm
+# 61 requires both versions of python
+BUILD_DEPENDS += lang/python/${MODPY_DEFAULT_VERSION_3}
+# 63 requires node because why not #1483595
+BUILD_DEPENDS += lang/node
+# 63 requires cbindgen #1478813
+BUILD_DEPENDS += devel/cbindgen>=0.9.0
+# 67 requires nasm for bundled libav1d
+BUILD_DEPENDS += devel/nasm
-WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
+WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm ${COMPILER_LIBCXX}
# Regression tests are too hard to adapt to run here
NO_TEST = Yes
@@ -54,16 +60,15 @@
# avoid conflict with mainline firefox
CONFIGURE_ARGS += --with-app-name=firefox-esr
-# bug 857628
-CONFIGURE_ARGS += --enable-pie
CONFIGURE_ARGS += --enable-release #1386371
-# rust-simd doesn't work with lang/rust>=1.33
-#CONFIGURE_ARGS += --enable-rust-simd #1261841
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg
target_feature=\"sse2\""
DPB_PROPERTIES = lonesome
.endif
+CONFIGURE_ARGS += --enable-sandbox --enable-content-sandbox
+CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
+CONFIGURE_ARGS += --with-clang-path=${LOCALBASE}/bin/clang
post-install:
# install prefs
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/firefox-esr/distinfo,v
retrieving revision 1.73
diff -u -r1.73 distinfo
--- distinfo 9 Jul 2019 18:05:14 -0000 1.73
+++ distinfo 28 Aug 2019 07:14:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-60.8.0esr.source.tar.xz) =
wTOH2UTmNa69Xx0s6at3y3BqdAQ6JAy7e3BlRRlIf74=
-SIZE (mozilla/firefox-60.8.0esr.source.tar.xz) = 268791200
+SHA256 (mozilla/firefox-68.1.0esr.source.tar.xz) =
9W9fpaR0S+C5rPJZy5kSVNcIpQuaChLR2Eb/pabECaw=
+SIZE (mozilla/firefox-68.1.0esr.source.tar.xz) = 312155752
Index: files/all-openbsd.js
===================================================================
RCS file: /cvs/ports/www/firefox-esr/files/all-openbsd.js,v
retrieving revision 1.1
diff -u -r1.1 all-openbsd.js
--- files/all-openbsd.js 29 Apr 2014 21:30:57 -0000 1.1
+++ files/all-openbsd.js 28 Aug 2019 07:14:10 -0000
@@ -1,4 +1,14 @@
// OpenBSD-specific defaults overrides
+pref("media.autoplay.default", 1);
+pref("app.shield.optoutstudies.enabled", false);
+pref("app.normandy.enabled",false);
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
pref("spellchecker.dictionary_path", "${LOCALBASE}/share/mozilla-dicts/");
+// enable pledging the content process
+pref("security.sandbox.content.level", 1);
+pref("security.sandbox.pledge.main","stdio rpath wpath cpath inet proc exec
prot_exec flock ps sendfd recvfd dns vminfo tty drm unix fattr getpw mcast
video");
+pref("security.sandbox.pledge.content","stdio rpath wpath cpath inet recvfd
sendfd prot_exec unix drm ps");
+pref("extensions.pocket.enabled", false);
+pref("browser.newtabpage.enabled", false);
+pref("browser.startup.homepage", "about:blank");
Index: patches/patch-intl_icu_source_Makefile_in
===================================================================
RCS file: /cvs/ports/www/firefox-esr/patches/patch-intl_icu_source_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-intl_icu_source_Makefile_in
--- patches/patch-intl_icu_source_Makefile_in 27 Jun 2018 05:11:34 -0000
1.4
+++ patches/patch-intl_icu_source_Makefile_in 28 Aug 2019 07:14:10 -0000
@@ -12,7 +12,7 @@
Index: intl/icu/source/Makefile.in
--- intl/icu/source/Makefile.in.orig
+++ intl/icu/source/Makefile.in
-@@ -331,7 +331,7 @@ $(top_builddir)/config/pkgdataMakefile:
+@@ -337,7 +337,7 @@ $(top_builddir)/config/pkgdataMakefile:
$(top_builddir)/config/icu-config: $(top_builddir)/Makefile
$(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom
$(top_builddir)/config/Makefile.inc @platform_make_fragment@
$(top_srcdir)/config/make2sh.sed
-$(RMV) $@
Index: patches/patch-js_src_jit_ProcessExecutableMemory_h
===================================================================
RCS file:
/cvs/ports/www/firefox-esr/patches/patch-js_src_jit_ProcessExecutableMemory_h,v
retrieving revision 1.2
diff -u -r1.2 patch-js_src_jit_ProcessExecutableMemory_h
--- patches/patch-js_src_jit_ProcessExecutableMemory_h 27 Jun 2018 05:11:34
-0000 1.2
+++ patches/patch-js_src_jit_ProcessExecutableMemory_h 28 Aug 2019 07:14:10
-0000
@@ -3,7 +3,7 @@
Index: js/src/jit/ProcessExecutableMemory.h
--- js/src/jit/ProcessExecutableMemory.h.orig
+++ js/src/jit/ProcessExecutableMemory.h
-@@ -14,7 +14,7 @@ namespace jit {
+@@ -16,7 +16,7 @@ namespace jit {
// Limit on the number of bytes of executable memory to prevent JIT spraying
// attacks.
@@ -11,4 +11,4 @@
+#if JS_BITS_PER_WORD == 32 || defined(__OpenBSD__)
static const size_t MaxCodeBytesPerProcess = 140 * 1024 * 1024;
#else
- static const size_t MaxCodeBytesPerProcess = 1 * 1024 * 1024 * 1024;
+ // This is the largest number which satisfies various alignment static
Index: patches/patch-servo_components_style_build_gecko_rs
===================================================================
RCS file: patches/patch-servo_components_style_build_gecko_rs
diff -N patches/patch-servo_components_style_build_gecko_rs
--- patches/patch-servo_components_style_build_gecko_rs 2 Jul 2019 16:51:49
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-servo_components_style_build_gecko_rs,v 1.1 2019/07/02
16:51:49 landry Exp $
-
-Fix build with rust 1.36.
-From https://reviews.freebsd.org/D20810#change-K68aYoUXfAu1
-
-Index: servo/components/style/build_gecko.rs
---- servo/components/style/build_gecko.rs.orig
-+++ servo/components/style/build_gecko.rs
-@@ -36,6 +36,7 @@ mod bindings {
- use std::fs::{self, File};
- use std::io::{Read, Write};
- use std::path::{Path, PathBuf};
-+ use std::panic::UnwindSafe;
- use std::process::{Command, exit};
- use std::slice;
- use std::sync::Mutex;
-@@ -384,6 +385,7 @@ mod bindings {
- fn generate_structs() {
- #[derive(Debug)]
- struct Callbacks(HashMap<String, RegexSet>);
-+ impl UnwindSafe for Callbacks {}
- impl ParseCallbacks for Callbacks {
- fn enum_variant_behavior(&self,
- enum_name: Option<&str>,
Index: patches/patch-servo_components_style_lib_rs
===================================================================
RCS file: patches/patch-servo_components_style_lib_rs
diff -N patches/patch-servo_components_style_lib_rs
--- patches/patch-servo_components_style_lib_rs 11 Mar 2019 19:04:37 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-servo_components_style_lib_rs,v 1.1 2019/03/11 19:04:37
semarie Exp $
-Allow missing_docs. else build fail with rustc 1.33.0
-Index: servo/components/style/lib.rs
---- servo/components/style/lib.rs.orig
-+++ servo/components/style/lib.rs
-@@ -23,7 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
-
--#![deny(missing_docs)]
-
- extern crate app_units;
- extern crate arrayvec;
Index: patches/patch-servo_components_style_traits_lib_rs
===================================================================
RCS file: patches/patch-servo_components_style_traits_lib_rs
diff -N patches/patch-servo_components_style_traits_lib_rs
--- patches/patch-servo_components_style_traits_lib_rs 11 Mar 2019 19:04:37
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-servo_components_style_traits_lib_rs,v 1.1 2019/03/11 19:04:37
semarie Exp $
-Allow missing_docs. else build fail with rustc 1.33.0
-Index: servo/components/style_traits/lib.rs
---- servo/components/style_traits/lib.rs.orig
-+++ servo/components/style_traits/lib.rs
-@@ -9,7 +9,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;
Index: patches/patch-storage_mozStorageConnection_cpp
===================================================================
RCS file:
/cvs/ports/www/firefox-esr/patches/patch-storage_mozStorageConnection_cpp,v
retrieving revision 1.4
diff -u -r1.4 patch-storage_mozStorageConnection_cpp
--- patches/patch-storage_mozStorageConnection_cpp 11 Mar 2019 19:04:37
-0000 1.4
+++ patches/patch-storage_mozStorageConnection_cpp 28 Aug 2019 07:14:10
-0000
@@ -1,7 +1,4 @@
-$OpenBSD: patch-storage_mozStorageConnection_cpp,v 1.4 2019/03/11 19:04:37
semarie Exp $
-
-chunk 1:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1470961
+$OpenBSD: patch-storage_mozStorageConnection_cpp,v 1.18 2019/07/09 18:04:16
landry Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
@@ -9,28 +6,17 @@
Index: storage/mozStorageConnection.cpp
--- storage/mozStorageConnection.cpp.orig
+++ storage/mozStorageConnection.cpp
-@@ -227,9 +227,7 @@ void basicFunctionHelper(sqlite3_context *aCtx, int aA
- return;
+@@ -782,6 +782,13 @@ nsresult Connection::initializeInternal() {
+ return convertResultCode(srv);
}
- int retcode = variantToSQLiteT(aCtx, result);
-- if (retcode == SQLITE_IGNORE) {
-- ::sqlite3_result_int(aCtx, SQLITE_IGNORE);
-- } else if (retcode != SQLITE_OK) {
-+ if (retcode != SQLITE_OK) {
- NS_WARNING("User function returned invalid data type!");
- ::sqlite3_result_error(aCtx, "User function returned invalid data type",
- -1);
-@@ -751,6 +749,13 @@ nsresult Connection::initializeInternal() {
- // Register our built-in SQL collating sequences.
- srv = registerCollations(mDBConn, mStorageService);
- if (srv != SQLITE_OK) {
-+ return convertResultCode(srv);
-+ }
-+
+
+ srv = ::sqlite3_exec(mDBConn, "PRAGMA secure_delete = ON", NULL, NULL,
NULL);
+ if (srv != SQLITE_OK) {
+ ::sqlite3_close(mDBConn);
+ mDBConn = nullptr;
- return convertResultCode(srv);
- }
-
++ return convertResultCode(srv);
++ }
++
+ // Set the synchronous PRAGMA, according to the preference.
+ switch (Service::getSynchronousPref()) {
+ case 2:
Index: patches/patch-storage_mozStorageService_cpp
===================================================================
RCS file: patches/patch-storage_mozStorageService_cpp
diff -N patches/patch-storage_mozStorageService_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-storage_mozStorageService_cpp 28 Aug 2019 07:14:10 -0000
@@ -0,0 +1,17 @@
+$OpenBSD: patch-storage_mozStorageService_cpp,v 1.1 2019/05/21 16:51:12 landry
Exp $
+
+dont check for SQLITE_SECURE_DELETE at runtime, we disable it
+
+Cf https://bugzilla.mozilla.org/show_bug.cgi?id=1049920 &
https://phabricator.services.mozilla.com/D18057
+
+Index: storage/mozStorageService.cpp
+--- storage/mozStorageService.cpp.orig
++++ storage/mozStorageService.cpp
+@@ -188,7 +188,6 @@ already_AddRefed<Service> Service::getSingleton() {
+ // or newer. Our configure check ensures we are using a new enough version
+ // at compile time.
+ if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number() ||
+- !::sqlite3_compileoption_used("SQLITE_SECURE_DELETE") ||
+ !::sqlite3_compileoption_used("SQLITE_THREADSAFE=1") ||
+ !::sqlite3_compileoption_used("SQLITE_ENABLE_FTS3") ||
+ !::sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY") ||
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/firefox-esr/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:24 -0000 1.11
+++ pkg/PLIST 28 Aug 2019 07:14:10 -0000
@@ -17,16 +17,11 @@
lib/${MOZILLA_PROJECT}-esr/browser/defaults/
lib/${MOZILLA_PROJECT}-esr/browser/defaults/preferences/
lib/${MOZILLA_PROJECT}-esr/browser/defaults/preferences/all-openbsd.js
-lib/${MOZILLA_PROJECT}-esr/browser/extensions/
-lib/${MOZILLA_PROJECT}-esr/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
lib/${MOZILLA_PROJECT}-esr/browser/features/
-lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
-lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
-lib/${MOZILLA_PROJECT}-esr/browser/features/${MOZILLA_PROJECT}@getpocket.com.xpi
-lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
-lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
+lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
+lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
lib/${MOZILLA_PROJECT}-esr/browser/features/[email protected]
lib/${MOZILLA_PROJECT}-esr/browser/omni.ja
lib/${MOZILLA_PROJECT}-esr/chrome.manifest
@@ -34,9 +29,6 @@
lib/${MOZILLA_PROJECT}-esr/defaults/pref/
lib/${MOZILLA_PROJECT}-esr/defaults/pref/channel-prefs.js
lib/${MOZILLA_PROJECT}-esr/dependentlibs.list
-lib/${MOZILLA_PROJECT}-esr/dictionaries/
-lib/${MOZILLA_PROJECT}-esr/dictionaries/en-US.aff
-lib/${MOZILLA_PROJECT}-esr/dictionaries/en-US.dic
lib/${MOZILLA_PROJECT}-esr/distribution/
lib/${MOZILLA_PROJECT}-esr/distribution/distribution.ini
@bin lib/${MOZILLA_PROJECT}-esr/${MOZILLA_PROJECT}-esr
? 54.0b1-clangbase.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.293
diff -u -r1.293 Makefile
--- Makefile 12 Jul 2019 20:47:30 -0000 1.293
+++ Makefile 28 Aug 2019 07:15:17 -0000
@@ -6,7 +6,7 @@
# Don't forget to bump mail/thunderbird-i18n after updates.
-MOZILLA_VERSION = 60.8.0
+MOZILLA_VERSION = 68.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = comm/mail
@@ -14,13 +14,12 @@
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
-# version = (TB+2)/10
-PKGNAME-lightning = lightning-6.2.8.0
+PKGNAME-lightning = lightning-${MOZILLA_VERSION}
EPOCH-lightning = 0
HOMEPAGE = http://www.mozilla.org/thunderbird/
-SO_VERSION = 33.0
+SO_VERSION = 34.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@@ -46,8 +45,19 @@
MOZILLA_USE_BUNDLED_ICU = Yes
# 59 is broken with system cairo and the option is being dropped
MOZILLA_USE_BUNDLED_CAIRO = Yes
+# #1460600
+MOZILLA_USE_BUNDLED_HUNSPELL = Yes
+
# 53 needs rust
BUILD_DEPENDS += lang/rust
+# stylo build needs LLVM
+BUILD_DEPENDS += devel/llvm
+# 61 requires both versions of python
+BUILD_DEPENDS += lang/python/${MODPY_DEFAULT_VERSION_3}
+# 63 requires node because why not #1483595
+BUILD_DEPENDS += lang/node
+# 63 requires cbindgen #1478813
+BUILD_DEPENDS += devel/cbindgen
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
@@ -68,12 +78,6 @@
# build lightning xpi
CONFIGURE_ARGS += --enable-calendar
-# bug 1341234
-CONFIGURE_ARGS += --disable-stylo
-
-# bug 857628
-CONFIGURE_ARGS += --enable-pie
-
ALL_TARGET = default
GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
@@ -81,21 +85,18 @@
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} #\
# lightning {e2fda1a4-762b-4020-b5ad-a41df1933103}
-.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols #maybe also needed
+.if ${MACHINE_ARCH} == "i386"
DPB_PROPERTIES += lonesome
.endif
-EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}/extensions/
+EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/
post-install:
-#.for xpi guid in ${GUIDS}
-# cp ${WRKBUILD}/dist/xpi-stage/${xpi}*.xpi ${EXTDIR}/${guid}.xpi
-#.endfor
-
- mv
${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
\
- ${EXTDIR}
- rmdir ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/
+.for xpi guid in ${GUIDS}
+ cp ${WRKBUILD}/dist/xpi-stage/${xpi}*.xpi ${EXTDIR}/${guid}.xpi
+.endfor
+
# install prefs
${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
${PREFIX}/lib/${MOZILLA_PROJECT}/defaults/pref/all-openbsd.js
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/distinfo,v
retrieving revision 1.139
diff -u -r1.139 distinfo
--- distinfo 9 Jul 2019 18:09:19 -0000 1.139
+++ distinfo 28 Aug 2019 07:15:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/thunderbird-60.8.0.source.tar.xz) =
HnoT5ktjR20iNaqsaCP9q5Sa9Fz81aJe5xDLrgjC9dE=
-SIZE (mozilla/thunderbird-60.8.0.source.tar.xz) = 285643576
+SHA256 (mozilla/thunderbird-68.0.source.tar.xz) =
+H2t4t1k72HehCgS0+QtgrilQZiNqFEHd3ir+i69ldE=
+SIZE (mozilla/thunderbird-68.0.source.tar.xz) = 338451344
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.4
diff -u -r1.4 patch-mozilla_js_src_jit_ProcessExecutableMemory_h
--- patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 3 Oct 2018
06:43:10 -0000 1.4
+++ patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 28 Aug 2019
07:15:17 -0000
@@ -3,7 +3,7 @@
Index: js/src/jit/ProcessExecutableMemory.h
--- js/src/jit/ProcessExecutableMemory.h.orig
+++ js/src/jit/ProcessExecutableMemory.h
-@@ -14,7 +14,7 @@ namespace jit {
+@@ -16,7 +16,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.8
diff -u -r1.8
patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
---
patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
3 Oct 2018 06:43:10 -0000 1.8
+++
patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
28 Aug 2019 07:15:17 -0000
@@ -3,7 +3,7 @@
Index: security/manager/pki/resources/content/exceptionDialog.js
--- security/manager/pki/resources/content/exceptionDialog.js.orig
+++ security/manager/pki/resources/content/exceptionDialog.js
-@@ -220,6 +220,7 @@ function updateCertStatus() {
+@@ -241,6 +241,7 @@ function updateCertStatus() {
// In these cases, we do want to enable the "Add Exception" button
gDialog.getButton("extra1").disabled = false;
Index: patches/patch-mozilla_storage_mozStorageConnection_cpp
===================================================================
RCS file:
/cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_storage_mozStorageConnection_cpp,v
retrieving revision 1.4
diff -u -r1.4 patch-mozilla_storage_mozStorageConnection_cpp
--- patches/patch-mozilla_storage_mozStorageConnection_cpp 29 Jan 2019
20:56:22 -0000 1.4
+++ patches/patch-mozilla_storage_mozStorageConnection_cpp 28 Aug 2019
07:15:17 -0000
@@ -3,7 +3,7 @@
Index: storage/mozStorageConnection.cpp
--- storage/mozStorageConnection.cpp.orig
+++ storage/mozStorageConnection.cpp
-@@ -754,6 +754,13 @@ nsresult Connection::initializeInternal() {
+@@ -775,6 +775,13 @@ nsresult Connection::initializeInternal() {
return convertResultCode(srv);
}
Index: patches/patch-storage_mozStorageService_cpp
===================================================================
RCS file: patches/patch-storage_mozStorageService_cpp
diff -N patches/patch-storage_mozStorageService_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-storage_mozStorageService_cpp 28 Aug 2019 07:15:17 -0000
@@ -0,0 +1,15 @@
+$OpenBSs ~
+
+dont check for SQLITE_SECURE_DELETE at runtime, we disable it
+
+Index: storage/mozStorageService.cpp
+--- storage/mozStorageService.cpp.orig
++++ storage/mozStorageService.cpp
+@@ -188,7 +188,6 @@ already_AddRefed<Service> Service::getSingleton() {
+ // or newer. Our configure check ensures we are using a new enough version
+ // at compile time.
+ if (SQLITE_VERSION_NUMBER > ::sqlite3_libversion_number() ||
+- !::sqlite3_compileoption_used("SQLITE_SECURE_DELETE") ||
+ !::sqlite3_compileoption_used("SQLITE_THREADSAFE=1") ||
+ !::sqlite3_compileoption_used("SQLITE_ENABLE_FTS3") ||
+ !::sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY") ||
Index: pkg/PLIST-lightning
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST-lightning,v
retrieving revision 1.22
diff -u -r1.22 PLIST-lightning
--- pkg/PLIST-lightning 3 Oct 2018 06:43:10 -0000 1.22
+++ pkg/PLIST-lightning 28 Aug 2019 07:15:17 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-lightning,v 1.22 2018/10/03 06:43:10 landry Exp $
@conflict lightning-<=1.0b1
@pkgpath productivity/sunbird,-lightning
-lib/${MOZILLA_PROJECT}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
+lib/${MOZILLA_PROJECT}/distribution/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.xpi
+lib/${MOZILLA_PROJECT}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST-main,v
retrieving revision 1.26
diff -u -r1.26 PLIST-main
--- pkg/PLIST-main 3 Oct 2018 06:43:10 -0000 1.26
+++ pkg/PLIST-main 28 Aug 2019 07:15:17 -0000
@@ -24,13 +24,11 @@
lib/${MOZILLA_PROJECT}/defaults/pref/all-openbsd.js
lib/${MOZILLA_PROJECT}/defaults/pref/channel-prefs.js
lib/${MOZILLA_PROJECT}/dependentlibs.list
-lib/${MOZILLA_PROJECT}/dictionaries/
-lib/${MOZILLA_PROJECT}/dictionaries/en-US.aff
-lib/${MOZILLA_PROJECT}/dictionaries/en-US.dic
lib/${MOZILLA_PROJECT}/distribution/
lib/${MOZILLA_PROJECT}/distribution/distribution.ini
-lib/${MOZILLA_PROJECT}/extensions/
-lib/${MOZILLA_PROJECT}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+lib/${MOZILLA_PROJECT}/distribution/extensions/
+lib/${MOZILLA_PROJECT}/features/
+lib/${MOZILLA_PROJECT}/features/wetransfer@extensions.${MOZILLA_PROJECT}.net.xpi
lib/${MOZILLA_PROJECT}/gtk2/
@lib lib/${MOZILLA_PROJECT}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION}
lib/${MOZILLA_PROJECT}/isp/
