Drop openssl fork, move to rust 2021 edition

The openssl-sys crate now natively supports openssl 3 on the master
branch, although there doesn't seem to be a release containing it yet.
This commit is contained in:
2021-10-30 16:13:38 +01:00
parent fd321e02d8
commit 039807bb32
3 changed files with 142 additions and 134 deletions

View File

@@ -2,6 +2,8 @@
name = "purple-plugin-delta"
version = "0.1.0"
authors = ["Nick Thomas <delta@ur.gs>"]
rust-version = "1.56"
edition = "2021"
[lib]
name = "purple_delta"
@@ -9,9 +11,8 @@ path = "src/lib.rs"
crate-type = ["dylib"]
[dependencies]
openssl = "0.10.36"
openssl-src = "300.0.0"
deltachat = { git = "https://github.com/deltachat/deltachat-core-rust", tag = "1.60.0" }
openssl = "*"
deltachat = { git = "https://github.com/deltachat/deltachat-core-rust", tag = "1.61.0" }
lazy_static = "*"
log = "*"
purple-rs = { git = "https://github.com/Flared/purple-rs", branch = "master" }
@@ -19,12 +20,11 @@ purple-rs = { git = "https://github.com/Flared/purple-rs", branch = "master" }
## Keep in sync with deltachat-core-rust ##
[dependencies.async-std]
version = "~1.9"
version = "1"
features = ["unstable"]
[profile.release]
lto = true
[patch.crates-io]
openssl-sys = { git = "https://github.com/lupine/rust-openssl", branch = "upgrade-openssl-3" }
openssl-src = { git = "https://github.com/lupine/openssl-src-rs", branch = "upgrade-openssl-3" }
openssl-sys = { git = "https://github.com/sfackler/rust-openssl", branch = "master" }