update to proxmox split and bump version to 0.8.0-1

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Cargo.toml b/Cargo.toml
index a86ee1c4e5120c45f156c9c68bfc160524be3a66..c79bc7b2db9bcfd16578f10e34cd40cfe8e49270 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proxmox-openid"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Dietmar Maurer <dietmar@proxmox.com>"]
 edition = "2018"
 license = "AGPL-3"
@@ -16,11 +16,13 @@ path = "src/lib.rs"
 
 [dependencies]
 anyhow = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-url = "2.1"
-http = "0.2"
 curl = { version = "0.4.33" }
-proxmox = { version = "0.13.0",  default-features = false }
+http = "0.2"
 nix = "0.19.1"
 openidconnect = { version = "2.0", default-features = false, features = ["curl"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+url = "2.1"
+
+proxmox = "0.14.0"
+proxmox-time = "1"

diff --git a/debian/changelog b/debian/changelog
index 328dfe8e0382a7a0bf10b9129dfcffb47d87b8bc..21a363c073e897a455fc18ea480718126f35c478 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rust-proxmox-openid (0.8.0-1) unstable; urgency=medium
+
+  * update to proxmox crate split
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Oct 2021 12:19:55 +0200
+
 rust-proxmox-openid (0.7.0-1) unstable; urgency=medium
 
   * bump proxmox to 0.13.0

diff --git a/debian/control b/debian/control
index bee537a0ebff8955bea4b23f4b2bcc61fd80cdf6..9e53c8da4eeed3222f6dc526df5f06253535b549 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 12),
  librust-http-0.2+default-dev <!nocheck>,
  librust-nix-0.19+default-dev (>= 0.19.1-~~) <!nocheck>,
  librust-openidconnect-2+curl-dev <!nocheck>,
- librust-proxmox-0.13-dev <!nocheck>,
+ librust-proxmox-0.14+default-dev <!nocheck>,
+ librust-proxmox-time-1+default-dev <!nocheck>,
  librust-serde-1+default-dev <!nocheck>,
  librust-serde-1+derive-dev <!nocheck>,
  librust-serde-json-1+default-dev <!nocheck>,
@@ -32,7 +33,8 @@ Depends:
  librust-http-0.2+default-dev,
  librust-nix-0.19+default-dev (>= 0.19.1-~~),
  librust-openidconnect-2+curl-dev,
- librust-proxmox-0.13-dev,
+ librust-proxmox-0.14+default-dev,
+ librust-proxmox-time-1+default-dev,
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
@@ -41,10 +43,10 @@ Provides:
  librust-proxmox-openid+default-dev (= ${binary:Version}),
  librust-proxmox-openid-0-dev (= ${binary:Version}),
  librust-proxmox-openid-0+default-dev (= ${binary:Version}),
- librust-proxmox-openid-0.7-dev (= ${binary:Version}),
- librust-proxmox-openid-0.7+default-dev (= ${binary:Version}),
- librust-proxmox-openid-0.7.0-dev (= ${binary:Version}),
- librust-proxmox-openid-0.7.0+default-dev (= ${binary:Version})
+ librust-proxmox-openid-0.8-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.8+default-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.8.0-dev (= ${binary:Version}),
+ librust-proxmox-openid-0.8.0+default-dev (= ${binary:Version})
 Description: Rust crate "proxmox-openid" - Rust source code
  This package contains the source for the Rust proxmox-openid crate, packaged by
  debcargo for use with cargo and dh-cargo.

diff --git a/src/auth_state.rs b/src/auth_state.rs
index 318931b122067f78f58ac725c4f36dc73a18c317..dcf564d25ff83d70c54b8549ded1b14a73121c15 100644 (file)
--- a/src/auth_state.rs
+++ b/src/auth_state.rs
@@ -4,7 +4,6 @@ use anyhow::{bail, Error};
 use serde_json::{json, Value};
 
 use proxmox::tools::{
-    time::epoch_i64,
     fs::{
         replace_file,
         open_file_locked,
@@ -12,6 +11,7 @@ use proxmox::tools::{
         CreateOptions,
     },
 };
+use proxmox_time::epoch_i64;
 
 use super::{PublicAuthState, PrivateAuthState};
 

diff --git a/src/lib.rs b/src/lib.rs
index 72bcd317b6279d75d6e6e598561a0fd54df76803..34c74c909ce8cd5cf955ad9b21f8a1d6d7b8ad61 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -71,7 +71,7 @@ impl PrivateAuthState {
             csrf_token,
             nonce,
             pkce_verifier,
-            ctime: proxmox::tools::time::epoch_i64(),
+            ctime: proxmox_time::epoch_i64(),
         }
     }