update openssl-sys, drop rustup experiment
Ximin Luo
4 years ago
|
0 |
rust-openssl-sys (0.9.55-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
|
|
1 |
|
|
2 |
* Team upload.
|
|
3 |
* Package openssl-sys 0.9.55 from crates.io using debcargo 2.4.2
|
|
4 |
* Fix autopkgtest, don't attempt to find removed vendored openssl.
|
|
5 |
|
|
6 |
-- Ximin Luo <infinity0@debian.org> Tue, 21 Apr 2020 20:52:07 +0100
|
|
7 |
|
| 0 | 8 |
rust-openssl-sys (0.9.55-1) unstable; urgency=medium
|
| 1 | 9 |
|
| 2 | 10 |
* Team upload.
|
| 0 | 0 |
--- a/Cargo.toml
|
| 1 | 1 |
+++ b/Cargo.toml
|
| 2 | |
@@ -21,14 +21,11 @@
|
|
2 |
@@ -31,14 +31,11 @@
|
| 3 | 3 |
[build-dependencies.cc]
|
| 4 | 4 |
version = "1.0"
|
| 5 | 5 |
|
|
| 15 | 15 |
+openssl-src = []
|
| 16 | 16 |
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
|
| 17 | 17 |
version = "0.2.8"
|
|
18 |
--- a/build/main.rs
|
|
19 |
+++ b/build/main.rs
|
|
20 |
@@ -1,6 +1,6 @@
|
|
21 |
extern crate autocfg;
|
|
22 |
extern crate cc;
|
|
23 |
-#[cfg(feature = "vendored")]
|
|
24 |
+#[cfg(feature = "vendored_debian_disabled")]
|
|
25 |
extern crate openssl_src;
|
|
26 |
extern crate pkg_config;
|
|
27 |
#[cfg(target_env = "msvc")]
|
|
28 |
@@ -14,7 +14,7 @@
|
|
29 |
mod cfgs;
|
|
30 |
|
|
31 |
mod find_normal;
|
|
32 |
-#[cfg(feature = "vendored")]
|
|
33 |
+#[cfg(feature = "vendored_debian_disabled")]
|
|
34 |
mod find_vendored;
|
|
35 |
|
|
36 |
enum Version {
|
|
37 |
@@ -42,7 +42,7 @@
|
|
38 |
}
|
|
39 |
|
|
40 |
fn find_openssl(target: &str) -> (PathBuf, PathBuf) {
|
|
41 |
- #[cfg(feature = "vendored")]
|
|
42 |
+ #[cfg(feature = "vendored_debian_disabled")]
|
|
43 |
{
|
|
44 |
// vendor if the feature is present, unless
|
|
45 |
// OPENSSL_NO_VENDOR exists and isn't `0`
|
src/rustup-1.12.1/debian/debcargo.toml
less
more
| 0 | |
overlay = "."
|
| 1 | |
uploaders = ["Ximin Luo <infinity0@debian.org>"]
|
src/rustup-1.21.1/debian/debcargo.toml
less
more
| 0 | |
overlay = "."
|
| 1 | |
uploaders = ["Ximin Luo <infinity0@debian.org>"]
|