diff --git a/Cargo.lock b/Cargo.lock index 3fcaa695..e97edbe7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1770,7 +1770,7 @@ dependencies = [ [[package]] name = "hbbs" -version = "1.1.99-15" +version = "1.1.99-16" dependencies = [ "async-speed-limit", "async-trait", @@ -1988,7 +1988,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2663,7 +2663,7 @@ dependencies = [ [[package]] name = "oauth2" version = "0.1.0" -source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#de41e4063574851a346c9c6a94d581a6cd49ec29" +source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#4b93f1636141d8145fc0d049517445b43f5548c4" dependencies = [ "base64 0.22.1", "log", @@ -3609,7 +3609,7 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "s3software" version = "0.1.0" -source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#de41e4063574851a346c9c6a94d581a6cd49ec29" +source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#4b93f1636141d8145fc0d049517445b43f5548c4" dependencies = [ "aws-config", "aws-sdk-s3", @@ -3687,7 +3687,7 @@ dependencies = [ [[package]] name = "sctgdesk-api-server" version = "0.1.0" -source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#de41e4063574851a346c9c6a94d581a6cd49ec29" +source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#4b93f1636141d8145fc0d049517445b43f5548c4" dependencies = [ "base64 0.22.1", "bcrypt", @@ -4089,7 +4089,7 @@ dependencies = [ [[package]] name = "state" version = "0.1.0" -source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#de41e4063574851a346c9c6a94d581a6cd49ec29" +source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#4b93f1636141d8145fc0d049517445b43f5548c4" dependencies = [ "base64 0.22.1", "bcrypt", @@ -4823,7 +4823,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utils" version = "0.1.0" -source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#de41e4063574851a346c9c6a94d581a6cd49ec29" +source = "git+https://github.com/sctg-development/sctgdesk-api-server.git?branch=main#4b93f1636141d8145fc0d049517445b43f5548c4" dependencies = [ "base64 0.22.1", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 95421778..8f5ebd86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hbbs" -version = "1.1.99-15" +version = "1.1.99-16" authors = ["rustdesk <info@rustdesk.com>", "sctg <sctgdesk@k-cloud.pp.ua>"] edition = "2021" build = "build.rs" diff --git a/Dockerfile-integration b/Dockerfile-integration index 86c72e52..063cd1eb 100644 --- a/Dockerfile-integration +++ b/Dockerfile-integration @@ -8,7 +8,9 @@ COPY Cargo.toml /build/Cargo.toml COPY Cargo.lock /build/Cargo.lock COPY build.rs /build/build.rs COPY db_v2.sqlite3 /build/db_v2.sqlite3 -RUN . /root/.cargo/env && cd /build && DATABASE_URL=sqlite://$(pwd)/db_v2.sqlite3 cargo build --release +RUN . /root/.cargo/env && cd /build \ + && cargo update -p sctgdesk-api-server \ + && DATABASE_URL=sqlite://$(pwd)/db_v2.sqlite3 cargo build --release RUN mkdir -p /build/ubuntu-jammy/bin \ && cp /build/target/release/hbbr /build/ubuntu-jammy/bin/ \ && cp /build/target/release/hbbs /build/ubuntu-jammy/bin/ \ diff --git a/debian/changelog b/debian/changelog index bae41b82..1c1ee6f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +rustdesk-server (1.1.99-16) UNRELEASED; urgency=low + + * uodate sctgdesk-api-server + rustdesk-server (1.1.99-15) UNRELEASED; urgency=low * oauth: add support for github diff --git a/src/common.rs b/src/common.rs index 2045177e..bf8e5b67 100644 --- a/src/common.rs +++ b/src/common.rs @@ -57,7 +57,7 @@ fn arg_name(name: &str) -> String { pub fn init_args(args: &str, name: &str, about: &str) { let matches = App::new(name) .version(crate::version::VERSION) - .author("Purslane Ltd. <info@rustdesk.com>") + .author("Purslane Ltd. <info@rustdesk.com>, SCTG Development <info@sctg.eu.org>") .about(about) .args_from_usage(args) .get_matches();