From: Peter Michael Green Date: Thu, 9 Nov 2023 17:21:33 +0000 (+0000) Subject: Manual merge of version 102.13.0esr-1~deb12u1+rpi1 and 115.3.0esr-1 to produce 115... X-Git-Tag: archive/raspbian/115.3.0esr-1+rpi1~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1654af1b9d53cfb9c392f02ccc1f3846e55a890;p=firefox-esr.git Manual merge of version 102.13.0esr-1~deb12u1+rpi1 and 115.3.0esr-1 to produce 115.3.0esr-1+rpi1 --- f1654af1b9d53cfb9c392f02ccc1f3846e55a890 diff --cc build/moz.configure/arm.configure index 82313257d4b,5d26f4d7323..e0862669c53 --- a/build/moz.configure/arm.configure +++ b/build/moz.configure/arm.configure @@@ -261,15 -271,14 +271,13 @@@ set_define("HAVE_ARM_NEON", have_arm_ne # This matches media/webrtc/trunk/webrtc/build/common.gypi. @depends(arm_target.arm_arch, when=have_arm_neon) def build_arm_neon(arm_arch): - return arm_arch >= 7 + return arm_arch >= 700 - #set_config("BUILD_ARM_NEON", build_arm_neon) - #set_define("BUILD_ARM_NEON", build_arm_neon) -set_config("BUILD_ARM_NEON", True, when=build_arm_neon) -set_define("BUILD_ARM_NEON", True, when=build_arm_neon) -- ++#set_config("BUILD_ARM_NEON", True, when=build_arm_neon) ++#set_define("BUILD_ARM_NEON", True, when=build_arm_neon) set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) - add_old_configure_assignment("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) set_config("MOZ_FPU", arm_target.fpu) diff --cc debian/changelog index 353f74ffe4e,8fdf02d91c5..ae33cf640ca --- a/debian/changelog +++ b/debian/changelog @@@ -1,88 -1,224 +1,256 @@@ - firefox-esr (102.13.0esr-1~deb12u1+rpi1) bookworm-staging; urgency=medium ++firefox-esr (115.3.0esr-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green 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. + + [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green] + * Disable more armv7/neon stuff. + + [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green] + * Disable jit (or at least try to) + + Pass disable-jit from debian/rules + + Nerf jit detection in s/moz.configure + - -- Raspbian forward porter Sat, 29 Jul 2023 23:04:55 +0000 ++ -- Peter Michael Green Thu, 09 Nov 2023 17:20:43 +0000 + - firefox-esr (102.13.0esr-1~deb12u1) bookworm-security; urgency=medium + firefox-esr (115.3.0esr-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2023-23, also known as: - CVE-2023-37201, CVE-2023-37202, CVE-2023-37207, CVE-2023-37208, - CVE-2023-37211. + * Fixes for mfsa2023-42, also known as: + CVE-2023-5169, CVE-2023-5171, CVE-2023-5176. + + * debian/control*, debian/rules: Work around bug 1052002 by force-using + clang-14. + + -- Mike Hommey Wed, 27 Sep 2023 05:43:46 +0900 + + firefox-esr (115.2.1esr-1) unstable; urgency=medium + + * New upstream release. + * Fix for mfsa2023-40, also known as CVE-2023-4863. + + * debian/upstream.mk, debian/repack.py: Get l10n sources from zip archives. + Thanks David Turner for the initial implementation. + + -- Mike Hommey Wed, 13 Sep 2023 06:30:23 +0900 + + firefox-esr (115.2.0esr-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-36, also known as: + CVE-2023-4573, CVE-2023-4574, CVE-2023-4575, CVE-2023-4577, + CVE-2023-4051, CVE-2023-4578, CVE-2023-4053, CVE-2023-4580, + CVE-2023-4581, CVE-2023-4583, CVE-2023-4584, CVE-2023-4585. + + * debian/watch: Refresh. + + -- Mike Hommey Wed, 30 Aug 2023 06:03:46 +0900 + + firefox-esr (115.1.0esr-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-31, also known as: + CVE-2023-4045, CVE-2023-4046, CVE-2023-4047, CVE-2023-4048, + CVE-2023-4049, CVE-2023-4050, CVE-2023-4055, CVE-2023-4056, + CVE-2023-4057. + + -- Mike Hommey Wed, 02 Aug 2023 06:15:06 +0900 + + firefox-esr (115.0.2esr-1) unstable; urgency=medium + + * New upstream release. + + * security/nss/lib/freebl/unix_rand.c, + security/nss/cmd/shlibsign/shlibsign.c: Unapply changes for Hurd, as + there is no rustc there. + + -- Mike Hommey Fri, 14 Jul 2023 13:40:53 +0900 + + firefox (115.0.2-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-26, also known as CVE-2023-3600. + + * debian/control*, debian/compat: Bump debhelper compat level to 12. + * debian/rules: + - Stop compressing debug info at link time. + - Use dh_missing. + - Disable dwz for libxul. + - Disable debug symbols on riscv64, because linking takes so long that + buildds kill the build after 420 minutes of "inactivity". + - Remove libgtk2 exclusion in dh_shlibdeps call. The dependency is long + gone. + - Stop cleaning up configure. It is unnecessary nowadays. + - Rely on dh_update_autotools_config instead of manual grunt work. + - Stop overriding dh_clean. + * debian/browser.mozconfig.in, debian/control.in, debian/rules, + debian/upstream.mk: Remove support for stretch. + * debian/symbols.apt.conf, debian/symbols.mk, debian/symbols.sources.list: + Remove symbol dumping scripts. They haven't been used to upload symbols + for a long time, and Mozilla now pulls the symbols rather than us + uploading them. + + * build/unix/elfhack/elf.cpp, build/unix/elfhack/elfhack.cpp, + build/unix/elfhack/elfxx.h: More properly handle files > 4GB in elfhack. + bz#1840931. + * media/libaom/moz.build: After all, we did need that patch. bz#1842933. + + -- Mike Hommey Wed, 12 Jul 2023 09:16:06 +0900 + + firefox (115.0.1-1) unstable; urgency=medium + + * New upstream release. + + * debian/patches: Consolidate patches in two categories instead of four. + Also remove some unuseful patches: + + xpcom/reflect/xptcall/md/unix/moz.build, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_sh.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_sh.cpp: Remove xptcall + support for SH4. We don't have rustc on SH4 anyways. + + media/libaom/moz.build: libaom neon flags are better set as of bz#1791482 + and shouldn't require a patch. + + * gfx/skia/moz.build: Work around GCC ICE on ppc64el. + + -- Mike Hommey Tue, 11 Jul 2023 06:39:31 +0900 + + firefox (115.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-22, also known as: + CVE-2023-3482, CVE-2023-37201, CVE-2023-37202, CVE-2023-37203, + CVE-2023-37204, CVE-2023-37205, CVE-2023-37206, CVE-2023-37207, + CVE-2023-37208, CVE-2023-37209, CVE-2023-37210, CVE-2023-37211, + CVE-2023-37212. * debian/rules, media/ffvpx/config_unix64.h: Work around - https://sourceware.org/bugzilla/show_bug.cgi?id=30578. + https://sourceware.org/bugzilla/show_bug.cgi?id=30578. Closes: #1040328. + + * gfx/skia/moz.build: Undefine the mips builtin macro on mips in skia. + bz#1841197. + + -- Mike Hommey Wed, 05 Jul 2023 06:46:25 +0900 + + firefox (114.0.2-1) unstable; urgency=medium + + * New upstream release. + * debian/upstream.mk: Unstable is trixie. + * debian/rules: Use in-tree NSS on bookworm. + + -- Mike Hommey Thu, 22 Jun 2023 13:54:23 +0900 + + firefox (114.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-20, also known as: + CVE-2023-34414, CVE-2023-34415, CVE-2023-34416, CVE-2023-34417. + + * debian/browser.install.in: Install gfxtest and vaapitest. - -- Mike Hommey Wed, 05 Jul 2023 05:33:32 +0900 + -- Mike Hommey Wed, 07 Jun 2023 05:52:21 +0900 - firefox-esr (102.12.0esr-1~deb12u1) bookworm-security; urgency=medium + firefox (113.0.2-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2023-19, also known as: - CVE-2023-34414, CVE-2023-34416. - -- Mike Hommey Wed, 07 Jun 2023 05:34:19 +0900 + * dom/base/nsTextFragment.cpp, dom/base/nsTextFragmentGeneric.h, + dom/base/nsTextFragmentGenericFwd.h: Isolate SSE2 requirements to + SSE-compiled file. bz#1827566. - firefox-esr (102.11.0esr-1) unstable; urgency=medium + -- Mike Hommey Sat, 27 May 2023 05:00:29 +0900 + + firefox (113.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2023-16, also known as: + CVE-2023-32205, CVE-2023-32206, CVE-2023-32207, CVE-2023-32208, + CVE-2023-32209, CVE-2023-32210, CVE-2023-32211, CVE-2023-32212, + CVE-2023-32213, CVE-2023-32215, CVE-2023-32216. + + * debian/control, debian/l10n/browser-l10n.control: Refresh locales. + + -- Mike Hommey Wed, 10 May 2023 06:47:20 +0900 + + firefox (112.0.1-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2023-17, also known as: - CVE-2023-32205, CVE-2023-32206, CVE-2023-32207, CVE-2023-32211, - CVE-2023-32212, CVE-2023-32213, CVE-2023-32215. - -- Mike Hommey Wed, 10 May 2023 06:32:15 +0900 + * gfx/thebes/gfxFont.cpp, gfx/thebes/gfxFontEntry.cpp: Don't attempt + to use font extents if we didn't get a valid 'head' table, or if + it's not an sfnt resource. bz#1827950. Closes: #1034363. - firefox-esr (102.10.0esr-1) unstable; urgency=medium + -- Mike Hommey Thu, 20 Apr 2023 06:12:33 +0900 + + firefox (112.0-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2023-14, also known as: - CVE-2023-29533, CVE-2023-29535, CVE-2023-29536, CVE-2023-29539, - CVE-2023-29541, CVE-2023-1945, CVE-2023-29548, CVE-2023-29550. + * Fixes for mfsa2023-13, also known as: + CVE-2023-29533, CVE-2023-29535, CVE-2023-29536, CVE-2023-29537, + CVE-2023-29538, CVE-2023-29539, CVE-2023-29540, CVE-2023-29541, + CVE-2023-29543, CVE-2023-29544, CVE-2023-29547, CVE-2023-29548, + CVE-2023-29549, CVE-2023-29550, CVE-2023-29551. + + * debian/control*: Bump nss build dependency. + * debian/control: Add libavcodec60 recommendation. + + * security/manager/ssl/builtins/build.rs, + security/manager/ssl/builtins/src/certdata.rs: Revert upstream change to + preserve compatibility with rustc 1.63. + + -- Mike Hommey Wed, 12 Apr 2023 09:53:55 +0900 + + firefox (111.0.1-1) unstable; urgency=medium + + * New upstream release. + + -- Mike Hommey Sat, 25 Mar 2023 05:21:58 +0900 - -- Mike Hommey Wed, 12 Apr 2023 06:37:17 +0900 + firefox (111.0-3) unstable; urgency=medium - firefox-esr (102.9.0esr-2) unstable; urgency=medium + * dom/media/webaudio/AudioNodeEngine*: Forward declare arch-specific xsimd + specialization. bz#1822901. + + -- Mike Hommey Tue, 21 Mar 2023 09:28:00 +0900 + + firefox (111.0-2) unstable; urgency=medium * gfx/skia/generate_mozbuild.py, gfx/skia/moz.build: Remove explicit NEON - flags from skia build. Closes: #982794. Thanks Emanuele Rocca. + flags from skia build. Thanks Emanuele Rocca. + * dom/media/webaudio/AudioNodeEngineGeneric.h: Use fully specified xsimd::batch + type. bz#1821363. + * third_party/libwebrtc/moz.build: Add now removed desktop_capture_generic_gn + directory. - -- Mike Hommey Sat, 18 Mar 2023 06:53:38 +0900 + -- Mike Hommey Tue, 21 Mar 2023 06:18:07 +0900 - firefox-esr (102.9.0esr-1) unstable; urgency=medium + firefox (111.0-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2023-10, also known as: - CVE-2023-25751, CVE-2023-28164, CVE-2023-28162, CVE-2023-25752, - CVE-2023-28176. + * Fixes for mfsa2023-09, also known as: + CVE-2023-25750, CVE-2023-25751, CVE-2023-28160, CVE-2023-28164, + CVE-2023-28161, CVE-2023-28162, CVE-2023-25752, CVE-2023-28176, + CVE-2023-28177. + * debian/control*: Bump nss build dependency. + * debian/control, debian/l10n/browser-l10n.control: Refresh locales. * debian/browser.mozconfig.in: Disable wasm sandboxing on s390x for now. It doesn't work at the moment. diff --cc debian/patches/series index b9a9c4ee6a4,754cc9af70e..ef706916a84 --- a/debian/patches/series +++ b/debian/patches/series @@@ -15,19 -5,13 +5,20 @@@ debian-hacks/Add-debian-extra-stuff-to- debian-hacks/Don-t-build-image-gtests.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-build-id-as-langpack-version-for-reproducibility.patch - debian-hacks/Allow-to-build-with-older-versions-of-nodejs-10.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-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 + debian-hacks/Relax-nodejs-minimum-version.patch + debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch + debian-hacks/Allow-.js-preference-files-to-set-locked-prefs-with-.patch + debian-hacks/Set-DPI-to-system-settings.patch + debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch + debian-hacks/Work-around-GCC-ICE-on-ppc64el.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 +disable-more-armv7neon-stuff.patch +disable-jit.patch diff --cc debian/rules index 6e8b0ea55c3,0235734afe1..b32fdd0d389 --- a/debian/rules +++ b/debian/rules @@@ -148,9 -135,13 +137,13 @@@ ifeq (default,$(origin CXX) CXX := g++ endif + ifeq (,$(filter buster bullseye,$(DIST))) + PATH := /usr/lib/llvm-14/bin:$(PATH) + endif + -ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) +#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH))) CONFIGURE_FLAGS += --disable-jit -endif +#endif CXXFLAGS := $(CFLAGS) # Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30578 @@@ -204,19 -195,7 +197,8 @@@ debian/iceweasel-l10n-%.maintscript: de endif override_dh_auto_configure: + mkdir -p fakehome - configure js/src/configure: - cp -f $@.in $@ && chmod +x $@ - echo $@ >> debian/extra-clean - - stamps/prepare-configure:: stamps/dummy configure js/src/configure - for dir in $(AUTOCONF_DIRS); do \ - for file in config.guess config.sub; do \ - sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$dir/$$file; \ - done; \ - done - stamps/configure-check-$(PRODUCT):: stamps/configure-$(PRODUCT) # Ensure --{with,enable}-system options properly set expected variables # according to the definitions in the mozconfig file. @@@ -297,28 -276,13 +279,19 @@@ endi override_dh_auto_clean:: 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 debian/objdir $(MOZBUILD_STATE_PATH) + find . -name __pycache__ -delete - - override_dh_clean: - dh_clean -XCargo.toml.orig - for dir in $(AUTOCONF_DIRS); do \ - for file in config.guess config.sub; do \ - sed -i '2!b;/^exec "/ d' $$dir/$$file; \ - done; \ - done + rm -rf build-browser + rm -rf fakehome override_dh_auto_install-arch: stamps/install-$(PRODUCT) override_dh_auto_install-indep: diff --cc modules/fdlibm/src/math_private.h index b5b15f5d75b,632d2c4c619..b7fecb02e58 --- a/modules/fdlibm/src/math_private.h +++ b/modules/fdlibm/src/math_private.h @@@ -35,7 -35,8 +35,8 @@@ typedef long double __double_t #else typedef double __double_t; #endif -typedef __double_t double_t; +#define double_t __double_t + typedef float __float_t; /* * The original fdlibm code used statements like: