From fba870626faf665f2f7c5570f2a506c9ba594675b8b367a1ca08ae575f20641b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 12 Jul 2020 17:40:52 +0000 Subject: [PATCH] - added desktop file actions - do not use XINPUT2 for the moment until Plasma 5.19.3 has landed (boo#1173993) - rework langpack integration (boo#1173991) * ship XPIs instead of directories * allow addon sideloading * mark signatures for langpacks non-mandatory * do not autodisable user profile scopes * Google API key is not usable for geolocation service - Mozilla Firefox 78.0.2 * Fixed an accessibility regression in reader mode (bmo#1650922) * Made the address bar more resilient to data corruption in the user profile (bmo#1649981) * Fixed a regression opening certain external applications (bmo#1650162) MFSA 2020-28 * CVE pending (bmo#1644076) X-Frame-Options bypass using object or embed tags OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=839 --- MozillaFirefox.changes | 25 +++++++ MozillaFirefox.desktop | 10 ++- MozillaFirefox.spec | 21 +++--- firefox-78.0.1.source.tar.xz | 3 - firefox-78.0.1.source.tar.xz.asc | 16 ----- firefox-78.0.2.source.tar.xz | 3 + firefox-78.0.2.source.tar.xz.asc | 16 +++++ firefox.js | 5 +- l10n-78.0.1.tar.xz => l10n-78.0.2.tar.xz | 0 mozilla.sh.in | 84 ++++++++++++++++++++++-- tar_stamps | 8 +-- 11 files changed, 151 insertions(+), 40 deletions(-) delete mode 100644 firefox-78.0.1.source.tar.xz delete mode 100644 firefox-78.0.1.source.tar.xz.asc create mode 100644 firefox-78.0.2.source.tar.xz create mode 100644 firefox-78.0.2.source.tar.xz.asc rename l10n-78.0.1.tar.xz => l10n-78.0.2.tar.xz (100%) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 6d7afc4..5834d4f 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sat Jul 11 11:08:06 UTC 2020 - Wolfgang Rosenauer + +- added desktop file actions +- do not use XINPUT2 for the moment until Plasma 5.19.3 has landed + (boo#1173993) +- rework langpack integration (boo#1173991) + * ship XPIs instead of directories + * allow addon sideloading + * mark signatures for langpacks non-mandatory + * do not autodisable user profile scopes +* Google API key is not usable for geolocation service + +------------------------------------------------------------------- +Thu Jul 9 15:55:42 UTC 2020 - Wolfgang Rosenauer + +- Mozilla Firefox 78.0.2 + * Fixed an accessibility regression in reader mode (bmo#1650922) + * Made the address bar more resilient to data corruption in the + user profile (bmo#1649981) + * Fixed a regression opening certain external applications (bmo#1650162) + MFSA 2020-28 + * CVE pending (bmo#1644076) + X-Frame-Options bypass using object or embed tags + ------------------------------------------------------------------- Mon Jul 6 22:08:13 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaFirefox.desktop b/MozillaFirefox.desktop index 0964a3f..abab405 100644 --- a/MozillaFirefox.desktop +++ b/MozillaFirefox.desktop @@ -11,8 +11,16 @@ StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Type=Application -Actions=PrivateBrowsing; +Actions=new-window;PrivateBrowsing;ProfileManager + +[Desktop Action new-window] +Name=New Window +Exec==%EXEC --new-windows %u [Desktop Action PrivateBrowsing] Name=New Private Browsing Window Exec=%EXEC --private-window %u + +[Desktop Action ProfileManager] +Name=Profile Manager +Exec=%EXEC --ProfileManager diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 55cbb03..89b3699 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -26,8 +26,8 @@ # major 69 # mainver %major.99 %define major 78 -%define mainver %major.0.1 -%define orig_version 78.0.1 +%define mainver %major.0.2 +%define orig_version 78.0.2 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -476,9 +476,10 @@ ac_add_options --disable-debug #ac_add_options --enable-chrome-format=jar ac_add_options --enable-update-channel=%{update_channel} ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} -ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19} +#ac_add_options --with-google-location-service-api-keyfile=%{SOURCE19} ac_add_options --with-google-safebrowsing-api-keyfile=%{SOURCE19} ac_add_options --with-unsigned-addon-scopes=app +ac_add_options --allow-addon-sideload %if %branding ac_add_options --enable-official-branding %endif @@ -533,18 +534,18 @@ sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_versi | xargs -n 1 -I {} /bin/sh -c ' locale=$1 ./mach build langpack-$locale - cp -rL ../obj/dist/xpi-stage/locale-$locale \ - %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org + cp -L ../obj/dist/linux-*/xpi/firefox-%{orig_version}.$locale.langpack.xpi \ + %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org.xpi # remove prefs, profile defaults, and hyphenation from langpack - rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults - rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation + #rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults + #rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other - echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org \ + echo %{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org.xpi \ >> %{_tmppath}/translations.$_l10ntarget ' -- {} %endif @@ -759,12 +760,12 @@ exit 0 %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} -%dir %{progdir}/browser/extensions/ +%dir %{progdir}/browser/extensions %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %dir %{progdir} -%dir %{progdir}/browser/extensions/ +%dir %{progdir}/browser/extensions %endif # this package does not need to provide files but is needed to fulfill diff --git a/firefox-78.0.1.source.tar.xz b/firefox-78.0.1.source.tar.xz deleted file mode 100644 index b21d9c3..0000000 --- a/firefox-78.0.1.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:494d277b120028e036e2aee3f658d79afc895457dc6aadb1c02f0547ef1d66ca -size 334523644 diff --git a/firefox-78.0.1.source.tar.xz.asc b/firefox-78.0.1.source.tar.xz.asc deleted file mode 100644 index 394e6a7..0000000 --- a/firefox-78.0.1.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl772cYACgkQ8aZmj7t9 -Vy4ExxAAlNStxBXW0u1WtdvxDofC3GODPf6XcMdZVJc45JKJy3hLeBXk26NsaXki -pxE0ySHKEdzdGMYG5U6JDP3XbUpEQcsazjLdeHERvxYsZBvy41sCRkQu+XITSP5z -HmbvYA1r+H7j2+yPkbSkyjtZONADbRwnnhwCWpo5gRhny3v17EQy6vUFYHANxtDI -DxRi6Uccko4kV4y8hdw/rdT+IxHJAvtucJFMONUgm1DUdy5QV1BuMAxHru3CW1NK -7YlODbG/+u6OiTJdoczVjSxmLPlH4f02pAcWsijXDBeVSVwUI4ATckbPVIY/HL/U -Z6n4c8jXeN/pkdEr4+jUENCqKP3JDq6bEPsD1c3megnhqtLN4gR1bTp7fS8Cm1gG -8Nv34x/deg8LADyYMIS8arduYfzKgRt28cduGeqSdtjWQR7SqrQ1OXGP2npEp/wc -xS+Q9WPh9BNfDuOWw87BdI+UZ/BdX2PTTTvdXlMCTU9wvjs7DGYeMFiSHCVkBoFZ -c/We+9dHreTA0qiM1K/O2iwdbH0JF4yjfnqTQUqXVjtFQJRk/xtZ6Fd3Ddwhmmtb -FGRkOjN9Z07NjXsos5dp3Qj7PFOlMwbYDlJ5oQGYZxo6qWKUkJoZSDv1DnWDwUVc -dP9tJy/RQ+5AeKZVauqOdgVOyTKENEOhtsf0AJ+scnryJSH4mic= -=vbhv ------END PGP SIGNATURE----- diff --git a/firefox-78.0.2.source.tar.xz b/firefox-78.0.2.source.tar.xz new file mode 100644 index 0000000..b746430 --- /dev/null +++ b/firefox-78.0.2.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1aa00ec6d40a771d525b867b175be28eda096becc745875bcceb133a985750fc +size 334406116 diff --git a/firefox-78.0.2.source.tar.xz.asc b/firefox-78.0.2.source.tar.xz.asc new file mode 100644 index 0000000..9585f1e --- /dev/null +++ b/firefox-78.0.2.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl8GQvUACgkQ8aZmj7t9 +Vy7cCxAAhfHL3/7MG61pjS8Ns7CcPdSwQ0E81YtYNa6XIPCAgnl50bKANXfdsG1d +cQbGI2oTDRWQqH4Iq47lc5rJYQkSy68U8GKiCaPl+0d3/GeBoyrqM1mQd3xy/FTG +4JxJU2frX7ATB4mBbTw/zzfguETtKWa6Lciq4dqh1ujbg+dKRaoY0IOsf+XCMRLo +BG+m3wnn4s+h8il36DRq60c1Ne2awEJ5lrH6PyDm0nvLCqdiUgy0ZxaXUdVdeWCs +6K339udRXmlzI1HHvyN/lBkA272yOfzpTYYJl7XeW75IMep90t/mAlJ+9ksKrnBU +AByOA7JpjUuXNtGel3Fszkfwk2SujyXb4m3moDw3l4XfBqXZIB7iBUt4mTAHbpQx +zrNAWxVc0MXkyccvqfhUzOnCGYgrT6KNrn6VkTSfEv/c2fAX9IYIw+l/mQoJdMYx +OEYF5Jvbb4GMhrwHGTyjk6wUuhB7RTPfLOkyT0iRSh6PTEmKLVw/m4wYExrnPjL4 +3Rzf0OrSWxvpYSHyT7rWRuhy/Z6X11PMIWw2R+abmkx4cCWe7Df0sHBUlhrEPiRC +R+v8wfXVM0Xcip4EI/nriXvm/atar9L5c9N0whdW+FpgeF/KxSt5FZUk7R4I7BIG +ga8qdXpdNF7X2ie8bOtYylsm6r7eJSvDy/r6jkYJ2zhpPvDYXsQ= +=dKzY +-----END PGP SIGNATURE----- diff --git a/firefox.js b/firefox.js index 3a71033..1385a1f 100644 --- a/firefox.js +++ b/firefox.js @@ -2,6 +2,7 @@ pref("intl.locale.requested", ""); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); /* Disable DoH by default */ pref("network.trr.mode", 5); -// do not disable system-global or app-global extensions -pref("extensions.autoDisableScopes", 3); +// do not disable any scope +pref("extensions.autoDisableScopes", 0); pref("extensions.shownSelectionUI", true); +pref("extensions.langpacks.signatures.required", false); diff --git a/l10n-78.0.1.tar.xz b/l10n-78.0.2.tar.xz similarity index 100% rename from l10n-78.0.1.tar.xz rename to l10n-78.0.2.tar.xz diff --git a/mozilla.sh.in b/mozilla.sh.in index b3bf186..a5c1f0f 100644 --- a/mozilla.sh.in +++ b/mozilla.sh.in @@ -58,6 +58,8 @@ MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME" +MOZ_LANGPACKS_DIR="$MOZ_DIST_LIB/langpacks" +MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then @@ -87,12 +89,86 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then export MOZ_ENABLE_WAYLAND=1 fi -# xinput2 (boo#1173320) -source /etc/os-release -if [ "$ID" = "opensuse-tumbleweed" ]; then - export MOZ_USE_XINPUT2=1 +## +## Use D-Bus remote exclusively when there's Wayland display. +## +if [ "$WAYLAND_DISPLAY" ]; then + export MOZ_DBUS_REMOTE=1 fi +# xinput2 (boo#1173320) +#source /etc/os-release +#if [ "$ID" = "opensuse-tumbleweed" ]; then +# export MOZ_USE_XINPUT2=1 +#fi + +## +## To disable the use of Firefox localization handling for +## the home profile, set MOZ_DISABLE_LANGPACKS=1 +## in your environment before launching Firefox. +## currently disabled by default since langpacks +## are shipped as app sideloading addons +## +# +MOZ_DISABLE_LANGPACKS=1 +export MOZ_DISABLE_LANGPACKS +# + +## +## Automatically installed langpacks are tracked by .suse-langpack-install +## config file. +## +SUSE_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.suse-langpack-install" + +# MOZ_DISABLE_LANGPACKS disables language packs completely +MOZILLA_DOWN=0 +if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then + if [ -x $MOZ_PROGRAM ]; then + # Is firefox running? + /bin/pidof %APPNAME% > /dev/null 2>&1 + MOZILLA_DOWN=$? + fi +fi + +# Modify language pack configuration only when firefox is not running +# and language packs are not disabled +if [ $MOZILLA_DOWN -ne 0 ]; then + # Clear already installed langpacks + mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR + if [ -f $SUSE_LANGPACK_CONFIG ]; then + rm `cat $SUSE_LANGPACK_CONFIG` > /dev/null 2>&1 + rm $SUSE_LANGPACK_CONFIG > /dev/null 2>&1 + # remove all empty langpacks dirs while they block installation of langpacks + rmdir $MOZ_EXTENSIONS_PROFILE_DIR/langpack* > /dev/null 2>&1 + fi + # Get locale from system + CURRENT_LOCALE=$LC_ALL + CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES} + CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG} + # Try with a local variant first, then without a local variant + SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` + MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"` + function create_langpack_link() { + local language=$* + local langpack=langpack-${language}@firefox.mozilla.org.xpi + if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then + rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack + # If the target file is a symlink (the fallback langpack), + # install the original file instead of the fallback one + if [ -h $MOZ_LANGPACKS_DIR/$langpack ]; then + langpack=`readlink $MOZ_LANGPACKS_DIR/$langpack` + fi + ln -s $MOZ_LANGPACKS_DIR/$langpack \ + $MOZ_EXTENSIONS_PROFILE_DIR/$langpack + echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $SUSE_LANGPACK_CONFIG + return 0 + fi + return 1 + } + create_langpack_link $MOZLOCALE || create_langpack_link $SHORTMOZLOCALE || true +fi + + moz_debug=0 script_args="" pass_arg_count=0 diff --git a/tar_stamps b/tar_stamps index f8a46e9..48bce0f 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,11 +1,11 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="78.0.1" +VERSION="78.0.2" VERSION_SUFFIX="" -PREV_VERSION="78.0" +PREV_VERSION="78.0.1" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="52486654c09a5248ae83230ee380b1dbb7ad2ef4" -RELEASE_TIMESTAMP="20200625152958" +RELEASE_TAG="e56adbbfe01c2443bae35e3d6f34867e36c3828e" +RELEASE_TIMESTAMP="20200708170202"