Merge pull request #322 from cea-sec/dependabot/cargo/env_logger-0.11.0

build(deps): bump env_logger from 0.10.2 to 0.11.0
cea-sec · Jan 24, 2024 · b78ca22 · b78ca22
2 parents cd53269 + c300b14
commit b78ca22
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/usbsas-analyzer-server/Cargo.toml b/usbsas-analyzer-server/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0"
 actix-files = "0.6"
 actix-web = "4.4"
 clap = "4.4"
-env_logger = "0.10"
+env_logger = "0.11"
 futures = "0.3"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/usbsas-cmdexec/Cargo.toml b/usbsas-cmdexec/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0"
 
 [dependencies]
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-dev2scsi/Cargo.toml b/usbsas-dev2scsi/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 [dependencies]
 bootsector = "0.2"
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-files2fs/Cargo.toml b/usbsas-files2fs/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0"
 
 [dependencies]
 bitvec = "1.0"
-env_logger = "0.10"
+env_logger = "0.11"
 fscommon = { git = "https://github.com/rafalh/rust-fscommon", rev = "89706258032efff88689f6083510ed34b845fe46" }
 log = "0.4"
 thiserror = "1.0"

diff --git a/usbsas-files2tar/Cargo.toml b/usbsas-files2tar/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 tar = "0.4"
 thiserror = "1.0"

diff --git a/usbsas-filter/Cargo.toml b/usbsas-filter/Cargo.toml
@@ -9,7 +9,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.8"
 
 [dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-fs2dev/Cargo.toml b/usbsas-fs2dev/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 [dependencies]
 bitvec = "1.0"
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-hid/hid-dealer/Cargo.toml b/usbsas-hid/hid-dealer/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0"
 description = "usbsas userland HID manager"
 
 [dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 dbus-crossroads = "0.5"
 dbus = "0.9"

diff --git a/usbsas-hid/hid-user/Cargo.toml b/usbsas-hid/hid-user/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 
 [dependencies]
 bitfield = "0.14"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 rusb = { version = "0.9", features = ["vendored"] }
 usbsas-sandbox = { path = "../../usbsas-sandbox" }

diff --git a/usbsas-identificator/Cargo.toml b/usbsas-identificator/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-net/Cargo.toml b/usbsas-net/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 [dependencies]
 base64 = { version = "0.21", optional = true }
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 libgssapi = { version = "0.7", optional = true }
 log = "0.4"
 reqwest = { version = "0.11", features = ["blocking", "json", "gzip"] }

diff --git a/usbsas-sandbox/src/seccomp.rs b/usbsas-sandbox/src/seccomp.rs
@@ -52,6 +52,16 @@ pub(crate) fn new_context_with_common_rules(
         &[Comparator::new(0, Cmp::Eq, 2, None)],
     )?;
 
+    // Allow ioctl(2, TCGETS, ..), needed by env_logger >= 0.11
+    ctx.set_rule_for_syscall(
+        Action::Allow,
+        Syscall::ioctl,
+        &[
+            Comparator::new(0, Cmp::Eq, 2, None),
+            Comparator::new(1, Cmp::Eq, libc::TCGETS, None),
+        ],
+    )?;
+
     // Allow mmap (for NULL addr only)
     ctx.set_rule_for_syscall(
         Action::Allow,

diff --git a/usbsas-scsi2files/Cargo.toml b/usbsas-scsi2files/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0"
 
 [dependencies]
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }

diff --git a/usbsas-tar2files/Cargo.toml b/usbsas-tar2files/Cargo.toml
@@ -6,7 +6,7 @@ license = "GPL-3.0"
 
 [dependencies]
 byteorder = "1.5"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 tar = "0.4"
 thiserror = "1.0"

diff --git a/usbsas-tools/Cargo.toml b/usbsas-tools/Cargo.toml
@@ -8,7 +8,7 @@ description = "usbsas tools"
 [dependencies]
 bitvec = { version = "1.0", optional = true }
 clap = "4.4"
-env_logger = "0.10"
+env_logger = "0.11"
 fuse_mt = { version = "0.6", optional = true }
 indicatif = { version = "0.17", optional = true }
 libc = { version = "0.2", optional = true }

diff --git a/usbsas-usbdev/Cargo.toml b/usbsas-usbdev/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 mio = { version = "0.8", features = ["os-ext"] }
 thiserror = "1.0"

diff --git a/usbsas-utils/Cargo.toml b/usbsas-utils/Cargo.toml
@@ -9,7 +9,7 @@ toml = "0.8"
 
 [dependencies]
 clap = "4.4"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"
 serde_json = { version = "1.0", optional = true }
 thiserror = { version = "1.0", optional = true }