Merge firefox 102 packaging from Debian into raspbian.
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 16 Sep 2022 18:47:29 +0000 (18:47 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 16 Sep 2022 18:47:29 +0000 (18:47 +0000)
1  2 
debian/changelog
debian/patches/series
debian/rules

index e079656dd6689107c50750e89e2a1df55d2c0b2a,8cb90dc0da94918c12b134dbea5dbbc2aeb197fd..01293543e98d43c23de75339c18f3210ec703ba5
@@@ -1,33 -1,58 +1,82 @@@
- firefox-esr (91.11.0esr-1+rpi1) bookworm-staging; urgency=medium
++firefox-esr (102.2.0esr-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
 +  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green]
 +  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
 +    definitions error.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 06 Jul 2022 03:29:26 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 16 Sep 2022 18:44:17 +0000
 +
- firefox-esr (91.11.0esr-1) unstable; urgency=medium
+ firefox-esr (102.2.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2022-25, also known as:
-     CVE-2022-34479, CVE-2022-34470, CVE-2022-34468, CVE-2022-34481,
-     CVE-2022-31744, CVE-2022-34472, CVE-2022-2200, CVE-2022-34484.
+   * Fixes for mfsa2022-34, also known as:
+     CVE-2022-38472, CVE-2022-38473, CVE-2022-38477, CVE-2022-38478.
+   * debian/rules, debian/control: Fix libavcodec recommends. Closes: #1017782.
+   * debian/control*: Bump nss build dependency.
+  -- Mike Hommey <glandium@debian.org>  Wed, 24 Aug 2022 06:35:58 +0900
+ firefox-esr (102.1.0esr-2) unstable; urgency=medium
+   * debian/rules: Remove old and now unnecessary workarounds.
+   * intl/icu/source/common/unicode/std_string.h,
+     intl/icu/source/common/utypeinfo.h,
+     intl/icu/source/io/unicode/ustream.h: Remove workaround for old libstdc++
+     problem, which now causes problems with GCC 12 on arm.
+   * third_party/libwebrtc/moz.build: Add missing webrtc directory for ppc64el
+     (bz#1775202).
+  -- Mike Hommey <glandium@debian.org>  Mon, 15 Aug 2022 15:46:49 +0900
+ firefox-esr (102.1.0esr-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2022-28, also known as:
+     CVE-2022-36319, CVE-2022-36318, CVE-2022-36315, CVE-2022-36316,
+     CVE-2022-36320, CVE-2022-2505.
+   * debian/rules:
+     - Improve detection of known failing cases on armhf and mipsel.
+     - Use thinLTO for rust on armhf, to stay in the memory budget with an
+       armhf toolchain.
+     - Use MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none instead of
+       MACH_USE_SYSTEM_PYTHON=1.
+   * debian/rules, debian/watch, debian/watch.in: Generate debian/watch and
+     fix it.
+   * third_party/libwebrtc/moz.build: Work around bz#1775202 to fix FTBFS on
+     ppc64el.
+   * config/makefiles/rust.mk: Allow to override rust LTO flag.
+  -- Mike Hommey <glandium@debian.org>  Sun, 14 Aug 2022 16:59:19 +0900
+ firefox (102.0-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2022-24, also known as:
+     CVE-2022-34479, CVE-2022-34470, CVE-2022-34468, CVE-2022-34482,
+     CVE-2022-34483, CVE-2022-34476, CVE-2022-34481, CVE-2022-34474,
+     CVE-2022-34471, CVE-2022-34472, CVE-2022-2200, CVE-2022-34480,
+     CVE-2022-34477, CVE-2022-34475, CVE-2022-34473, CVE-2022-34484,
+     CVE-2022-34485.
  
    * build/moz.configure/bindgen.configure,
      gfx/webrender_bindings/webrender_ffi.h: Work around build failure with
index 92ab69bb39802028c789787f92766f3355babd19,93e450830ab8c2f3841fb06ef57f7d40dc433c1a..a151bd853677c28afdfd6221e171fbfb0da88cb8
@@@ -11,17 -11,14 +11,19 @@@ debian-hacks/Add-another-preferences-di
  debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch
  debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
  debian-hacks/Don-t-build-image-gtests.patch
- debian-hacks/Set-program-name-from-the-remoting-name.patch
  debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch
  debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch
- debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
  debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch
  debian-hacks/Allow-to-build-with-older-versions-of-nodejs-10.patch
- debian-hacks/Allow-to-build-with-cargo-in-Debian-unstable.patch
  debian-hacks/Fix-math_private.h-for-i386-FTBFS.patch
+ debian-hacks/Allow-to-build-with-cargo-in-Debian-unstable.patch
  debian-hacks/Work-around-build-failure-with-newer-cbindgen.-bz-17.patch
+ debian-hacks/Work-around-bz-1775202-to-fix-FTBFS-on-ppc64el.patch
+ debian-hacks/Allow-to-override-rust-LTO-flag.patch
+ debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch
+ debian-hacks/Add-missing-webrtc-directory-for-ppc64el-bz-1775202.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
diff --cc debian/rules
index 47ed1516c7948f65cd839fa2cc0faa0b9eda2373,eb75c625900e0c29ff064f1d9caaf747c0df2fff..6a4d868ea1f4d098130a297dd3af75b539337292
@@@ -131,10 -132,10 +134,10 @@@ endi
  ifneq (,$(filter %i386 %amd64 armel armhf arm64,$(DEB_HOST_ARCH)))
        MOZ_FFVPX = 1
  endif
- ifneq (,$(filter i386 amd64 armel armhf,$(DEB_HOST_ARCH)))
+ ifneq (,$(filter i386 amd64 armel armhf arm64,$(DEB_HOST_ARCH)))
        CRASH_REPORTER = 1
  endif
 -ifneq (,$(filter mips%,$(DEB_HOST_ARCH)))
 +ifneq (,$(filter armhf mips%,$(DEB_HOST_ARCH)))
        CONFIGURE_FLAGS += --disable-webrtc
  endif
  
@@@ -276,19 -287,15 +290,19 @@@ endi
  endif
  
  override_dh_auto_clean::
-       rm -f $(filter-out debian/control,$(GENERATED_FILES))
+       rm -f $(filter-out debian/control debian/watch,$(GENERATED_FILES))
        rm -f $$(cat debian/extra-clean 2>/dev/null) debian/extra-clean old-configure js/src/old-configure
        rm -rf stamps l10n $(CARGO_HOME)
 +      rm -f third_party/python/psutil/psutil/*.so
 +      rm -rf third_party/python/psutil/build/temp*
 +      rm -rf third_party/python/psutil/build/lib*
        debian/rules debian/control TESTDIR=
  
        dh_auto_clean --builddirectory=build-$(PRODUCT)
        dh_auto_clean --builddirectory=build-l10n
        find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f
-       rm -rf obj-*/.mozbuild
+       rm -rf debian/objdir $(MOZBUILD_STATE_PATH)
 +      find . -name __pycache__ -delete
  
  override_dh_clean:
        dh_clean -XCargo.toml.orig