From decfdfd4bd1825f77a6411ff813a27880f2ff161 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 2 Jun 2020 20:28:21 -0700 Subject: Updated to 77.0 --- ...-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch | 70 ---------------------- ...e-remoting-name-for-GDK-application-names.patch | 42 +++++++------ PKGBUILD | 22 +++---- mozconfig.in | 2 - mozconfig.in.clang | 2 - mozconfig.in.clang.pgo | 2 - 6 files changed, 31 insertions(+), 109 deletions(-) delete mode 100644 0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch diff --git a/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch b/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch deleted file mode 100644 index 99c05bb..0000000 --- a/0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch +++ /dev/null @@ -1,70 +0,0 @@ -From c3acffdb8e0cd46561d2c5131227dc92967cf3d2 Mon Sep 17 00:00:00 2001 -From: Kevin Jacobs -Date: Tue, 14 Apr 2020 18:32:19 +0000 -Subject: [PATCH] Bug 1624128 - Update CK_GCM_PARAMS uses for PKCS11 v3.0 - definition r=keeler - -This patch initializes the ulIvBits member of CK_GCM_PARAMS, which is new in PKCS11 v3. - -For libprio, we instead define NSS_PKCS11_2_0_COMPAT, which yields the old struct definition. - -Differential Revision: https://phabricator.services.mozilla.com/D67740 ---- - dom/crypto/WebCryptoTask.cpp | 1 + - netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c | 1 + - security/manager/ssl/OSKeyStore.cpp | 1 + - third_party/prio/moz.build | 5 +++++ - 4 files changed, 8 insertions(+) - -diff --git a/dom/crypto/WebCryptoTask.cpp b/dom/crypto/WebCryptoTask.cpp -index ad0d1432738f..60a265972d21 100644 ---- a/dom/crypto/WebCryptoTask.cpp -+++ b/dom/crypto/WebCryptoTask.cpp -@@ -600,6 +600,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData { - case CKM_AES_GCM: - gcmParams.pIv = mIv.Elements(); - gcmParams.ulIvLen = mIv.Length(); -+ gcmParams.ulIvBits = gcmParams.ulIvLen * 8; - gcmParams.pAAD = mAad.Elements(); - gcmParams.ulAADLen = mAad.Length(); - gcmParams.ulTagBits = mTagLength; -diff --git a/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c b/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -index e1fdbe36fbf8..2be2ce932ddf 100644 ---- a/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -+++ b/netwerk/srtp/src/crypto/cipher/aes_gcm_nss.c -@@ -271,6 +271,7 @@ static srtp_err_status_t srtp_aes_gcm_nss_do_crypto(void *cv, - - c->params.pIv = c->iv; - c->params.ulIvLen = GCM_IV_LEN; -+ c->params.ulIvBits = GCM_IV_LEN * 8; - c->params.pAAD = c->aad; - c->params.ulAADLen = c->aad_size; - -diff --git a/security/manager/ssl/OSKeyStore.cpp b/security/manager/ssl/OSKeyStore.cpp -index 00bc918c5fdd..c83a559d9c1e 100644 ---- a/security/manager/ssl/OSKeyStore.cpp -+++ b/security/manager/ssl/OSKeyStore.cpp -@@ -663,6 +663,7 @@ nsresult AbstractOSKeyStore::DoCipher(const UniquePK11SymKey& aSymKey, - CK_GCM_PARAMS gcm_params; - gcm_params.pIv = const_cast(ivp); - gcm_params.ulIvLen = mIVLength; -+ gcm_params.ulIvBits = gcm_params.ulIvLen * 8; - gcm_params.ulTagBits = 128; - gcm_params.pAAD = nullptr; - gcm_params.ulAADLen = 0; -diff --git a/third_party/prio/moz.build b/third_party/prio/moz.build -index 3e10fe71ce8e..0a6e3c74a269 100644 ---- a/third_party/prio/moz.build -+++ b/third_party/prio/moz.build -@@ -42,3 +42,8 @@ SOURCES += [ - ] - - FINAL_LIBRARY = 'xul' -+ -+# Use PKCS11 v2 struct definitions for now, otherwise NSS requires -+# CK_GCM_PARAMS.ulIvBits to be set. This workaround is only required -+# until NSS 3.52 RTM and upstream correctly initializes the field. -+DEFINES['NSS_PKCS11_2_0_COMPAT'] = True --- -2.26.2 - diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch index 165a532..73ae042 100644 --- a/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/0001-Use-remoting-name-for-GDK-application-names.patch @@ -1,18 +1,18 @@ -From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001 +From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 25 Mar 2019 20:30:11 +0100 Subject: [PATCH] Use remoting name for GDK application names --- - toolkit/xre/nsAppRunner.cpp | 6 +----- - widget/gtk/nsAppShell.cpp | 7 +++---- - 2 files changed, 4 insertions(+), 9 deletions(-) + toolkit/xre/nsAppRunner.cpp | 6 +----- + widget/gtk/nsAppShell.cpp | 11 ++++------- + 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 984b998133bd..b6c9f013940c 100644 +index da8289200e72..452195b146f3 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -26,7 +26,7 @@ index 984b998133bd..b6c9f013940c 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 0daa78fdbbad..49038d0bb1c8 100644 +index 163a93e2d1a4..4b6d45217671 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -24,6 +24,7 @@ @@ -37,19 +37,23 @@ index 0daa78fdbbad..49038d0bb1c8 100644 #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -175,10 +176,8 @@ nsresult nsAppShell::Init() { - // option when program uses gdk_set_program_class(). - // - // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 -- nsAutoString brandName; -- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); -- if (!brandName.IsEmpty()) { -- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); -+ if (gAppData) { -+ gdk_set_program_class(gAppData->remotingName); +@@ -175,13 +176,9 @@ nsresult nsAppShell::Init() { + // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 + // + // Only bother doing this for the parent process, since it's the one +- // creating top-level windows. (At this point, a child process hasn't +- // received the list of registered chrome packages, so the +- // GetBrandShortName call would fail anyway.) +- nsAutoString brandName; +- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); +- if (!brandName.IsEmpty()) { +- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); ++ // creating top-level windows. ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } } } - -- -2.24.0 +2.26.1 diff --git a/PKGBUILD b/PKGBUILD index f152c0c..5426976 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,14 +18,13 @@ _modclang=0 #_modclang=1 # FIXME pkgname=firefox -pkgver=76.0.1 +pkgver=77.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64 aarch64) license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" -depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg - ttf-font libpulse alsa-lib +depends=(gtk3 libxt mime-types dbus-glib ffmpeg ttf-font libpulse alsa-lib bzip2 libffi icu libjpeg-turbo libevent libvpx nspr nss pixman libpng sqlite libwebp zlib) makedepends=(unzip zip diffutils python-setuptools yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python @@ -44,7 +43,6 @@ conflicts=(firefox-esr) source=( "https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc} 0001-Use-remoting-name-for-GDK-application-names.patch - 0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch $pkgname.desktop distribution.ini mozconfig.in @@ -55,15 +53,14 @@ source=( arc4_remove-health-reporting.patch arc4_remove-system-addons.patch ) -b2sums=('d8b53e43e6f6a84387129099e50d4cfecb02269407f1fa4babf9e8c75118c244029a68dd772333f34b2fc3e77ad1bde0087b2d91e16fb4b28f9ce7f556389431' +b2sums=('8b8e8714fa9b04a83b9eba971adf231bd189983c640c235e24433d8e011c26434b3738c9f54a0478be32f0a1681afe5905eb3679ad1fe926adea16a354b8f9ad' 'SKIP' - 'b4683a33448cf7a891d629e4e1fd290622fcf96cacf593cb733eb4daad2fd66909e125e64e5129096051ba0d2453b831b14c8faf98d345f248f2132e3931355d' - '4019e45534e357bad79e6421398b429c10fa12d54873f4357169efda3cd5dedccf13c4277a70a310b872b2eae09e97233e545c8619aac704b52283fb220223c1' + 'e4cf5d0ddd2c7271f1723b5c313f0aa8a7bf2242fb301ceba1ab5a4dca655ca7b9461d0aaebe5eaccf84b2f7a4c4199cbb0c18eab2bdaff273fcb730ec27219e' 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535' - 'ef779195710256fb656af59a5252fc4b297aa1ae0afe16e64b0da1aa1cc8fcb5f31dbffd6a392fc67b44eb352da030233b22e1e67a5601373d8bbde631a1c326' - '54135abf4d7458d996429bd0777f2e377ac0c4924a27f8ad3b798ff2673e87cffad290a8cc0849748353086fabcae6bdf3e3ce8ac24276f14cd5df03a960397b' - 'ea96dfec909b1d51f5303ddf50a5ab950df6fcd1d9a577489a2b575a2228c62011e01a5528be81c022822c40da7415106a5de3d07581240367cf1ae9420ae4d3' + 'b5588ec7dbc1075c9134938d126776ad172f630843191034f422b353d5cbdf6f637298feb98b99c7e50814ff906156ca3f48ad92a3028cb42b6e91d70a07d7fd' + 'dc5c5f003006d0293390d79a61eff21b47aaf2ce59595c74aea584078b168fa2f83a973dabf7ae0d211ad971bedc6f31c8bd4db20cbe001227318eb9c9247607' + 'b95e2c7cb55f0ffcdc62f337f46e9247e8342b24149bb86f748f7157fb08969c412c171a394287b14cbc012cf752a1c2486f74c882d0b3464c331deac1f66e7f' '1e8cdc2968a78fa395b77b654496dbbf21d37308a7fd560ab5cff8dc092d9b5123c374af8a5a18dec7fd2a053f411a1478ebfd928365208d22042391da444b4b' '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d' '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6' @@ -74,9 +71,6 @@ prepare() { # mkdir mozbuild cd ${pkgname}-${pkgver} - # https://bugs.archlinux.org/task/66549 - patch -Np1 -i ../0001-Bug-1624128-Update-CK_GCM_PARAMS-uses-for-PKCS11-v3..patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch @@ -109,7 +103,7 @@ prepare() { # Hide mobile promo - echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css +# echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css # Hide plugindeprecation-notice echo "#plugindeprecation-notice { display: none !important; }" >> toolkit/mozapps/extensions/content/extensions.css # Hide warnings on unsigned extensions diff --git a/mozconfig.in b/mozconfig.in index 3cd0594..aa5d87f 100644 --- a/mozconfig.in +++ b/mozconfig.in @@ -48,7 +48,6 @@ ac_add_options --with-system-zlib ac_add_options --enable-alsa ac_add_options --enable-av1 ac_add_options --enable-jack -ac_add_options --enable-startup-notification # Disables # accessibility required for ff71+ @@ -58,7 +57,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-debug-symbols ac_add_options --disable-eme -ac_add_options --disable-gconf # # marionette required for the xorg tests # ac_add_options --disable-marionette ac_add_options --disable-necko-wifi diff --git a/mozconfig.in.clang b/mozconfig.in.clang index 44fc8c7..395d1e4 100644 --- a/mozconfig.in.clang +++ b/mozconfig.in.clang @@ -43,7 +43,6 @@ ac_add_options --with-system-zlib ac_add_options --enable-alsa ac_add_options --enable-av1 ac_add_options --enable-jack -ac_add_options --enable-startup-notification # Disables ac_add_options --disable-accessibility @@ -52,7 +51,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-debug-symbols ac_add_options --disable-eme -ac_add_options --disable-gconf # # marionette required for the xorg tests # ac_add_options --disable-marionette ac_add_options --disable-necko-wifi diff --git a/mozconfig.in.clang.pgo b/mozconfig.in.clang.pgo index 51e776e..e4b6590 100644 --- a/mozconfig.in.clang.pgo +++ b/mozconfig.in.clang.pgo @@ -43,7 +43,6 @@ ac_add_options --with-system-zlib ac_add_options --enable-alsa ac_add_options --enable-av1 ac_add_options --enable-jack -ac_add_options --enable-startup-notification # Disables ac_add_options --disable-accessibility @@ -52,7 +51,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-debug-symbols ac_add_options --disable-eme -ac_add_options --disable-gconf # # marionette required for the xorg tests # ac_add_options --disable-marionette ac_add_options --disable-necko-wifi -- cgit v1.2.1