konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

update zstd 0.6 -> 0.12 for bookworm

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2023-05-23 10:40:06 +02:00
parent 8f8d52f148
commit 818ac8e708
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -77,7 +77,7 @@ tower-service = "0.3.0"
url = "2.2"
walkdir = "2"
webauthn-rs = "0.3"
zstd = { version = "0.6", features = [ "bindgen" ] }
zstd = { version = "0.12", features = [ "bindgen" ] }
# workspace dependencies
proxmox-api-macro = { version = "1.0.4", path = "proxmox-api-macro" }

8
proxmox-compression/debian/control
View File

@ -22,8 +22,8 @@ Build-Depends: debhelper (>= 12),
librust-tokio-1+fs-dev (>= 1.6-~~) <!nocheck>,
librust-tokio-1+io-util-dev (>= 1.6-~~) <!nocheck>,
librust-walkdir-2+default-dev <!nocheck>,
librust-zstd-0.6+bindgen-dev <!nocheck>,
librust-zstd-0.6+default-dev <!nocheck>
librust-zstd-0.12+bindgen-dev <!nocheck>,
librust-zstd-0.12+default-dev <!nocheck>
Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.6.1
Vcs-Git: git://git.proxmox.com/git/proxmox.git
@ -52,8 +52,8 @@ Depends:
librust-tokio-1+fs-dev (>= 1.6-~~),
librust-tokio-1+io-util-dev (>= 1.6-~~),
librust-walkdir-2+default-dev,
librust-zstd-0.6+bindgen-dev,
librust-zstd-0.6+default-dev
librust-zstd-0.12+bindgen-dev,
librust-zstd-0.12+default-dev
Provides:
librust-proxmox-compression+default-dev (= ${binary:Version}),
librust-proxmox-compression-0-dev (= ${binary:Version}),

2
proxmox-compression/src/zstd.rs
View File

@ -73,7 +73,7 @@ impl<'a, T> ZstdEncoder<'a, T> {
fn finish(&mut self) -> Result<usize, io::Error> {
let mut outbuf = OutBuffer::around(self.buffer.get_free_mut_slice());
let res = self.compressor.finish(&mut outbuf, true);
let size = outbuf.pos;
let size = outbuf.pos();
// drop(outbuf);
self.buffer.add_size(size);
res

7
proxmox-sys/debian/control
View File

@ -49,8 +49,7 @@ Depends:
libacl1-dev,
uuid-dev
Suggests:
librust-proxmox-sys+logrotate-dev (= ${binary:Version}),
librust-proxmox-sys+sortable-macro-dev (= ${binary:Version})
librust-proxmox-sys+logrotate-dev (= ${binary:Version})
Provides:
librust-proxmox-sys+acl-dev (= ${binary:Version}),
librust-proxmox-sys+crypt-dev (= ${binary:Version}),
@ -81,8 +80,8 @@ Multi-Arch: same
Depends:
${misc:Depends},
librust-proxmox-sys-dev (= ${binary:Version}),
librust-zstd-0.6+bindgen-dev,
librust-zstd-0.6+default-dev
librust-zstd-0.12+bindgen-dev,
librust-zstd-0.12+default-dev
Provides:
librust-proxmox-sys-0+logrotate-dev (= ${binary:Version}),
librust-proxmox-sys-0.4+logrotate-dev (= ${binary:Version}),