diff --git a/Cargo.lock b/Cargo.lock index 786227566f..3400b3bcc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ "plain", "redox-daemon", "redox-log", - "redox_syscall", + "redox_syscall 0.3.0", "thiserror", ] @@ -28,7 +28,7 @@ dependencies = [ "partitionlib", "redox-daemon", "redox-log", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -39,7 +39,7 @@ dependencies = [ "netutils", "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -109,7 +109,7 @@ version = "0.1.0" dependencies = [ "orbclient", "redox-daemon", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -293,7 +293,7 @@ dependencies = [ "netutils", "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -461,7 +461,7 @@ dependencies = [ "redox-daemon", "redox-log", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", "spin", ] @@ -497,7 +497,7 @@ dependencies = [ "netutils", "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -623,7 +623,7 @@ dependencies = [ [[package]] name = "netutils" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/netutils.git?branch=redox-unix#a55df137538fabadea2eff74153ac0b8d3ce3dcf" +source = "git+https://gitlab.redox-os.org/redox-os/netutils.git?branch=redox-unix#34d1ec9c2e9f7904b57547ca16d4c3145c109880" dependencies = [ "arg_parser", "extra", @@ -632,8 +632,9 @@ dependencies = [ "net2", "ntpclient", "pbr", + "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.2.16", "redox_termios", "termion", "url", @@ -704,7 +705,7 @@ dependencies = [ "pcid", "redox-daemon", "redox-log", - "redox_syscall", + "redox_syscall 0.3.0", "smallvec 1.9.0", ] @@ -721,7 +722,7 @@ source = "git+https://gitlab.redox-os.org/redox-os/orbclient.git#192dc30edbad43e dependencies = [ "libc", "raw-window-handle 0.3.4", - "redox_syscall", + "redox_syscall 0.2.16", "sdl2", "sdl2-sys", "wasm-bindgen", @@ -779,7 +780,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec 1.9.0", "winapi 0.3.9", ] @@ -845,7 +846,7 @@ dependencies = [ "paw", "plain", "redox-log", - "redox_syscall", + "redox_syscall 0.3.0", "serde", "serde_json", "smallvec 1.9.0", @@ -859,7 +860,7 @@ name = "pcspkrd" version = "0.1.0" dependencies = [ "redox-daemon", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -926,7 +927,7 @@ dependencies = [ "bitflags", "orbclient", "redox-daemon", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -1102,7 +1103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e31c834277709c7ff3eb74959fe62be4b45b1189ba9d41fd3744cd3a9c554f" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.2.16", ] [[package]] @@ -1120,15 +1121,25 @@ dependencies = [ [[package]] name = "redox_event" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/event.git#228eb0719c4424357012c6aad71cf26976048990" +source = "git+https://gitlab.redox-os.org/redox-os/event.git#f7db3d25ca5e282c12ded12bf6c720087b570132" dependencies = [ - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] name = "redox_syscall" version = "0.2.16" -source = "git+https://gitlab.redox-os.org/4lDO2/syscall.git?branch=userspace_fexec#d6af266119e7b4a3b0e9a04c63b3cfcfac94781a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8ce969b6629faa6f60a71f84022b0217e5ca8bcaeb6d11654506a55ebf8fed" dependencies = [ "bitflags", ] @@ -1139,7 +1150,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" dependencies = [ - "redox_syscall", + "redox_syscall 0.2.16", ] [[package]] @@ -1150,7 +1161,7 @@ dependencies = [ "netutils", "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -1362,7 +1373,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall", + "redox_syscall 0.2.16", "redox_termios", ] @@ -1501,7 +1512,7 @@ dependencies = [ "base64", "plain", "redox-daemon", - "redox_syscall", + "redox_syscall 0.3.0", "thiserror", "xhcid", ] @@ -1534,7 +1545,7 @@ dependencies = [ "orbclient", "redox-daemon", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", ] [[package]] @@ -1562,7 +1573,7 @@ dependencies = [ "orbclient", "ransid", "redox-daemon", - "redox_syscall", + "redox_syscall 0.3.0", "rusttype", ] @@ -1704,7 +1715,7 @@ dependencies = [ "redox-daemon", "redox-log", "redox_event", - "redox_syscall", + "redox_syscall 0.3.0", "serde", "serde_json", "smallvec 1.9.0", diff --git a/Cargo.toml b/Cargo.toml index 48733bd4e9..8078a99e90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,4 +25,3 @@ members = [ mio = { git = "https://gitlab.redox-os.org/redox-os/mio.git", branch = "redox-unix" } net2 = { git = "https://gitlab.redox-os.org/redox-os/net2-rs.git", branch = "master" } orbclient = { git = "https://gitlab.redox-os.org/redox-os/orbclient.git", version = "0.3.28" } -redox_syscall = { git = "https://gitlab.redox-os.org/4lDO2/syscall.git", branch = "userspace_fexec" } diff --git a/acpid/Cargo.toml b/acpid/Cargo.toml index 0cdb909538..ccabe47a7b 100644 --- a/acpid/Cargo.toml +++ b/acpid/Cargo.toml @@ -14,5 +14,5 @@ parking_lot = "0.11.1" plain = "0.2.3" redox-daemon = "0.1" redox-log = "0.1.1" -redox_syscall = "0.2.16" +redox_syscall = "0.3" thiserror = "1" diff --git a/ahcid/Cargo.toml b/ahcid/Cargo.toml index f8eaa7afde..bb62d6da12 100644 --- a/ahcid/Cargo.toml +++ b/ahcid/Cargo.toml @@ -10,5 +10,5 @@ log = "0.4" partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" } redox-daemon = "0.1" redox-log = "0.1" -redox_syscall = { git = "https://gitlab.redox-os.org/4lDO2/syscall.git", branch = "userspace_fexec" } +redox_syscall = "0.3" block-io-wrapper = { path = "../block-io-wrapper" } diff --git a/alxd/Cargo.toml b/alxd/Cargo.toml index 4064bea456..4d1a83dce0 100644 --- a/alxd/Cargo.toml +++ b/alxd/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" bitflags = "1" netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git", branch = "redox-unix" } redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/bgad/Cargo.toml b/bgad/Cargo.toml index f4ef93efa3..b5ff6b4d6b 100644 --- a/bgad/Cargo.toml +++ b/bgad/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] orbclient = "0.3.27" redox-daemon = "0.1" -redox_syscall = "0.2.12" +redox_syscall = "0.3" diff --git a/e1000d/Cargo.toml b/e1000d/Cargo.toml index 4d558ff412..c7d5abaacd 100644 --- a/e1000d/Cargo.toml +++ b/e1000d/Cargo.toml @@ -8,4 +8,4 @@ bitflags = "1" netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git", branch = "redox-unix" } redox-daemon = "0.1" redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" diff --git a/ihdad/Cargo.toml b/ihdad/Cargo.toml index b43f31e321..f30d2fae70 100755 --- a/ihdad/Cargo.toml +++ b/ihdad/Cargo.toml @@ -9,5 +9,5 @@ log = "0.4" redox-daemon = "0.1" redox-log = "0.1" redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" spin = "0.9" diff --git a/ixgbed/Cargo.toml b/ixgbed/Cargo.toml index 73a9a39d47..1884d76457 100644 --- a/ixgbed/Cargo.toml +++ b/ixgbed/Cargo.toml @@ -6,5 +6,5 @@ version = "1.0.0" bitflags = "1.0" netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git", branch = "redox-unix" } redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/nvmed/Cargo.toml b/nvmed/Cargo.toml index 1ce0b956b7..af7288f810 100644 --- a/nvmed/Cargo.toml +++ b/nvmed/Cargo.toml @@ -11,7 +11,7 @@ futures = "0.3" log = "0.4" redox-daemon = "0.1" redox-log = "0.1" -redox_syscall = "0.2.12" +redox_syscall = "0.3" partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" } smallvec = "1" block-io-wrapper = { path = "../block-io-wrapper" } diff --git a/pcid/Cargo.toml b/pcid/Cargo.toml index 3be59750c2..20276cb043 100644 --- a/pcid/Cargo.toml +++ b/pcid/Cargo.toml @@ -20,7 +20,7 @@ log = "0.4" paw = "1.0" plain = "0.2" redox-log = "0.1" -redox_syscall = "0.2.12" +redox_syscall = "0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" smallvec = "1" diff --git a/pcspkrd/Cargo.toml b/pcspkrd/Cargo.toml index 1d7b6ce8d9..7d2adf41d6 100644 --- a/pcspkrd/Cargo.toml +++ b/pcspkrd/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Tibor Nagy "] edition = "2018" [dependencies] -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/ps2d/Cargo.toml b/ps2d/Cargo.toml index b6af7bbd37..ce05723671 100644 --- a/ps2d/Cargo.toml +++ b/ps2d/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] bitflags = "1" orbclient = "0.3.27" -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/rtl8168d/Cargo.toml b/rtl8168d/Cargo.toml index f0c3c47b5a..0bd706fa07 100644 --- a/rtl8168d/Cargo.toml +++ b/rtl8168d/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" bitflags = "1" netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git", branch = "redox-unix" } redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/usbscsid/Cargo.toml b/usbscsid/Cargo.toml index 1cc137ecad..a1ed05126f 100644 --- a/usbscsid/Cargo.toml +++ b/usbscsid/Cargo.toml @@ -11,6 +11,6 @@ license = "MIT" base64 = "0.11" # Only for debugging plain = "0.2" redox-daemon = "0.1" -redox_syscall = "0.2.12" +redox_syscall = "0.3" thiserror = "1" xhcid = { path = "../xhcid" } diff --git a/vboxd/Cargo.toml b/vboxd/Cargo.toml index 43cea1e68d..601f88ece6 100644 --- a/vboxd/Cargo.toml +++ b/vboxd/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] orbclient = "0.3.27" redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" diff --git a/vesad/Cargo.toml b/vesad/Cargo.toml index 8f4b457d3c..a77d65c2e6 100644 --- a/vesad/Cargo.toml +++ b/vesad/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" orbclient = "0.3.27" ransid = "0.4" rusttype = { version = "0.2", optional = true } -redox_syscall = "0.2.12" +redox_syscall = "0.3" redox-daemon = "0.1" [features] diff --git a/xhcid/Cargo.toml b/xhcid/Cargo.toml index d9112921c3..a8d6a799f5 100644 --- a/xhcid/Cargo.toml +++ b/xhcid/Cargo.toml @@ -22,7 +22,7 @@ log = "0.4" redox-daemon = "0.1" redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" } redox-log = "0.1" -redox_syscall = "0.2.12" +redox_syscall = "0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" smallvec = { version = "1", features = ["serde"] }