From 55b51ac0da8497817db4ea084c1cd8401dadad1f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Apr 02 2018 15:02:58 +0000 Subject: Update buildchain version --- diff --git a/Cargo.lock b/Cargo.lock index 4e4325f..96dcde0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,8 +80,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "buildchain" -version = "0.4.4" -source = "git+https://github.com/pop-os/buildchain.git#50c12a53db1a0b39e19e3b749e3fafeccbfdddd2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base32 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -93,6 +93,7 @@ dependencies = [ "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sodiumoxide 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -448,6 +449,15 @@ dependencies = [ ] [[package]] +name = "libsodium-sys" +version = "0.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "log" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -879,6 +889,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "sodiumoxide" +version = "0.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libsodium-sys 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "strsim" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -897,7 +917,7 @@ dependencies = [ name = "system76-firmware-daemon" version = "0.1.0" dependencies = [ - "buildchain 0.4.4 (git+https://github.com/pop-os/buildchain.git)", + "buildchain 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "dbus 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "ecflash 0.1.0 (git+https://github.com/system76/ecflash.git?branch=stable)", "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1272,7 +1292,7 @@ dependencies = [ "checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814" "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" "checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9" -"checksum buildchain 0.4.4 (git+https://github.com/pop-os/buildchain.git)" = "" +"checksum buildchain 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "72166d3e337bbc3bc66df23cef4e4aff382827250b38dc2900bc77dda88b9109" "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" "checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87" "checksum bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b7db437d718977f6dc9b2e3fd6fc343c02ac6b899b73fdd2179163447bd9ce9" @@ -1317,6 +1337,7 @@ dependencies = [ "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" "checksum libdbus-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8720f9274907052cb50313f91201597868da9d625f8dd125f2aca5bddb7e83a1" "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e" +"checksum libsodium-sys 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "fcbd1beeed8d44caa8a669ebaa697c313976e242c03cc9fb23d88bf1656f5542" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" "checksum lxd 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "fbf11599761a721a30d6a000cdeb064909a920385d65681570ced1e78abe00c6" @@ -1367,6 +1388,7 @@ dependencies = [ "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdeff4cd9ecff59ec7e3744cbca73dfe5ac35c2aedb2cfba8a1c715a18912e9d" "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" +"checksum sodiumoxide 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb5cb2f14f9a51352ad65e59257a0a9459d5a36a3615f3d53a974c82fdaaa00a" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" "checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59" "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" diff --git a/Cargo.toml b/Cargo.toml index 8d9ab90..8490e19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Jeremy Soller "] [dependencies] -buildchain = { git = "https://github.com/pop-os/buildchain.git" } +buildchain = "0.4.5" dbus = "0.6" ecflash = { git = "https://github.com/system76/ecflash.git", branch = "stable" } libc = "0.2" diff --git a/debian/control b/debian/control index 3177d8c..0c7966e 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,13 @@ Priority: optional Maintainer: Jeremy Soller Build-Depends: debhelper (>=9), - cargo + cargo, + libsodium-dev, + libssl-dev Standards-Version: 4.1.1 Homepage: https://github.com/pop-os/system76-firmware-daemon -Package: system76-power +Package: system76-firmware-daemon Architecture: amd64 Depends: dbus,