Codebase list rust-stfu8 / 389dffe
miniz-oxide - update to 0.4.4 Peter Michael Green 2 years ago
6 changed file(s) with 147 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
+14
-0
src/miniz-oxide/debian/changelog less more
0 rust-miniz-oxide (0.4.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package miniz_oxide 0.4.4 from crates.io using debcargo 2.4.4
4 * Revert upstream switch from adler32 to adler crate as we do not currently
5 have the adler crate in Debian.
6 * Remove features that are only relavent when using the crate to build
7 the standard library and which depend on rustc-std-workspace-alloc which
8 is not in debian.
9 * Remove "compiler-builtins" feature, it fails to build and the ftpmasters
10 are rejecting new rust feature packages.
11
12 -- Peter Michael Green <plugwash@debian.org> Thu, 21 Oct 2021 15:21:27 +0000
13
014 rust-miniz-oxide (0.3.6-1) unstable; urgency=medium
115
216 * Team upload.
+39
-4
src/miniz-oxide/debian/copyright.debcargo.hint less more
88 Copyright:
99 FIXME (overlay) UNKNOWN-YEARS Frommi <daniil.liferenko@gmail.com>
1010 FIXME (overlay) UNKNOWN-YEARS oyvindln <oyvindln@users.noreply.github.com>
11 License: MIT
11 License: MIT or Zlib or Apache-2.0
1212 Comment:
1313 FIXME (overlay): Since upstream copyright years are not available in
1414 Cargo.toml, they were extracted from the upstream Git repository. This may not
2222 FIXME (overlay): These notices are extracted from files. Please review them
2323 before uploading to the archive.
2424
25 Files: ./LICENSE-MIT.md
26 Copyright: 2017 Frommi
27 License: UNKNOWN-LICENSE; FIXME (overlay)
28 Comment:
29 FIXME (overlay): These notices are extracted from files. Please review them
30 before uploading to the archive.
31
32 Files: ./LICENSE-ZLIB.md
33 Copyright: 2020 Frommi
34 License: UNKNOWN-LICENSE; FIXME (overlay)
35 Comment:
36 FIXME (overlay): These notices are extracted from files. Please review them
37 before uploading to the archive.
38
2539 Files: debian/*
2640 Copyright:
27 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
28 2019-2020 Ximin Luo <infinity0@debian.org>
29 License: MIT
41 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
42 2019-2021 Ximin Luo <infinity0@debian.org>
43 License: MIT or Zlib or Apache-2.0
44
45 License: Apache-2.0
46 Debian systems provide the Apache 2.0 license in
47 /usr/share/common-licenses/Apache-2.0
3048
3149 License: MIT
3250 Permission is hereby granted, free of charge, to any person obtaining a copy
4664 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
4765 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
4866 SOFTWARE.
67
68 License: Zlib
69 This software is provided 'as-is', without any express or implied
70 warranty. In no event will the authors be held liable for any damages
71 arising from the use of this software.
72 .
73 Permission is granted to anyone to use this software for any purpose,
74 including commercial applications, and to alter it and redistribute it
75 freely, subject to the following restrictions:
76 .
77 1. The origin of this software must not be misrepresented; you must not
78 claim that you wrote the original software. If you use this software
79 in a product, an acknowledgment in the product documentation would be
80 appreciated but is not required.
81 2. Altered source versions must be plainly marked as such, and must not be
82 misrepresented as being the original software.
83 3. This notice may not be removed or altered from any source distribution.
+18
-0
src/miniz-oxide/debian/patches/remove-compiler-builtins.patch less more
0 Description: remove compiler-builtins feature.
1 The feature fails to build and the ftpmasters are rejecting new rust
2 feature packages.
3 Author: Peter Michael Green <plugwash@debian.org>
4
5 --- rust-miniz-oxide-0.4.4.orig/Cargo.toml
6 +++ rust-miniz-oxide-0.4.4/Cargo.toml
7 @@ -32,10 +32,6 @@ name = "miniz_oxide"
8 version = "1.1.0"
9 default-features = false
10
11 -[dependencies.compiler_builtins]
12 -version = "0.1.2"
13 -optional = true
14 -
15 [build-dependencies.autocfg]
16 version = "1.0"
17
+27
-0
src/miniz-oxide/debian/patches/remove-rustc-dep-of-std-etc.patch less more
0 Index: rust-miniz-oxide-0.4.4/Cargo.toml
1 ===================================================================
2 --- rust-miniz-oxide-0.4.4.orig/Cargo.toml
3 +++ rust-miniz-oxide-0.4.4/Cargo.toml
4 @@ -32,22 +32,12 @@ name = "miniz_oxide"
5 version = "1.1.0"
6 default-features = false
7
8 -[dependencies.alloc]
9 -version = "1.0.0"
10 -optional = true
11 -package = "rustc-std-workspace-alloc"
12 -
13 [dependencies.compiler_builtins]
14 version = "0.1.2"
15 optional = true
16
17 -[dependencies.core]
18 -version = "1.0.0"
19 -optional = true
20 -package = "rustc-std-workspace-core"
21 [build-dependencies.autocfg]
22 version = "1.0"
23
24 [features]
25 no_extern_crate_alloc = []
26 -rustc-dep-of-std = ["core", "alloc", "compiler_builtins", "adler32/rustc-dep-of-std"]
+3
-0
src/miniz-oxide/debian/patches/series less more
0 use-adler32.patch
1 remove-rustc-dep-of-std-etc.patch
2 remove-compiler-builtins.patch
+46
-0
src/miniz-oxide/debian/patches/use-adler32.patch less more
0 Revert to using the adler32 crate as the adler crate is not in Debian.
1
2 Reverts https://github.com/Frommi/miniz_oxide/commit/ad0f8fef9c532720fb9603a0341ff7d176af2fc4
3
4 Index: miniz-oxide/src/shared.rs
5 ===================================================================
6 --- miniz-oxide.orig/src/shared.rs
7 +++ miniz-oxide/src/shared.rs
8 @@ -1,4 +1,4 @@
9 -use adler::Adler32;
10 +use adler32::RollingAdler32;
11
12 #[doc(hidden)]
13 pub const MZ_ADLER32_INIT: u32 = 1;
14 @@ -12,7 +12,7 @@ pub const HUFFMAN_LENGTH_ORDER: [u8; 19]
15
16 #[doc(hidden)]
17 pub fn update_adler32(adler: u32, data: &[u8]) -> u32 {
18 - let mut hash = Adler32::from_checksum(adler);
19 - hash.write_slice(data);
20 - hash.checksum()
21 + let mut hash = RollingAdler32::from_value(adler);
22 + hash.update_buffer(data);
23 + hash.hash()
24 }
25 Index: miniz-oxide/Cargo.toml
26 ===================================================================
27 --- miniz-oxide.orig/Cargo.toml
28 +++ miniz-oxide/Cargo.toml
29 @@ -28,8 +28,8 @@ repository = "https://github.com/Frommi/
30
31 [lib]
32 name = "miniz_oxide"
33 -[dependencies.adler]
34 -version = "1.0"
35 +[dependencies.adler32]
36 +version = "1.1.0"
37 default-features = false
38
39 [dependencies.alloc]
40 @@ -50,4 +50,4 @@ version = "1.0"
41
42 [features]
43 no_extern_crate_alloc = []
44 -rustc-dep-of-std = ["core", "alloc", "compiler_builtins", "adler/rustc-dep-of-std"]
45 +rustc-dep-of-std = ["core", "alloc", "compiler_builtins", "adler32/rustc-dep-of-std"]