diff options
author | Markus Richter | 2018-09-23 17:13:16 +0200 |
---|---|---|
committer | Markus Richter | 2018-09-23 17:13:16 +0200 |
commit | 7ba5051653caf69ffa3024b8d3440d0f865ea24c (patch) | |
tree | 0f3392ca93991ebd5bbf8f02726fdb68c57438b5 | |
parent | 5c30385e801745963fe0df7d43b27cbbd13b1c59 (diff) | |
download | aur-7ba5051653caf69ffa3024b8d3440d0f865ea24c.tar.gz |
fix broken lettre dependency
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0002-Fix-OpenSSL.patch | 228 | ||||
-rw-r--r-- | PKGBUILD | 6 |
3 files changed, 140 insertions, 98 deletions
@@ -1,7 +1,7 @@ pkgbase = bitwarden_rs pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface. pkgver = 1.1.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/dani-garcia/bitwarden_rs install = bitwarden_rs.install arch = i686 @@ -24,7 +24,7 @@ pkgbase = bitwarden_rs sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74 sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6 sha512sums = cbc151fc41ebffa611e144575bea463ab31a75d55ec1a331795eded3d415db8a221d24c75efe0c97c56fc33b80ffca53683af3d240af547b0d4a222d3095e960 - sha512sums = d66facb9dbe5863443d2b2383646b41fe528cb0ab967c156876852d9c6b8faac05251bdcdf584cff5d7d4d9e8ee162fe32bbfb0873d0fdb7393cf74962cd8c4f + sha512sums = 00876217c628656f52716801d6c888624263dfb726c9cad76fb90860e3648f1cd9b75140b72e847687982ca0001f0407eb41642de4ad88e27448f89fced4f281 pkgname = bitwarden_rs diff --git a/0002-Fix-OpenSSL.patch b/0002-Fix-OpenSSL.patch index 6ccfb470869b..539592e157d9 100644 --- a/0002-Fix-OpenSSL.patch +++ b/0002-Fix-OpenSSL.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.lock b/Cargo.lock -index 3b8b843..affa902 100644 +index 3b8b843..59b58b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,10 +5,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" @@ -34,7 +34,7 @@ index 3b8b843..affa902 100644 + "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -96,8 +96,8 @@ index 3b8b843..affa902 100644 + "fast_chemail 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", "jsonwebtoken 4.0.1", "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lettre 0.9.0 (git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2)", -+ "lettre_email 0.9.0 (git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2)", ++ "lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a)", ++ "lettre_email 0.9.0 (git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a)", "libsqlite3-sys 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "multipart 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "multipart 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -107,7 +107,7 @@ index 3b8b843..affa902 100644 + "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "oath 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "reqwest 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "rocket 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rocket_codegen 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -486,7 +486,7 @@ index 3b8b843..affa902 100644 [[package]] name = "iovec" version = "0.1.2" -@@ -603,9 +706,10 @@ dependencies = [ +@@ -603,30 +706,31 @@ dependencies = [ [[package]] name = "isatty" @@ -497,8 +497,9 @@ index 3b8b843..affa902 100644 + "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -613,20 +717,20 @@ dependencies = [ +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] [[package]] name = "itoa" @@ -536,7 +537,7 @@ index 3b8b843..affa902 100644 +[[package]] +name = "lettre" +version = "0.9.0" -+source = "git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2#644b1e59b06704822c6a540c12ed44b6e827d221" ++source = "git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a#fc91bb6ee8f9a28b818e98598af0a83a0dbb41d3" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -545,7 +546,7 @@ index 3b8b843..affa902 100644 + "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nom 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -554,16 +555,16 @@ index 3b8b843..affa902 100644 +[[package]] +name = "lettre_email" +version = "0.9.0" -+source = "git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2#644b1e59b06704822c6a540c12ed44b6e827d221" ++source = "git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a#fc91bb6ee8f9a28b818e98598af0a83a0dbb41d3" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "email 0.0.19 (git+https://github.com/lettre/rust-email)", + "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lettre 0.9.0 (git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2)", ++ "lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a)", + "mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] @@ -614,31 +615,21 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -718,12 +864,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -718,10 +864,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "2.0.1" -+version = "1.0.2" ++version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ ++ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -+[[package]] -+name = "memchr" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ [[package]] - name = "memoffset" - version = "0.2.1" -@@ -734,7 +890,7 @@ name = "migrations_internals" +@@ -734,7 +882,7 @@ name = "migrations_internals" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -647,7 +638,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -769,8 +925,8 @@ version = "1.8.6" +@@ -769,8 +917,8 @@ version = "1.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -658,7 +649,7 @@ index 3b8b843..affa902 100644 "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -780,29 +936,39 @@ version = "2.0.0-alpha.6" +@@ -780,29 +928,39 @@ version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -703,7 +694,7 @@ index 3b8b843..affa902 100644 [[package]] name = "miow" version = "0.2.1" -@@ -821,14 +987,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -821,14 +979,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "multipart" @@ -720,7 +711,7 @@ index 3b8b843..affa902 100644 "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "nickel 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -851,16 +1017,18 @@ dependencies = [ +@@ -851,16 +1009,18 @@ dependencies = [ [[package]] name = "native-tls" @@ -745,16 +736,25 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -897,13 +1065,21 @@ name = "nodrop" +@@ -870,7 +1030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -897,13 +1057,21 @@ name = "nodrop" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "nom" -+version = "3.2.1" ++version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] @@ -769,7 +769,7 @@ index 3b8b843..affa902 100644 "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -913,12 +1089,12 @@ name = "num-integer" +@@ -913,12 +1081,12 @@ name = "num-integer" version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -784,7 +784,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -@@ -943,24 +1119,30 @@ dependencies = [ +@@ -943,24 +1111,30 @@ dependencies = [ [[package]] name = "openssl" @@ -821,7 +821,7 @@ index 3b8b843..affa902 100644 "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -969,6 +1151,35 @@ name = "ordermap" +@@ -969,6 +1143,35 @@ name = "ordermap" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -851,13 +851,13 @@ index 3b8b843..affa902 100644 + "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "pear" version = "0.0.20" -@@ -990,33 +1201,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -990,33 +1193,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "phf" @@ -900,7 +900,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1025,7 +1236,7 @@ dependencies = [ +@@ -1025,7 +1228,7 @@ dependencies = [ [[package]] name = "pkg-config" @@ -909,7 +909,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -@@ -1046,7 +1257,7 @@ dependencies = [ +@@ -1046,7 +1249,7 @@ dependencies = [ [[package]] name = "proc-macro2" @@ -918,7 +918,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1075,7 +1286,7 @@ name = "quote" +@@ -1075,7 +1278,7 @@ name = "quote" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -927,7 +927,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1084,7 +1295,7 @@ version = "0.8.2" +@@ -1084,7 +1287,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -936,8 +936,12 @@ index 3b8b843..affa902 100644 "scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -1098,6 +1309,23 @@ dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1095,9 +1298,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] @@ -949,7 +953,7 @@ index 3b8b843..affa902 100644 + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -960,7 +964,7 @@ index 3b8b843..affa902 100644 [[package]] name = "rayon" version = "0.7.1" -@@ -1127,23 +1355,23 @@ name = "regex" +@@ -1127,23 +1347,23 @@ name = "regex" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -991,7 +995,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1162,14 +1390,6 @@ dependencies = [ +@@ -1162,44 +1382,38 @@ dependencies = [ "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1006,12 +1010,16 @@ index 3b8b843..affa902 100644 [[package]] name = "remove_dir_all" version = "0.5.1" -@@ -1180,26 +1400,28 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] [[package]] name = "reqwest" -version = "0.8.8" -+version = "0.9.0" ++version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1048,7 +1056,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1219,13 +1441,13 @@ name = "rocket" +@@ -1219,13 +1433,13 @@ name = "rocket" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1065,7 +1073,7 @@ index 3b8b843..affa902 100644 "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "ordermap 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "pear 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1258,10 +1480,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1258,10 +1472,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "rocket 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1083,7 +1091,7 @@ index 3b8b843..affa902 100644 [[package]] name = "rustc-hex" version = "1.0.0" -@@ -1272,6 +1499,14 @@ name = "rustc-serialize" +@@ -1272,6 +1491,14 @@ name = "rustc-serialize" version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1098,7 +1106,7 @@ index 3b8b843..affa902 100644 [[package]] name = "rustls" version = "0.9.0" -@@ -1287,7 +1522,7 @@ dependencies = [ +@@ -1287,7 +1514,7 @@ dependencies = [ [[package]] name = "ryu" @@ -1107,7 +1115,16 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -@@ -1317,11 +1552,6 @@ dependencies = [ +@@ -1306,7 +1533,7 @@ version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -1317,11 +1544,6 @@ dependencies = [ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1119,7 +1136,7 @@ index 3b8b843..affa902 100644 [[package]] name = "scopeguard" version = "0.3.3" -@@ -1329,47 +1559,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1329,47 +1551,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "security-framework" @@ -1176,7 +1193,7 @@ index 3b8b843..affa902 100644 + "proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1194,7 +1211,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1378,8 +1621,8 @@ version = "0.5.3" +@@ -1378,8 +1613,8 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1205,7 +1222,7 @@ index 3b8b843..affa902 100644 "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -1419,7 +1662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1419,12 +1654,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "slice-deque" @@ -1214,7 +1231,13 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1435,11 +1678,21 @@ dependencies = [ + "mach 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -1435,11 +1670,21 @@ dependencies = [ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1236,7 +1259,7 @@ index 3b8b843..affa902 100644 [[package]] name = "syn" version = "0.11.11" -@@ -1465,7 +1718,17 @@ name = "syn" +@@ -1465,7 +1710,17 @@ name = "syn" version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1248,14 +1271,14 @@ index 3b8b843..affa902 100644 + +[[package]] +name = "syn" -+version = "0.15.4" ++version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -@@ -1483,7 +1746,7 @@ name = "synstructure" +@@ -1483,7 +1738,7 @@ name = "synstructure" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1264,7 +1287,7 @@ index 3b8b843..affa902 100644 "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1498,6 +1761,19 @@ dependencies = [ +@@ -1498,6 +1753,19 @@ dependencies = [ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1278,13 +1301,22 @@ index 3b8b843..affa902 100644 + "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "thread_local" version = "0.3.6" -@@ -1522,28 +1798,31 @@ version = "0.6.0" +@@ -1513,7 +1781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -1522,28 +1790,31 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1327,7 +1359,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1551,35 +1830,26 @@ name = "tokio-codec" +@@ -1551,35 +1822,26 @@ name = "tokio-codec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1372,7 +1404,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1587,40 +1857,36 @@ name = "tokio-fs" +@@ -1587,40 +1849,36 @@ name = "tokio-fs" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1430,7 +1462,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1628,59 +1894,67 @@ name = "tokio-tcp" +@@ -1628,59 +1886,67 @@ name = "tokio-tcp" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1527,7 +1559,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1688,7 +1962,7 @@ name = "toml" +@@ -1688,7 +1954,7 @@ name = "toml" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1536,7 +1568,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1698,7 +1972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1698,7 +1964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "try-lock" @@ -1545,7 +1577,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -@@ -1706,7 +1980,7 @@ name = "twoway" +@@ -1706,7 +1972,7 @@ name = "twoway" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1554,7 +1586,7 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1733,13 +2007,13 @@ version = "0.1.2" +@@ -1733,13 +1999,13 @@ version = "0.1.2" source = "git+https://github.com/wisespace-io/u2f-rs?rev=193de35093a44#193de35093a44576edba6cc94d9b54f2a1cbdcd1" dependencies = [ "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1574,7 +1606,7 @@ index 3b8b843..affa902 100644 "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1822,7 +2096,7 @@ dependencies = [ +@@ -1822,7 +2088,7 @@ dependencies = [ [[package]] name = "utf8-ranges" @@ -1583,7 +1615,7 @@ index 3b8b843..affa902 100644 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -@@ -1834,6 +2108,14 @@ dependencies = [ +@@ -1834,6 +2100,14 @@ dependencies = [ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1598,7 +1630,7 @@ index 3b8b843..affa902 100644 [[package]] name = "vcpkg" version = "0.2.6" -@@ -1851,12 +2133,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1851,12 +2125,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "want" @@ -1615,7 +1647,16 @@ index 3b8b843..affa902 100644 ] [[package]] -@@ -1916,6 +2198,14 @@ name = "winapi-x86_64-pc-windows-gnu" +@@ -1894,7 +2168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "winapi" +-version = "0.3.5" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1916,6 +2190,14 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1624,13 +1665,13 @@ index 3b8b843..affa902 100644 +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" -@@ -1930,46 +2220,56 @@ name = "yansi" +@@ -1930,46 +2212,56 @@ name = "yansi" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1700,7 +1741,7 @@ index 3b8b843..affa902 100644 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -@@ -1982,39 +2282,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1982,39 +2274,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7efb22686e4a466b1ec1a15c2898f91fa9cb340452496dca654032de20ff95b9" "checksum failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "946d0e98a50d9831f5d589038d2ca7f8f455b1c21028c0db0e84116a12696426" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" @@ -1741,8 +1782,8 @@ index 3b8b843..affa902 100644 "checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7" -"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef" +"checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" -+"checksum lettre 0.9.0 (git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2)" = "<none>" -+"checksum lettre_email 0.9.0 (git+https://github.com/tyranron/lettre?branch=upgrade-to-native-tls-0-2)" = "<none>" ++"checksum lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a)" = "<none>" ++"checksum lettre_email 0.9.0 (git+https://github.com/lettre/lettre?rev=fc91bb6ee8f9a)" = "<none>" "checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d" "checksum libflate 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "7d4b4c7aff5bac19b956f693d0ea0eade8066deb092186ae954fa6ba14daab98" "checksum libsqlite3-sys 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d3711dfd91a1081d2458ad2d06ea30a8755256e74038be2ad927d94e1c955ca8" @@ -1753,12 +1794,11 @@ index 3b8b843..affa902 100644 "checksum mach 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "977262a11cfd76b94da10b8898cea6e9ac391301ab74741e6da6bee13d7df46d" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d" -+"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" +"checksum memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b3629fe9fdbff6daa6c33b90f7c08355c1aca05a3d01fa8063b822fcf185f3b" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" "checksum migrations_internals 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8cf7c8c4f83fa9f47440c0b4af99973502de55e6e7b875f693bd263e03f93e7e" "checksum migrations_macros 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79f12499ef7353bdeca2d081bc61edd8351dac09a33af845952009b5a3d68c1a" -@@ -2022,102 +2332,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2022,102 +2323,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum mime 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4b082692d3f6cf41b453af73839ce3dfc212c4411cbb2441dff80a716e38bd79" "checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" @@ -1775,7 +1815,7 @@ index 3b8b843..affa902 100644 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum nickel 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "22b40e35b9f46a076dcbd8193125cea0e4130b1c015f68655038010f3e826e04" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" -+"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" ++"checksum nom 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "898696750eb5c3ce5eb5afbfbe46e7f7c4e1936e19d3e97be4b7937da7b6d114" "checksum num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7" "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" -"checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe" @@ -1827,7 +1867,7 @@ index 3b8b843..affa902 100644 -"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" -"checksum reqwest 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "738769ec83daf6c1929dc9dae7d69ed3779b55ae5c356e989dcd3aa677d8486e" -+"checksum reqwest 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1cd396ef9387a076401c19701a86bc08d349ce45eab331247632b4bc9d0bd592" ++"checksum reqwest 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c4265be4dad32ffa4be2cea9c8ecb5e096feca6b4ff024482bfc0f64b6019b2f" "checksum ring 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2a6dc7fc06a05e6de183c5b97058582e9da2de0c136eafe49609769c507724" "checksum rocket 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc32be1d093e7b2f9718983318c6bf5a14f43d7ea01a0b5143c3450c90725b9" "checksum rocket_codegen 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "bfc94e7781a8bc502f3614521ae94b562f209c7537671cb6169cbbe9dbcc6c5e" @@ -1871,7 +1911,7 @@ index 3b8b843..affa902 100644 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b" "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" -+"checksum syn 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9056ebe7f2d6a38bc63171816fd1d3430da5a43896de21676dc5c0a4b8274a11" ++"checksum syn 0.15.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5522da8e493dbd7703e88ec5518546ed45c30efa2699f291a7bd0a08fb0a6ab6" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum synstructure 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85bb9b7550d063ea184027c9b8c20ac167cd36d3e06b3a40bceb9d746dc1a7b7" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" @@ -1908,7 +1948,7 @@ index 3b8b843..affa902 100644 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" "checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -@@ -2134,12 +2457,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2134,19 +2448,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" "checksum untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f392d7819dbe58833e26872f5f6f0d68b7bbbe90fc3667e98731c4a15ad9a7ae" "checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6" @@ -1924,7 +1964,9 @@ index 3b8b843..affa902 100644 "checksum webpki 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e499345fc4c6b7c79a5b8756d4592c4305510a13512e79efafe00dfbd67bbac6" "checksum webpki 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "493012e46177f3f4ee9cd58fd0c81ecb77e6d6cc6ebce55989b9c33376fbe5ee" "checksum webpki-roots 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5bfb3f50499f21ad2317f442845e3b5805b007f1e728f59885c99e61b8c181a7" -@@ -2148,5 +2472,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" ++"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" @@ -1932,7 +1974,7 @@ index 3b8b843..affa902 100644 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum yansi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d60c3b48c9cdec42fb06b3b84b5b087405e1fa1c644a1af3930e4dfafe93de48" diff --git a/Cargo.toml b/Cargo.toml -index 99a7542..b1c3c1d 100644 +index 99a7542..cc35aa2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ rocket_codegen = "0.3.16" @@ -1961,8 +2003,8 @@ index 99a7542..b1c3c1d 100644 # Make jwt use ring 0.11, to match rocket jsonwebtoken = { path = "libs/jsonwebtoken" } +rmp = { git = 'https://github.com/dani-garcia/msgpack-rust' } -+lettre = { git = 'https://github.com/tyranron/lettre', branch = 'upgrade-to-native-tls-0-2' } -+lettre_email = { git = 'https://github.com/tyranron/lettre', branch = 'upgrade-to-native-tls-0-2' } ++lettre = { git = 'https://github.com/lettre/lettre', rev = 'fc91bb6ee8f9a' } ++lettre_email = { git = 'https://github.com/lettre/lettre', rev = 'fc91bb6ee8f9a' } # Version 0.1.2 from crates.io lacks a commit that fixes a certificate error u2f = { git = 'https://github.com/wisespace-io/u2f-rs', rev = '193de35093a44' } @@ -3,7 +3,7 @@ pkgname=bitwarden_rs _pkgbase=bitwarden_rs pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface." arch=('i686' 'x86_64' 'armv7h' 'aarch64') url="https://github.com/dani-garcia/bitwarden_rs" @@ -23,13 +23,13 @@ sha512sums=('3b8290b5f5055b48ffd732b823ca9da6d2f78c0511daab8d05490f10d087d001b41 '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74' '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6' 'cbc151fc41ebffa611e144575bea463ab31a75d55ec1a331795eded3d415db8a221d24c75efe0c97c56fc33b80ffca53683af3d240af547b0d4a222d3095e960' - 'd66facb9dbe5863443d2b2383646b41fe528cb0ab967c156876852d9c6b8faac05251bdcdf584cff5d7d4d9e8ee162fe32bbfb0873d0fdb7393cf74962cd8c4f') + '00876217c628656f52716801d6c888624263dfb726c9cad76fb90860e3648f1cd9b75140b72e847687982ca0001f0407eb41642de4ad88e27448f89fced4f281') _src="$pkgname-$pkgver" build() { #build bitwarden_rs cd "$srcdir/$_src" - patch -N -i "$srcdir/0001-Disable-Vault.patch" + patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch" patch -N -p1 -i "$srcdir/0002-Fix-OpenSSL.patch" cargo build --release } |