Codebase list rust-stfu8 / 15e9ba3
Update more cargo deps Ximin Luo 4 years ago
19 changed file(s) with 198 addition(s) and 242 deletion(s). Raw diff Collapse all Expand all
0 rust-curl (0.4.25-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package curl 0.4.25 from crates.io using debcargo 2.4.0
4
5 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:04:26 +0000
6
07 rust-curl (0.4.22-2) unstable; urgency=medium
18
29 * Team upload.
+0
-1
src/curl/debian/patches/series less more
0 winapi3.patch
+0
-67
src/curl/debian/patches/winapi3.patch less more
0 --- a/Cargo.toml
1 +++ b/Cargo.toml
2 @@ -54,13 +54,12 @@
3 [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
4 version = "0.9.43"
5 optional = true
6 -[target."cfg(target_env = \"msvc\")".dependencies.kernel32-sys]
7 -version = "0.2.2"
8
9 [target."cfg(target_env = \"msvc\")".dependencies.schannel]
10 version = "0.1.13"
11 [target."cfg(windows)".dependencies.winapi]
12 -version = "0.2.7"
13 +version = "0.3"
14 +features = ["winsock2", "wincrypt", "libloaderapi"]
15 [badges.appveyor]
16 repository = "alexcrichton/curl-rust"
17
18 --- a/src/easy/windows.rs
19 +++ b/src/easy/windows.rs
20 @@ -4,21 +4,21 @@
21
22 #[cfg(target_env = "msvc")]
23 mod win {
24 - use kernel32;
25 use schannel::cert_context::ValidUses;
26 use schannel::cert_store::CertStore;
27 use std::ffi::CString;
28 use std::mem;
29 use std::ptr;
30 use winapi::{self, c_int, c_long, c_uchar, c_void};
31 + use winapi::um::libloaderapi::{GetModuleHandleW, GetProcAddress};
32
33 fn lookup(module: &str, symbol: &str) -> Option<*const c_void> {
34 unsafe {
35 let symbol = CString::new(symbol).unwrap();
36 let mut mod_buf: Vec<u16> = module.encode_utf16().collect();
37 mod_buf.push(0);
38 - let handle = kernel32::GetModuleHandleW(mod_buf.as_mut_ptr());
39 - let n = kernel32::GetProcAddress(handle, symbol.as_ptr());
40 + let handle = GetModuleHandleW(mod_buf.as_mut_ptr());
41 + let n = GetProcAddress(handle, symbol.as_ptr());
42 if n == ptr::null() {
43 None
44 } else {
45 --- a/src/lib.rs
46 +++ b/src/lib.rs
47 @@ -63,8 +63,6 @@
48 extern crate winapi;
49
50 #[cfg(target_env = "msvc")]
51 -extern crate kernel32;
52 -#[cfg(target_env = "msvc")]
53 extern crate schannel;
54
55 use std::ffi::CStr;
56 --- a/src/multi.rs
57 +++ b/src/multi.rs
58 @@ -10,7 +10,7 @@
59 #[cfg(unix)]
60 use libc::{fd_set, pollfd, POLLIN, POLLOUT, POLLPRI};
61 #[cfg(windows)]
62 -use winapi::winsock2::fd_set;
63 +use winapi::um::winsock2::fd_set;
64
65 use easy::{Easy, Easy2};
66 use panic;
0 rust-flate2 (1.0.13-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package flate2 1.0.13 from crates.io using debcargo 2.4.0
4
5 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:09:39 +0000
6
07 rust-flate2 (1.0.9-1) unstable; urgency=medium
18
29 * Package flate2 1.0.9 from crates.io using debcargo 2.2.10
00 --- a/Cargo.toml
11 +++ b/Cargo.toml
2 @@ -36,15 +36,6 @@
3 version = "1.0"
2 @@ -40,10 +40,6 @@
3 version = "1.0.25"
44 optional = true
55
66 -[dependencies.miniz-sys]
77 -version = "0.1.11"
88 -optional = true
99 -
10 -[dependencies.miniz_oxide_c_api]
11 -version = "0.2"
12 -features = ["no_c_export"]
13 -optional = true
14 -
15 [dependencies.tokio-io]
16 version = "0.1.11"
10 [dependencies.miniz_oxide]
11 version = "0.3.5"
1712 optional = true
18 @@ -68,13 +59,12 @@
19 version = "0.1.10"
20
13 @@ -73,6 +69,7 @@
2114 [features]
22 -default = ["miniz-sys"]
23 -rust_backend = ["miniz_oxide_c_api"]
24 +default = ["zlib"]
15 default = ["rust_backend"]
16 rust_backend = ["miniz_oxide"]
2517 +miniz-sys = ["zlib"]
26 +miniz_oxide_c_api = ["zlib"]
27 +rust_backend = ["zlib"]
2818 tokio = ["tokio-io", "futures"]
2919 zlib = ["libz-sys"]
30 -[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide_c_api]
31 -version = "0.2"
32 -features = ["no_c_export"]
33 [badges.appveyor]
34 repository = "alexcrichton/flate2-rs"
35
20 [target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide]
0 rust-libssh2-sys (0.2.13-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Package libssh2-sys 0.2.13 from crates.io using debcargo 2.4.0
3
4 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:21:57 +0000
5
06 rust-libssh2-sys (0.2.11-1) unstable; urgency=medium
17
28 * Team upload.
00 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
11 Upstream-Name: libssh2-sys
2 Upstream-Contact: Alex Crichton <alex@alexcrichton.com>
2 Upstream-Contact:
3 Alex Crichton <alex@alexcrichton.com>
4 Wez Furlong <wez@wezfurlong.org>
35 Source: https://github.com/alexcrichton/ssh2-rs
46
57 Files: *
6 Copyright: 2014-2018 Alex Crichton <alex@alexcrichton.com>
8 Copyright:
9 2014-2019 Alex Crichton <alex@alexcrichton.com>
10 2014-2019 Wez Furlong <wez@wezfurlong.org>
711 License: MIT or Apache-2.0
812
913 Files: debian/*
1014 Copyright:
11 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
12 2018 Ximin Luo <infinity0@debian.org>
15 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
16 2018-2019 Ximin Luo <infinity0@debian.org>
1317 License: MIT or Apache-2.0
1418
1519 License: Apache-2.0
00 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
11 Upstream-Name: libssh2-sys
2 Upstream-Contact: Alex Crichton <alex@alexcrichton.com>
2 Upstream-Contact:
3 Alex Crichton <alex@alexcrichton.com>
4 Wez Furlong <wez@wezfurlong.org>
35 Source: https://github.com/alexcrichton/ssh2-rs
46
57 Files: *
6 Copyright: FIXME (overlay) UNKNOWN-YEARS Alex Crichton <alex@alexcrichton.com>
8 Copyright:
9 FIXME (overlay) UNKNOWN-YEARS Alex Crichton <alex@alexcrichton.com>
10 FIXME (overlay) UNKNOWN-YEARS Wez Furlong <wez@wezfurlong.org>
711 License: MIT or Apache-2.0
812 Comment:
913 FIXME (overlay): Since upstream copyright years are not available in
1317
1418 Files: debian/*
1519 Copyright:
16 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
17 2018 Ximin Luo <infinity0@debian.org>
20 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
21 2018-2019 Ximin Luo <infinity0@debian.org>
1822 License: MIT or Apache-2.0
1923
2024 License: Apache-2.0
0 Description: Use libssh2 from system by default
1 Author: Vasudev Kamath <vasudev@copyninja.info>
2 Bug: https://github.com/alexcrichton/ssh2-rs/issues/88
3 Forwarded: not-needed
4 Last-Update: 2018-07-28
5
6 Index: libssh2-sys/build.rs
7 ===================================================================
8 --- libssh2-sys.orig/build.rs
9 +++ libssh2-sys/build.rs
10 @@ -17,19 +17,20 @@ fn main() {
0 --- a/build.rs
1 +++ b/build.rs
2 @@ -17,7 +17,7 @@
113 // The system copy of libssh2 is not used by default because it
124 // can lead to having two copies of libssl loaded at once.
135 // See https://github.com/alexcrichton/ssh2-rs/pull/88
146 - if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
15 - if let Ok(lib) = pkg_config::find_library("libssh2") {
16 - for path in &lib.include_paths {
17 - println!("cargo:include={}", path.display());
18 - }
19 - return
20 + // if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
21 + if let Ok(lib) = pkg_config::find_library("libssh2") {
22 + for path in &lib.include_paths {
23 + println!("cargo:include={}", path.display());
7 + if true {
8 if let Ok(lib) = pkg_config::find_library("libssh2") {
9 for path in &lib.include_paths {
10 println!("cargo:include={}", path.display());
11 @@ -26,7 +26,7 @@
2412 }
25 + return;
2613 }
27 + // }
2814
2915 - if !Path::new("libssh2/.git").exists() {
30 - let _ = Command::new("git").args(&["submodule", "update", "--init"])
31 - .status();
32 - }
33 + // if !Path::new("libssh2/.git").exists() {
34 + // let _ = Command::new("git")
35 + // .args(&["submodule", "update", "--init"])
36 + // .status();
37 + // }
38
39 let target = env::var("TARGET").unwrap();
40 let dst = PathBuf::from(env::var_os("OUT_DIR").unwrap());
16 + if false {
17 let _ = Command::new("git")
18 .args(&["submodule", "update", "--init"])
19 .status();
0 rust-miniz-oxide (0.3.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Package miniz_oxide 0.3.5 from crates.io using debcargo 2.4.0
3
4 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:09:46 +0000
0 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1 Upstream-Name: miniz_oxide
2 Upstream-Contact:
3 Frommi <daniil.liferenko@gmail.com>
4 oyvindln <oyvindln@users.noreply.github.com>
5 Source: https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide
6
7 Files: *
8 Copyright:
9 2017-2019 Frommi <daniil.liferenko@gmail.com>
10 2017-2019 oyvindln <oyvindln@users.noreply.github.com>
11 License: MIT
12
13 Files: debian/*
14 Copyright:
15 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
16 2019 Ximin Luo <infinity0@debian.org>
17 License: MIT
18
19 License: MIT
20 Permission is hereby granted, free of charge, to any person obtaining a copy
21 of this software and associated documentation files (the "Software"), to deal
22 in the Software without restriction, including without limitation the rights
23 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
24 copies of the Software, and to permit persons to whom the Software is
25 furnished to do so, subject to the following conditions:
26 .
27 The above copyright notice and this permission notice shall be included in all
28 copies or substantial portions of the Software.
29 .
30 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36 SOFTWARE.
0 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1 Upstream-Name: miniz_oxide
2 Upstream-Contact:
3 Frommi <daniil.liferenko@gmail.com>
4 oyvindln <oyvindln@users.noreply.github.com>
5 Source: https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide
6
7 Files: *
8 Copyright:
9 FIXME (overlay) UNKNOWN-YEARS Frommi <daniil.liferenko@gmail.com>
10 FIXME (overlay) UNKNOWN-YEARS oyvindln <oyvindln@users.noreply.github.com>
11 License: MIT
12 Comment:
13 FIXME (overlay): Since upstream copyright years are not available in
14 Cargo.toml, they were extracted from the upstream Git repository. This may not
15 be correct information so you should review and fix this before uploading to
16 the archive.
17
18 Files: ./LICENSE
19 Copyright: 2017 Frommi
20 License: UNKNOWN-LICENSE; FIXME (overlay)
21 Comment:
22 FIXME (overlay): These notices are extracted from files. Please review them
23 before uploading to the archive.
24
25 Files: debian/*
26 Copyright:
27 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
28 2019 Ximin Luo <infinity0@debian.org>
29 License: MIT
30
31 License: MIT
32 Permission is hereby granted, free of charge, to any person obtaining a copy
33 of this software and associated documentation files (the "Software"), to deal
34 in the Software without restriction, including without limitation the rights
35 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
36 copies of the Software, and to permit persons to whom the Software is
37 furnished to do so, subject to the following conditions:
38 .
39 The above copyright notice and this permission notice shall be included in all
40 copies or substantial portions of the Software.
41 .
42 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
43 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
45 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
46 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
47 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
48 SOFTWARE.
0 overlay = "."
1 uploaders = ["Ximin Luo <infinity0@debian.org>"]
0 rust-pkg-config (0.3.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Package pkg-config 0.3.17 from crates.io using debcargo 2.4.0
3
4 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:17:50 +0000
5
06 rust-pkg-config (0.3.14-1) unstable; urgency=medium
17
28 * Team upload.
00 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
11 Upstream-Name: pkg-config
22 Upstream-Contact: Alex Crichton <alex@alexcrichton.com>
3 Source: https://github.com/alexcrichton/pkg-config-rs
3 Source: https://github.com/rust-lang/pkg-config-rs
44
55 Files: *
66 Copyright: FIXME (overlay) UNKNOWN-YEARS Alex Crichton <alex@alexcrichton.com>
2020
2121 Files: debian/*
2222 Copyright:
23 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24 2018 Ximin Luo <infinity0@debian.org>
23 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24 2018-2019 Ximin Luo <infinity0@debian.org>
2525 License: MIT or Apache-2.0
2626
2727 License: Apache-2.0
0 --- a/tests/test.rs
1 +++ b/tests/test.rs
2 @@ -34,7 +34,6 @@
3 pkg_config::probe_library(name)
4 }
5
6 -#[test]
7 fn cross_disabled() {
8 let _g = LOCK.lock();
9 reset();
10 @@ -46,7 +45,6 @@
11 }
12 }
13
14 -#[test]
15 fn cross_enabled() {
16 let _g = LOCK.lock();
17 reset();
018 --- a/src/lib.rs
119 +++ b/src/lib.rs
220 @@ -9,8 +9,6 @@
826 //! * `FOO_NO_PKG_CONFIG` - if set, this will disable running `pkg-config` when
927 //! probing for the library named `foo`.
1028 //!
11 @@ -81,7 +79,7 @@
29 @@ -344,17 +342,7 @@
1230
13 // Only use pkg-config in host == target situations by default (allowing an
14 // override).
15 - (host == target || env::var_os("PKG_CONFIG_ALLOW_CROSS").is_some())
16 + (host == target || true)
17 }
18
19 #[derive(Clone, Default)]
20 @@ -113,9 +111,8 @@
21 /// Contains the name of the responsible environment variable.
22 EnvNoPkgConfig(String),
23
24 - /// Cross compilation detected.
25 - ///
26 - /// Override with `PKG_CONFIG_ALLOW_CROSS=1`.
27 + /// Cross compilation detected. Kept for compatibility;
28 + /// the Debian package never emits this.
29 CrossCompilation,
30
31 /// Failed to run `pkg-config`.
32 @@ -137,13 +134,9 @@
33 fn description(&self) -> &str {
34 match *self {
35 Error::EnvNoPkgConfig(_) => "pkg-config requested to be aborted",
36 - Error::CrossCompilation => {
37 - "pkg-config doesn't handle cross compilation. \
38 - Use PKG_CONFIG_ALLOW_CROSS=1 to override"
31 // pkg-config may not be aware of cross-compilation, and require
32 // a wrapper script that sets up platform-specific prefixes.
33 - match self.targetted_env_var("PKG_CONFIG_ALLOW_CROSS") {
34 - // don't use pkg-config if explicitly disabled
35 - Ok(ref val) if val == "0" => false,
36 - Ok(_) => true,
37 - Err(_) => {
38 - // if not disabled, and pkg-config is customized,
39 - // then assume it's prepared for cross-compilation
40 - self.targetted_env_var("PKG_CONFIG").is_ok()
41 - || self.targetted_env_var("PKG_CONFIG_SYSROOT_DIR").is_ok()
3942 - }
40 Error::Command { .. } => "failed to run pkg-config",
41 Error::Failure { .. } => "pkg-config did not exit sucessfully",
42 - Error::__Nonexhaustive => panic!(),
43 + Error::CrossCompilation | Error::__Nonexhaustive => panic!(),
44 }
43 - }
44 + true
4545 }
4646
47 @@ -214,10 +207,6 @@
48 Error::EnvNoPkgConfig(ref name) => {
49 write!(f, "Aborted because {} is set", name)
50 }
51 - Error::CrossCompilation => {
52 - write!(f, "Cross compilation detected. \
53 - Use PKG_CONFIG_ALLOW_CROSS=1 to override")
54 - }
55 Error::Command { ref command, ref cause } => {
56 write!(f, "Failed to run `{}`: {}", command, cause)
57 }
58 @@ -233,7 +222,7 @@
59 }
60 Ok(())
61 }
62 - Error::__Nonexhaustive => panic!(),
63 + Error::CrossCompilation | Error::__Nonexhaustive => panic!(),
64 }
65 }
66 }
67 @@ -388,7 +377,11 @@
68 }
69
70 fn command(&self, name: &str, args: &[&str]) -> Command {
71 - let exe = self.env_var("PKG_CONFIG").unwrap_or_else(|_| String::from("pkg-config"));
72 + let exe = self.env_var("PKG_CONFIG").unwrap_or_else(|_| {
73 + self.env_var("DEB_HOST_GNU_TYPE")
74 + .map(|t| t.to_string() + "-pkg-config")
75 + .unwrap_or_else(|_| String::from("pkg-config"))
76 + });
77 let mut cmd = Command::new(exe);
78 if self.is_static(name) {
79 cmd.arg("--static");
80 --- a/tests/test.rs
81 +++ b/tests/test.rs
82 @@ -29,7 +29,6 @@
83 pkg_config::probe_library(name)
84 }
85
86 -#[test]
87 fn cross_disabled() {
88 let _g = LOCK.lock();
89 reset();
90 @@ -41,7 +40,6 @@
91 }
92 }
93
94 -#[test]
95 fn cross_enabled() {
96 let _g = LOCK.lock();
97 reset();
47 /// Deprecated in favor of the top level `get_variable` function
0 rust-typenum (1.11.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package typenum 1.11.2 from crates.io using debcargo 2.4.0
4
5 -- Ximin Luo <infinity0@debian.org> Thu, 28 Nov 2019 01:18:36 +0000
6
07 rust-typenum (1.10.0-3) unstable; urgency=medium
18
29 * Team upload.
+0
-23
src/typenum/debian/patches/pr115.patch less more
0 From 0d5196feadafa77c727f517d747ffcf3fd0e8ba9 Mon Sep 17 00:00:00 2001
1 From: Michael Hudson-Doyle <michael.hudson@canonical.com>
2 Date: Wed, 13 Mar 2019 15:55:30 +1300
3 Subject: [PATCH] round result of (highest as f64).log(2.0)
4
5 Even though (1024f64).log(2.0) has an exact, representable, value, with rustc 1.32 on i386 it comes out as +9.999999999999999985 with optimization enabled. And the rustc doesn't like having two defintions for U1024 etc.
6 ---
7 build/main.rs | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 diff --git a/build/main.rs b/build/main.rs
11 index 16b0ffe2f..b7939f993 100644
12 --- a/build/main.rs
13 +++ b/build/main.rs
14 @@ -81,7 +81,7 @@ pub fn no_std() {}
15 fn main() {
16 let highest: u64 = 1024;
17
18 - let first2: u32 = (highest as f64).log(2.0) as u32 + 1;
19 + let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1;
20 let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
21 let uints = (0..(highest + 1))
22 .chain((first2..64).map(|i| 2u64.pow(i)))
+0
-1
src/typenum/debian/patches/series less more
0 pr115.patch