diff --git a/.cargo/config b/.cargo/config deleted file mode 100644 index 04cb214e..00000000 --- a/.cargo/config +++ /dev/null @@ -1 +0,0 @@ -paths = ["./iron-fork"] diff --git a/.gitignore b/.gitignore index 9c72492f..1e3d6049 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /target/ components/*/target components/*/Cargo.lock +.cargo # Generated by IPCameraAdapter /snapshots/ diff --git a/Cargo.lock b/Cargo.lock index 49433bef..7dfe304c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,7 +2,7 @@ name = "foxbox" version = "0.1.0" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)", "docopt_macros 0.6.83 (registry+https://github.com/rust-lang/crates.io-index)", @@ -11,14 +11,14 @@ dependencies = [ "foxbox_thinkerbell 0.1.2", "foxbox_users 0.1.0 (git+https://github.com/fxbox/users.git?rev=1033e08)", "get_if_addrs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "iron-cors 0.1.0 (git+https://github.com/fxbox/iron-cors.git?rev=96ede73)", - "iron-test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "iron-test 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.5.0 (git+https://github.com/carllerche/mio.git)", - "mount 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "mount 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "multicast_dns 0.1.0 (git+https://github.com/fxbox/multicast-dns.git?rev=a6e4bcc)", "nix 0.5.1-pre (git+https://github.com/nix-rust/nix.git?rev=138080)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -26,7 +26,7 @@ dependencies = [ "openzwave-adapter 0.1.0", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.68 (registry+https://github.com/rust-lang/crates.io-index)", "router 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rusqlite 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -35,7 +35,7 @@ dependencies = [ "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "stainless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "staticfile 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staticfile 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -44,7 +44,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "ws 0.4.5 (git+https://github.com/housleyjk/ws-rs.git?rev=d154fc5)", + "ws 0.4.6 (git+https://github.com/JohanLorenzo/ws-rs.git?branch=0.4.6)", "xml-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -110,7 +110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chrono" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -139,13 +139,13 @@ dependencies = [ [[package]] name = "cookie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -161,7 +161,7 @@ name = "docopt" version = "0.6.80" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.68 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -180,7 +180,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.68 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -196,7 +196,7 @@ dependencies = [ name = "foxbox_taxonomy" version = "0.1.2" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -214,7 +214,7 @@ dependencies = [ name = "foxbox_thinkerbell" version = "0.1.2" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "foxbox_taxonomy 0.1.2", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rusqlite 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -281,14 +281,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -301,23 +301,13 @@ dependencies = [ ] [[package]] -name = "hyper" -version = "0.8.1" +name = "idna" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -327,12 +317,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "iron" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.3.0" dependencies = [ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -346,18 +335,7 @@ dependencies = [ name = "iron" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", -] +replace = "iron 0.3.0" [[package]] name = "iron-cors" @@ -370,11 +348,11 @@ dependencies = [ [[package]] name = "iron-test" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -463,15 +441,6 @@ dependencies = [ "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mime" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mime" version = "0.2.0" @@ -520,15 +489,6 @@ name = "modifier" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mount" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sequence_trie 0.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mount" version = "0.1.0" @@ -661,7 +621,7 @@ dependencies = [ [[package]] name = "openzwave" version = "0.1.0" -source = "git+https://github.com/fxbox/openzwave-rust#3fdf6ee82161b786b54fddaea53d5a96a3913488" +source = "git+https://github.com/fxbox/openzwave-rust#b11bbcb9f38ed4f5534b990617fd3dabbc3936d2" dependencies = [ "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -689,7 +649,7 @@ dependencies = [ [[package]] name = "openzwave-sys" version = "0.1.0" -source = "git+https://github.com/fxbox/openzwave-rust#3fdf6ee82161b786b54fddaea53d5a96a3913488" +source = "git+https://github.com/fxbox/openzwave-rust#b11bbcb9f38ed4f5534b990617fd3dabbc3936d2" dependencies = [ "gcc 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -784,13 +744,13 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.66" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -867,14 +827,6 @@ name = "sequence_trie" version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "serde" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde" version = "0.7.0" @@ -936,10 +888,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "staticfile" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mount 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -987,11 +939,10 @@ dependencies = [ [[package]] name = "thread_local" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1009,7 +960,7 @@ name = "timer" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1017,8 +968,8 @@ name = "tls" version = "0.1.0" dependencies = [ "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mktemp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1120,7 +1071,16 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "url" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1159,7 +1119,7 @@ dependencies = [ [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1182,8 +1142,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ws" -version = "0.4.5" -source = "git+https://github.com/housleyjk/ws-rs.git?rev=d154fc5#d154fc56e8dd06d9172efd08ef0db9c244668cbf" +version = "0.4.6" +source = "git+https://github.com/JohanLorenzo/ws-rs.git?branch=0.4.6#8d71ed015148a63bc2805456d819e80dae9ca5e5" dependencies = [ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 6fdfa617..ed043f70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,9 @@ exclude = [ "**/*.conf", default = ["authentication"] authentication = [] +[replace] +"iron:0.3.0" = { path = "iron-fork/" } + [build-dependencies] pkg-config = "0.3" @@ -21,20 +24,23 @@ pkg-config = "0.3" foxbox_thinkerbell = { path = "components/thinkerbell/" } openzwave-adapter = { path = "components/openzwave-adapter/" } foxbox_taxonomy = { path = "components/taxonomy/" } +tls = { path = "components/tls/" } + foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "1033e08" } +multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" } +iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" } + chrono = "0.2.19" clippy = "0.0.63" docopt = "0.6.78" docopt_macros = "0.6.80" env_logger = "0.3.2" get_if_addrs = "0.3.1" -hyper = "0.7.2" -multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" } -iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" } +hyper = "0.8.1" libc = "0.2.7" log = "0.3" mio = { git = "https://github.com/carllerche/mio.git" } -mount = "0.0.10" +mount = "0.1.0" nix = { git = "https://github.com/nix-rust/nix.git", rev = "138080" } # Until 0.5.1 is released openssl = "0.7.6" openssl-sys = "0.7.6" @@ -46,25 +52,24 @@ rusqlite = "0.6.0" serde = "0.7.0" serde_json = "0.7.0" serde_macros = "0.7.2" -staticfile = "0.1.0" +staticfile = "0.2.0" transformable_channels = "^0.1" unicase = "1.3.0" -tls = { path = "./components/tls" } time = "0.1" timer = "0.1.6" uuid = "0.1.18" url = "0.5.7" -ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" } +ws = { git = "https://github.com/JohanLorenzo/ws-rs.git" , branch = "0.4.6" } xml-rs = "0.3.0" [dependencies.iron] -version = "0.2.6" +version = "0.3.0" default-features = true features = ["ssl"] [dev-dependencies] stainless = "0.1.4" -iron-test = "0.2.0" +iron-test = "0.3.0" regex = "0.1.55" rand = "0.3.14" tempdir = "0.3.4" diff --git a/components/dns_challenge/Cargo.lock b/components/dns_challenge/Cargo.lock index 58ceebab..6b1261dd 100644 --- a/components/dns_challenge/Cargo.lock +++ b/components/dns_challenge/Cargo.lock @@ -84,14 +84,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -105,12 +105,12 @@ dependencies = [ [[package]] name = "iron" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -169,11 +169,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "mime" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -355,14 +354,6 @@ dependencies = [ "nom 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "serde" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde" version = "0.7.0" @@ -427,8 +418,8 @@ name = "tls" version = "0.1.0" dependencies = [ "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mktemp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/dns_challenge/Cargo.toml b/components/dns_challenge/Cargo.toml index bd787c57..8a641c00 100644 --- a/components/dns_challenge/Cargo.toml +++ b/components/dns_challenge/Cargo.toml @@ -8,6 +8,9 @@ publish = false name = "dnschallenge" path = "main.rs" +[replace] +"iron:0.3.0" = { path = "../../iron-fork/" } + [dependencies.tls] path = "../tls" diff --git a/components/tls/Cargo.lock b/components/tls/Cargo.lock index fc81ffee..2bc20b39 100644 --- a/components/tls/Cargo.lock +++ b/components/tls/Cargo.lock @@ -3,8 +3,8 @@ name = "tls" version = "0.1.0" dependencies = [ "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mktemp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -92,14 +92,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -113,12 +113,11 @@ dependencies = [ [[package]] name = "iron" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.3.0" dependencies = [ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -128,6 +127,12 @@ dependencies = [ "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "iron" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "iron 0.3.0" + [[package]] name = "kernel32-sys" version = "0.2.2" @@ -177,11 +182,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "mime" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -363,14 +367,6 @@ dependencies = [ "nom 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "serde" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde" version = "0.7.0" diff --git a/components/tls/Cargo.toml b/components/tls/Cargo.toml index 25b12a53..8177669a 100644 --- a/components/tls/Cargo.toml +++ b/components/tls/Cargo.toml @@ -8,14 +8,17 @@ publish = false name = "tls" path = "lib.rs" +[replace] +"iron:0.3.0" = { path = "../../iron-fork/" } + [dependencies.iron] -version = "0.2.6" +version = "0.3.0" default-features = true features = ["ssl"] [dependencies] clippy = "0.0.63" -hyper = "0.7.2" +hyper = "0.8.1" log = "0.3" mktemp = "0.1.2" openssl = "0.7.6" diff --git a/iron-fork/Cargo.toml b/iron-fork/Cargo.toml index 2e642763..2a12d421 100644 --- a/iron-fork/Cargo.toml +++ b/iron-fork/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iron" -version = "0.2.6" +version = "0.3.0" description = "Extensible, Concurrency Focused Web Development in Rust." readme = "README.md" repository = "https://github.com/iron/iron" @@ -26,7 +26,7 @@ ssl = ["hyper/ssl"] [dependencies] typemap = "0.3" url = "0.5" -plugin = "0.2*" +plugin = "0.2" modifier = "0.1" error = "0.1" log = "0.3" @@ -35,8 +35,8 @@ lazy_static = "0.1" num_cpus = "0.2" [dependencies.hyper] -version = "0.7" +version = "0.8" default-features = false [dev-dependencies] -time = "*" +time = "0.1"