Commit 15847c3f authored by Mark Hammond's avatar Mark Hammond
Browse files

Bug 1804545 - Re-vendor application-services to pickup fix to IDs in sync... 

Bug 1804545 - Re-vendor application-services to pickup fix to IDs in sync payload. r=skhamis,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D164135
parent 07544c63

.cargo/config.in

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39" 
[source."https://github.com/mozilla/application-services"]

git = "https://github.com/mozilla/application-services"

replace-with = "vendored-sources"

rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9"

rev = "bef536015f038872ad991a1d5a17f765363349f6"



[source."https://github.com/mozilla-spidermonkey/jsparagus"]

git = "https://github.com/mozilla-spidermonkey/jsparagus"

Cargo.lock

+9 −9
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ dependencies = [ 
[[package]]

name = "error-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "lazy_static",

 "log",
@@ -2706,7 +2706,7 @@ dependencies = [ 
[[package]]

name = "interrupt-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "lazy_static",

 "parking_lot 0.12.999",
@@ -3805,7 +3805,7 @@ dependencies = [ 
[[package]]

name = "nss_build_common"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"



[[package]]

name = "nsstring"
@@ -5022,7 +5022,7 @@ dependencies = [ 
[[package]]

name = "sql-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "ffi-support",

 "interrupt-support",
@@ -5204,7 +5204,7 @@ dependencies = [ 
[[package]]

name = "sync-guid"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "base64",

 "rand 0.8.5",
@@ -5215,7 +5215,7 @@ dependencies = [ 
[[package]]

name = "sync15"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "anyhow",

 "error-support",
@@ -5245,7 +5245,7 @@ dependencies = [ 
[[package]]

name = "tabs"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "anyhow",

 "error-support",
@@ -5989,7 +5989,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 
[[package]]

name = "viaduct"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "ffi-support",

 "log",
@@ -6146,7 +6146,7 @@ dependencies = [ 
[[package]]

name = "webext-storage"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=4d858e4266c6d06d86d361279e6e04dbe5583cb9#4d858e4266c6d06d86d361279e6e04dbe5583cb9"

source = "git+https://github.com/mozilla/application-services?rev=bef536015f038872ad991a1d5a17f765363349f6#bef536015f038872ad991a1d5a17f765363349f6"

dependencies = [

 "error-support",

 "ffi-support",

Cargo.toml

+6 −6
Original line number Diff line number Diff line
@@ -161,12 +161,12 @@ midir = { git = "https://github.com/mozilla/midir.git", rev = "e1b4dcb767f9e69af 
minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }



# application-services overrides to make updating them all simpler.

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

sql-support = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

sync15 = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

tabs = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

viaduct = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

webext-storage = { git = "https://github.com/mozilla/application-services", rev = "4d858e4266c6d06d86d361279e6e04dbe5583cb9" }

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }

sql-support = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }

sync15 = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }

tabs = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }

viaduct = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }

webext-storage = { git = "https://github.com/mozilla/application-services", rev = "bef536015f038872ad991a1d5a17f765363349f6" }



# Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.

# There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

supply-chain/config.toml

+0 −4
Original line number Diff line number Diff line
@@ -1331,10 +1331,6 @@ criteria = "safe-to-deploy" 
version = "1.15.0"

criteria = "safe-to-deploy"



[[exemptions.unicase]]

version = "2.6.0"

criteria = "safe-to-deploy"



[[exemptions.unicode-ident]]

version = "1.0.0"

criteria = "safe-to-deploy"

supply-chain/imports.lock

+9 −0
Original line number Diff line number Diff line
@@ -97,6 +97,15 @@ criteria = "safe-to-deploy" 
version = "0.1.21"

notes = "I am the author of this crate."



[[audits.bytecodealliance.audits.unicase]]

who = "Alex Crichton <alex@alexcrichton.com>"

criteria = "safe-to-deploy"

version = "2.6.0"

notes = """

This crate contains no `unsafe` code and no unnecessary use of the standard

library.

"""



[[audits.bytecodealliance.audits.unicode-bidi]]

who = "Alex Crichton <alex@alexcrichton.com>"

criteria = "safe-to-deploy"