From: Peter Michael Green Date: Tue, 5 Nov 2019 19:38:12 +0000 (+0000) Subject: Manual merge of version 60.8.0esr-1+rpi1 and 68.2.0esr-1 to produce 68.2.0esr-1+rpi1 X-Git-Tag: archive/raspbian/68.2.0esr-1+rpi1~8 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=466ca7843a9ff6a22a983779618da1f8965ec16d;p=firefox-esr.git Manual merge of version 60.8.0esr-1+rpi1 and 68.2.0esr-1 to produce 68.2.0esr-1+rpi1 --- 466ca7843a9ff6a22a983779618da1f8965ec16d diff --cc build/moz.configure/rust.configure index ad27dbf5d80,9647cbc40e1..0645c1e53a1 --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure @@@ -120,14 -192,12 +194,16 @@@ def rust_supported_targets(rustc) per_os = {} ambiguous = set() per_raw_os = {} + #HACK: if there are multiple matches the algorithm uses the last one + #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered + out.append('arm-unknown-linux-gnueabihf') for t in out: + traw = t t = split_triplet(t, allow_unknown=True) - key = (t.cpu, t.endianness, t.os) - sys.stdout.write(traw+' '+repr(key)+' '+repr(t.raw_os)+'\n') + endianness = t.endianness + if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): + endianness = 'little' + key = (t.cpu, endianness, t.os) if key in per_os: previous = per_os[key] per_raw_os[(previous.cpu, previous.endianness, @@@ -154,20 -224,21 +230,23 @@@ def rust_triple_alias(host_or_target) `host_or_target` is either `host` or `target` (the @depends functions from init.configure). """ - assert host_or_target in (host, target) + assert host_or_target in {host, target} + + host_or_target_str = {host: 'host', target: 'target'}[host_or_target] @depends(rustc, host_or_target, c_compiler, rust_supported_targets, - when=rust_compiler) + arm_target, when=rust_compiler) + @checking('for rust %s triplet' % host_or_target_str) @imports('os') + @imports('sys') @imports('subprocess') @imports(_from='mozbuild.configure.util', _import='LineIO') @imports(_from='mozbuild.shellutil', _import='quote') @imports(_from='tempfile', _import='mkstemp') @imports(_from='textwrap', _import='dedent') + @imports(_from='__builtin__', _import='repr') def rust_target(rustc, host_or_target, compiler_info, - rust_supported_targets): + rust_supported_targets, arm_target): # Rust's --target options are similar to, but not exactly the same # as, the autoconf-derived targets we use. An example would be that # Rust uses distinct target triples for targetting the GNU C++ ABI diff --cc debian/changelog index 7ae9fb70157,cc48ae67cd0..961f64f86a7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,27 -1,170 +1,182 @@@ - firefox-esr (60.8.0esr-1+rpi1) bullseye-staging; urgency=medium ++firefox-esr (68.2.0esr-1+rpi1) bullseye-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). - * Don't use system libvpx (changes adapted from https://salsa.debian.org/mozilla-team/firefox/commit/f26d0387eea70b2ebceabeb86ec728227199f302 ) + - -- Peter Michael Green Wed, 14 Aug 2019 22:49:11 +0000 ++ -- Peter Michael Green Tue, 05 Nov 2019 19:37:30 +0000 + - firefox-esr (60.8.0esr-1) unstable; urgency=medium + firefox-esr (68.2.0esr-1) unstable; urgency=medium * New upstream release. - * Fixes for mfsa2019-22, also known as: - CVE-2019-9811, CVE-2019-11711, CVE-2019-11712, CVE-2019-11713, - CVE-2019-11729, CVE-2019-11715, CVE-2019-11717, CVE-2019-11719, - CVE-2019-11730, CVE-2019-11709. + * Fixes for mfsa2019-33, also known as: + CVE-2019-15903, CVE-2019-11757, CVE-2019-11758, CVE-2019-11759, + CVE-2019-11760, CVE-2019-11761, CVE-2019-11762, CVE-2019-11763, + CVE-2019-11764. + + -- Mike Hommey Wed, 23 Oct 2019 06:50:01 +0900 + + firefox-esr (68.1.0esr-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2019-26, also known as + CVE-2019-11746, CVE-2019-11744, CVE-2019-11742, CVE-2019-11752, + CVE-2019-9812, CVE-2019-11743, CVE-2019-11748, CVE-2019-11749, + CVE-2019-11750, CVE-2019-11738, CVE-2019-11747, CVE-2019-11735, + CVE-2019-11740. + + * debian/upstream.mk: Read source repo and revision from json when + getting upstream info. Instead of the .txt file that doesn't exist + as of 69. + * debian/control*: + - Remove unused build dependency against python-ply. + - Remove python-minimal build dependency. All supported versions + of Debian have a new enough version. + * debian/l10n/gen, debian/latest_nightly.py, debian/rules, + debian/symbols.mk, debian/upstream.mk, debian/watch: Use explicit + python2.7 instead of python. + + -- Mike Hommey Wed, 04 Sep 2019 10:22:21 +0900 + + firefox-esr (68.0.2esr-1) unstable; urgency=medium + + * New upstream ESR release. + + -- Mike Hommey Sun, 18 Aug 2019 22:27:52 +0900 + + firefox (68.0.2-3) unstable; urgency=medium + + * debian/control.in: Take source package name from preprocessing. + + * build/moz.configure/old.configure: Avoid race condition creating + old-configure. bz#1574761. + * dom/media/systemservices/CamerasChild.cpp, + dom/media/systemservices/CamerasParent.cpp, + dom/media/systemservices/VideoEngine.cpp, + dom/media/webrtc/MediaEngineRemoteVideoSource.cpp: Don't use + __PRETTY_FUNCTION__ or __FUNCTION__ as format strings. bz#1531309. + Closes: #925680. + + -- Mike Hommey Sun, 18 Aug 2019 20:47:26 +0900 + + firefox (68.0.2-2) unstable; urgency=medium - -- Mike Hommey Wed, 10 Jul 2019 07:13:23 +0900 + * debian/rules: Fix MOZ_APP_REMOTINGNAME. Upstream build system changes + made the config.status editing trick stop working. Export the variable for + configure to pick it instead. Closes: #932256 - firefox-esr (60.7.2esr-1) unstable; urgency=medium + -- Mike Hommey Sun, 18 Aug 2019 08:41:43 +0900 + + firefox (68.0.2-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2019-24, also known as CVE-2019-11733. + + * debian/control*, debian/rules: Don't build against system vpx >= 1.8.0. + It has API changes that cause FTBFS. + + -- Mike Hommey Thu, 15 Aug 2019 08:06:59 +0900 + + firefox (68.0.1-2) unstable; urgency=medium + + * debian/rules: Work around https://github.com/rust-lang/cargo/issues/7147. + + -- Mike Hommey Fri, 19 Jul 2019 10:51:09 +0900 + + firefox (68.0.1-1) unstable; urgency=medium + + * New upstream release. + + * debian/rules: + - Hook stamps/dh_install-l10n to override_dh_install-indep rather than + binary-indep. + - Pass make job server down through dh_auto_build. + * debian/rules, debian/dh: Wrap dh to ensure debian/rules is invoked with + parallelism. + + -- Mike Hommey Fri, 19 Jul 2019 07:53:19 +0900 + + firefox (68.0-3) unstable; urgency=medium + + * debian/browser.README.Debian.in: Fix a reference to iceweasel in + README.Debian. Thanks Edward Betts. + * debian/rules: + - Only exclude "-g" from dpkg-buildflags output. All the other flags + that used to be excluded either already match upstream or add + reproducibility. + - Don't unexpectedly reset LDFLAGS. + - [firefox-esr] Remove iceweasel transitional packages on bullseye. + - Disable dh_strip_nondeterminism. Upstream build system already avoids + non-determinism it would strip, so there is no need for it further + modifying files. + - Avoid arch:all builds building arch:any stuff. + - Move AUTOCONF_DIRS cleanup after dh_clean. + - Add rust flags to improve reproducibility. + - Only touch or remove configure when it wasn't there to begin with. + - Call configure using its full path. + - Factor common configure arguments. + - Build langpacks with --disable-compile-environment, and pass less + configure arguments. + - Build each langpack from a separate build directory. This means time + wasted running configure more times, but all locales can now be built + in parallel. + * debian/symbols.mk, debian/symbols.apt.conf, debian/symbols.sources.list: + Miscellaneous changes to symbols download script. + * debian/make.mk: Exclude symbols.mk variables from dump output. + * debian/browser.mozconfig.in: Remove redundant --prefix=/usr. + * debian/control.in, debian/rules, debian/symbols.mk, debian/upstream.mk: + Remove packaging scripts compatibility with Wheezy. + + * moz.configure: Only add confvars.sh as a dependency to config.status + when it exists. bz#1560340. + + -- Mike Hommey Sun, 14 Jul 2019 15:20:45 +0900 + + firefox (68.0-2) unstable; urgency=medium + + * debian/rules, debian/upstream.mk: Account for next Debian release. + * debian/rules, debian/control: Build against system sqlite again. + + * gfx/skia/skia/third_party/skcms/src/Transform_inl.h: Work around GCC ICE + on mips*, i386 and s390x. Closes: #931757 + * python/mozbuild/mozbuild/action/langpack_manifest.py: Use build id as + langpack version for reproducibility. bz#1565504. + + -- Mike Hommey Fri, 12 Jul 2019 20:37:51 +0900 + + firefox (68.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2019-21, also known as: + CVE-2019-9811, CVE-2019-11711, CVE-2019-11712, CVE-2019-11713, + CVE-2019-11714, CVE-2019-11715, CVE-2019-11716, CVE-2019-11717, + CVE-2019-11718, CVE-2019-11720, CVE-2019-11721, CVE-2019-11730, + CVE-2019-11723, CVE-2019-11724, CVE-2019-11725, CVE-2019-11727, + CVE-2019-11728, CVE-2019-11710, CVE-2019-11709. + + * debian/control*: Bump nss, sqlite, rustc, cargo and cbindgen build + dependencies. Remove Build-Conflicts with nss 3.44-1, since we now + build-depend on a more recent version. + * debian/rules, debian/control: Don't build against system sqlite, as + Debian doesn't have the required version yet. + * [firefox-esr] debian/l10n/browser-l10n.control*, debian/l10n/gen: + Don't generate iceweasel l10n transition packages for locales that + were never offered with iceweasel. + * debian/control, debian/l10n/browser-l10n.control.in: Add transition + dependencies for Bengali l10n. There is now only one Bengali l10n + package instead of two. + * debian/rules: Disable JIT at build time on mips because it fails to build. + + * build/gyp.mozbuild: Revert patch that disables libyuv assembly on + mips64. It apparently compiles, now. + + -- Mike Hommey Wed, 10 Jul 2019 08:22:05 +0900 + + firefox (67.0.4-1) unstable; urgency=medium * New upstream release. * Fixes for mfsa2019-19, also known as CVE-2019-11708. diff --cc debian/patches/series index 161dbb5c685,d37abd87d06..8a6f69922de --- a/debian/patches/series +++ b/debian/patches/series @@@ -25,8 -23,7 +23,8 @@@ debian-hacks/Allow-to-override-ICU_DATA debian-hacks/Set-program-name-from-the-remoting-name.patch debian-hacks/Build-against-system-libjsoncpp.patch debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch - debian-hacks/Attempt-to-fix-building-webrtc-on-non-x86.patch - debian-hacks/Only-build-webrtc-neon-on-aarch64.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/Attempt-to-work-around-make-issue-happening-on-arch-.patch + debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch +raspbian-rust-triplet-hack.patch diff --cc debian/rules index 430cbe088ad,66d6635ede0..d9949d38c99 --- a/debian/rules +++ b/debian/rules @@@ -194,9 -198,12 +200,13 @@@ debian/iceweasel-l10n-%.maintscript: de endif override_dh_auto_configure: + mkdir -p fakehome - stamps/prepare-configure:: stamps/dummy + 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; \ @@@ -281,12 -284,8 +287,12 @@@ endi override_dh_auto_clean:: rm -f $(filter-out debian/control,$(GENERATED_FILES)) - rm -f configure js/src/configure old-configure js/src/old-configure - rm -rf stamps l10n + rm -f $$(cat debian/extra-clean 2>/dev/null) debian/extra-clean old-configure js/src/old-configure + rm -rf stamps l10n $(CARGO_HOME) + find third_party/python/psutil/tmp/ ! -name 'tmpoJXh06.o' -type f -exec rm -f {} + + 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= ifeq ($(DEB_HOST_ARCH_ENDIAN),big) @@@ -302,21 -303,13 +310,15 @@@ override_dh_clean sed -i '2!b;/^exec "/ d' $$dir/$$file; \ done; \ done + rm -rf build-browser + rm -rf fakehome - override_dh_clean: - dh_clean -XCargo.toml.orig - - override_dh_auto_install: stamps/install-$(PRODUCT) + override_dh_auto_install-arch: stamps/install-$(PRODUCT) + override_dh_auto_install-indep: stamps/install-$(PRODUCT):: - ifneq (,$(filter mips,$(DEB_HOST_ARCH))) - sed -i '/"javascript.options.\(baselinejit\|ion\)"/s/true/false/' build-$(PRODUCT)/dist/bin/greprefs.js - endif dh_auto_install --builddirectory=build-$(PRODUCT) -- installdir=$(LIB_DIR) \ MOZ_APP_BASE_VERSION=$(GRE_VERSION) \ - MOZ_PKG_MANIFEST=$(CURDIR)/debian/installer/package-manifest.$(PRODUCT) \ TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \ SIGN_NSS=