From 01d2c8d0f2f6024f412f8c5650ff9491f2159229 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 9 Nov 2016 10:43:05 -0700 Subject: [PATCH] Update to use upstream libc and rand --- drivers/pcid/Cargo.toml | 5 +---- libstd | 2 +- libstd_real/Cargo.toml | 2 +- libstd_real/alloc_system/Cargo.toml | 2 +- programs/extrautils | 2 +- programs/ion | 2 +- programs/orbutils | 2 +- programs/pkgutils | 2 +- programs/userutils | 2 +- schemes/tcpd/Cargo.toml | 4 ++-- schemes/udpd/Cargo.toml | 4 ++-- 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/pcid/Cargo.toml b/drivers/pcid/Cargo.toml index 67588f2..e1f0f78 100644 --- a/drivers/pcid/Cargo.toml +++ b/drivers/pcid/Cargo.toml @@ -4,8 +4,5 @@ version = "0.1.0" [dependencies] redox_syscall = { path = "../../syscall/" } -rustc-serialize = { git ="https://github.com/rust-lang-nursery/rustc-serialize.git" } +rustc-serialize = "0.3" toml = "*" - -[replace] -"rustc-serialize:0.3.19" = { git = "https://github.com/rust-lang-nursery/rustc-serialize.git" } diff --git a/libstd b/libstd index e44c9bb..c98bf6a 160000 --- a/libstd +++ b/libstd @@ -1 +1 @@ -Subproject commit e44c9bb65b18ac0fd2e32969de259cc17f055900 +Subproject commit c98bf6a5038229eb7eda07068f6d5d6c0b061253 diff --git a/libstd_real/Cargo.toml b/libstd_real/Cargo.toml index 5658c28..7ee35a3 100644 --- a/libstd_real/Cargo.toml +++ b/libstd_real/Cargo.toml @@ -15,4 +15,4 @@ libc = { path = "libc" } unwind = { path = "unwind" } [replace] -"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" } +"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/libstd_real/alloc_system/Cargo.toml b/libstd_real/alloc_system/Cargo.toml index 96036f5..dcb5bfb 100644 --- a/libstd_real/alloc_system/Cargo.toml +++ b/libstd_real/alloc_system/Cargo.toml @@ -10,4 +10,4 @@ default-features = false features = ["allocator"] [replace] -"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" } +"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/programs/extrautils b/programs/extrautils index 43f027a..c62f89f 160000 --- a/programs/extrautils +++ b/programs/extrautils @@ -1 +1 @@ -Subproject commit 43f027a164fd550831f6e9fa9a5db393541bcbe9 +Subproject commit c62f89fc47a6c7602d58f8fbbd8bb263d6f0f2d5 diff --git a/programs/ion b/programs/ion index b0bb59a..852a117 160000 --- a/programs/ion +++ b/programs/ion @@ -1 +1 @@ -Subproject commit b0bb59aad76fad07439f60bbdadb7a693e8fe859 +Subproject commit 852a1170487053f4f6f29a5b2647e68fd4e78a21 diff --git a/programs/orbutils b/programs/orbutils index 995da40..c212d15 160000 --- a/programs/orbutils +++ b/programs/orbutils @@ -1 +1 @@ -Subproject commit 995da40709987b9b380dd08349a4e2a4180198d0 +Subproject commit c212d152400f2f1579651d9e73ee2c38ce068318 diff --git a/programs/pkgutils b/programs/pkgutils index 73faffa..ce3fba3 160000 --- a/programs/pkgutils +++ b/programs/pkgutils @@ -1 +1 @@ -Subproject commit 73faffa7d5319f4198dfa6a8801e227c4de7421e +Subproject commit ce3fba39b4261af39ab353631c43ad9ea92e1ebd diff --git a/programs/userutils b/programs/userutils index 30187e1..69a21dd 160000 --- a/programs/userutils +++ b/programs/userutils @@ -1 +1 @@ -Subproject commit 30187e1c64805672281bb6c7b6fac0ca4b0c3a27 +Subproject commit 69a21ddd1fcad95ea0e04a0bdde90d326e54fb92 diff --git a/schemes/tcpd/Cargo.toml b/schemes/tcpd/Cargo.toml index d0f5a10..f4e7c5b 100644 --- a/schemes/tcpd/Cargo.toml +++ b/schemes/tcpd/Cargo.toml @@ -5,8 +5,8 @@ version = "0.1.0" [dependencies] event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } -rand = { git = "https://github.com/redox-os/rand.git", branch = "redox" } +rand = { git = "https://github.com/rust-lang-nursery/rand.git" } redox_syscall = { path = "../../syscall/" } [replace] -"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" } +"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/schemes/udpd/Cargo.toml b/schemes/udpd/Cargo.toml index 8af18b4..67ef8fc 100644 --- a/schemes/udpd/Cargo.toml +++ b/schemes/udpd/Cargo.toml @@ -5,8 +5,8 @@ version = "0.1.0" [dependencies] event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } -rand = { git = "https://github.com/redox-os/rand.git", branch = "redox" } +rand = { git = "https://github.com/rust-lang-nursery/rand.git" } redox_syscall = { path = "../../syscall/" } [replace] -"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" } +"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" }