v76.0.1-1

4 files changed, 104 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf4c73816ef9..756b38f96d8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 75.0
+	pkgver = 76.0.1
 	pkgrel = 1
 	url = https://librewolf-community.gitlab.io/
 	arch = x86_64
@@ -47,14 +47,16 @@ pkgbase = librewolf
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/75.0/source/firefox-75.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/76.0.1/source/firefox-76.0.1.source.tar.xz
 	source = librewolf.desktop
 	source = git+https://gitlab.com/librewolf-community/browser/common.git
 	source = git+https://gitlab.com/librewolf-community/settings.git
-	sha256sums = bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f
-	sha256sums = 0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b
+	source = remove_addons.patch
+	sha256sums = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3
+	sha256sums = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0
 
 pkgname = librewolf
 
diff --git a/PKGBUILD b/PKGBUILD
index 50d1916032b9..75dde46d2e91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=75.0
+pkgver=76.0.1
 pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 aarch64)
@@ -25,11 +25,13 @@ options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
         "git+https://gitlab.com/${pkgname}-community/browser/common.git"
-        "git+https://gitlab.com/${pkgname}-community/settings.git")
-sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
-            '0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b'
+        "git+https://gitlab.com/${pkgname}-community/settings.git"
+        "remove_addons.patch")
+sha256sums=('f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3'
+            '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0')
 
 if [[ $CARCH == 'aarch64' ]]; then
   source+=(arm.patch
@@ -69,10 +71,6 @@ ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
 export MOZ_REQUIRE_SIGNING=0
 
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
 # Features
 ac_add_options --enable-alsa
 ac_add_options --enable-jack
@@ -123,11 +121,21 @@ ac_add_options --enable-optimize
 END
 fi
 
+  # Remove some pre-installed addons that might be questionable
+  patch -p1 -i ../remove_addons.patch
+
   # Disabling Pocket
   sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
   # this one only to remove an annoying error message:
   sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
 
+  # Remove Internal Plugin Certificates
+  _cert_sed='s#if (aCert.organizationalUnit == "Mozilla [[:alpha:]]\+") {\n'
+  _cert_sed+='[[:blank:]]\+return AddonManager\.SIGNEDSTATE_[[:upper:]]\+;\n'
+  _cert_sed+='[[:blank:]]\+}#'
+  _cert_sed+='// NOTE: removed#g'
+  sed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm
+
   # allow SearchEngines option in non-ESR builds
   sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json
 
@@ -229,7 +237,7 @@ package() {
 pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
 // Don't disable extensions in the application directory
-// done in librewolf.cf
+// done in librewolf.cfg
 // pref("extensions.autoDisableScopes", 11);
 END
 
diff --git a/librewolf.desktop b/librewolf.desktop
index 221db6677c83..ccc579510f13 100644
--- a/librewolf.desktop
+++ b/librewolf.desktop
@@ -117,7 +117,7 @@ Icon=librewolf
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
 StartupNotify=true
 StartupWMClass=LibreWolf
 Categories=Network;WebBrowser;
diff --git a/remove_addons.patch b/remove_addons.patch
new file mode 100644
index 000000000000..69c4d8f9ad4a
--- /dev/null
+++ b/remove_addons.patch
@@ -0,0 +1,79 @@
+diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
+index 4c9fa78..095d199 100644
+--- a/browser/extensions/moz.build
++++ b/browser/extensions/moz.build
+@@ -5,10 +5,7 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ DIRS += [
+-    'doh-rollout',
+     'formautofill',
+     'pdfjs',
+-    'screenshots',
+-    'webcompat',
+-    'report-site-issue'
++    'screenshots'
+ ]
+diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
+index 05f0242..7c9737a 100644
+--- a/browser/locales/Makefile.in
++++ b/browser/locales/Makefile.in
+@@ -61,7 +61,6 @@ libs-%:
+ ifneq (,$(wildcard ../extensions/formautofill/locales))
+ 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
+ endif
+-	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
+@@ -82,7 +81,6 @@ endif
+ 	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
+ 	@$(MAKE) chrome AB_CD=$*
+ 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
+-	@$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
+ 
+ package-win32-installer: $(SUBMAKEFILES)
+ 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
+diff --git a/browser/locales/filter.py b/browser/locales/filter.py
+index 1fc9b14..d8a9ee2 100755
+--- a/browser/locales/filter.py
++++ b/browser/locales/filter.py
+@@ -13,7 +13,6 @@ def test(mod, path, entity=None):
+                    "browser",
+                    "browser/extensions/formautofill",
+                    "browser/extensions/fxmonitor",
+-                   "browser/extensions/report-site-issue",
+                    "extensions/spellcheck",
+                    "other-licenses/branding/firefox",
+                    "browser/branding/official",
+diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
+index f4cb7ca..4efac13 100644
+--- a/browser/locales/l10n.ini
++++ b/browser/locales/l10n.ini
+@@ -14,7 +14,6 @@ dirs = browser
+      devtools/startup
+      browser/extensions/formautofill
+      browser/extensions/fxmonitor
+-     browser/extensions/report-site-issue
+ 
+ [includes]
+ # non-central apps might want to use %(topsrcdir)s here, or other vars
+diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
+index 0b53c52..f8b605d 100644
+--- a/browser/locales/l10n.toml
++++ b/browser/locales/l10n.toml
+@@ -129,14 +129,6 @@ locales = [
+     reference = "browser/extensions/fxmonitor/locales/en-US/**"
+     l10n = "{l}browser/extensions/fxmonitor/**"
+ 
+-[[paths]]
+-    reference = "browser/extensions/webcompat-reporter/locales/en-US/**"
+-    l10n = "{l}browser/extensions/webcompat-reporter/**"
+-
+-[[paths]]
+-    reference = "browser/extensions/report-site-issue/locales/en-US/**"
+-    l10n = "{l}browser/extensions/report-site-issue/**"
+-
+ [[paths]]
+     reference = "services/sync/locales/en-US/**"
+     l10n = "{l}services/sync/**"