diff options
author | Mark H Weaver <mhw@netris.org> | 2017-11-15 09:35:12 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-11-16 00:01:46 -0500 |
commit | f1e32145341326f56b172288861a2d4b30967892 (patch) | |
tree | 0a0f6a76e346d8c93ffa4eb17b663fb70b591fb9 /gnu/packages/patches/icecat-bug-1415133.patch | |
parent | 6a71fa6faaa6d3f5812d08008b487f0b8b12c997 (diff) | |
download | guix-patches-f1e32145341326f56b172288861a2d4b30967892.tar guix-patches-f1e32145341326f56b172288861a2d4b30967892.tar.gz |
gnu: icecat: Add more fixes from upstream mozilla-esr52.
Add fixes for CVE-2017-7830, the remaining 1/2 changesets for CVE-2017-7828,
the remaining 1/19 changesets for CVE-2017-7826, and selected other fixes.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the
upstream mozilla-esr52 repository.
* gnu/packages/patches/icecat-bug-1348660-pt5.patch,
gnu/packages/patches/icecat-bug-1415133.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
Diffstat (limited to 'gnu/packages/patches/icecat-bug-1415133.patch')
-rw-r--r-- | gnu/packages/patches/icecat-bug-1415133.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-bug-1415133.patch b/gnu/packages/patches/icecat-bug-1415133.patch new file mode 100644 index 0000000000..4e322d21fb --- /dev/null +++ b/gnu/packages/patches/icecat-bug-1415133.patch @@ -0,0 +1,40 @@ +Based on: + https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/22fe3ff3f923 + +Adapted to apply cleanly to IceCat. + +# HG changeset patch +# User Marco Bonardo <mbonardo@mozilla.com> +# Date 1510052455 -3600 +# Node ID 22fe3ff3f92358596521f7155ddc512006022207 +# Parent 2909ba991f3134f9fbf4859cf08582f1c9845594 +Bug 1415133 - Downgrades from 55+ to ESR lose bookmarks. r=past a=lizzard + +MozReview-Commit-ID: 44Rw7m1FP4h + +diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp +--- a/toolkit/components/places/Database.cpp ++++ b/toolkit/components/places/Database.cpp +@@ -761,16 +761,21 @@ Database::InitSchema(bool* aDatabaseMigr + // 2. implement a method that performs upgrade to your version from the + // previous one. + // + // NOTE: The downgrade process is pretty much complicated by the fact old + // versions cannot know what a new version is going to implement. + // The only thing we will do for downgrades is setting back the schema + // version, so that next upgrades will run again the migration step. + ++ if (currentSchemaVersion > 36) { ++ // These versions are not downgradable. ++ return NS_ERROR_FILE_CORRUPTED; ++ } ++ + if (currentSchemaVersion < DATABASE_SCHEMA_VERSION) { + *aDatabaseMigrated = true; + + if (currentSchemaVersion < 11) { + // These are versions older than IceCat 4 that are not supported + // anymore. In this case it's safer to just replace the database. + return NS_ERROR_FILE_CORRUPTED; + } + |