diff --git a/.gitignore b/.gitignore index 77100a7..8273d25 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /plist-0.4.1.crate /plist-0.4.2.crate /plist-0.5.1.crate +/plist-0.5.3.crate diff --git a/0001-Make-sure-offset_table_offset-is-written-as-8-bytes.patch b/0001-Make-sure-offset_table_offset-is-written-as-8-bytes.patch deleted file mode 100644 index 564f65b..0000000 --- a/0001-Make-sure-offset_table_offset-is-written-as-8-bytes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2b984085425549496b365255e807d1b45ac57e69 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 16 Jan 2020 12:52:53 -0800 -Subject: [PATCH 1/2] Make sure offset_table_offset is written as 8 bytes - -It's a `usize` value, but the output format expects 8 bytes. That's fine -on 64-bit targets, but 32-bit targets were failing tests: - - ---- stream::binary_writer::tests::bplist_roundtrip stdout ---- - thread 'stream::binary_writer::tests::bplist_roundtrip' panicked at 'assertion failed: `(left == right)` - left: `8`, - right: `4`: destination and source slices have different lengths', src/libcore/slice/mod.rs:2217:9 - note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. - ---- stream::binary_writer::tests::nskeyedarchiver_roundtrip stdout ---- - thread 'stream::binary_writer::tests::nskeyedarchiver_roundtrip' panicked at 'assertion failed: `(left == right)` - left: `8`, - right: `4`: destination and source slices have different lengths', src/libcore/slice/mod.rs:2217:9 - ---- stream::binary_writer::tests::utf16_roundtrip stdout ---- - thread 'stream::binary_writer::tests::utf16_roundtrip' panicked at 'assertion failed: `(left == right)` - left: `8`, - right: `4`: destination and source slices have different lengths', src/libcore/slice/mod.rs:2217:9 - -Casting to `u64` makes sure we have the correct size to write. ---- - src/stream/binary_writer.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stream/binary_writer.rs b/src/stream/binary_writer.rs -index 6541ea8d09d5..fe1e0902cda8 100644 ---- a/src/stream/binary_writer.rs -+++ b/src/stream/binary_writer.rs -@@ -335,7 +335,7 @@ impl BinaryWriter { - trailer[6] = offset_size; - trailer[7] = ref_size; - trailer[8..16].copy_from_slice(&(self.num_objects as u64).to_be_bytes()); -- trailer[24..32].copy_from_slice(&offset_table_offset.to_be_bytes()); -+ trailer[24..32].copy_from_slice(&(offset_table_offset as u64).to_be_bytes()); - self.writer.write_exact(&trailer)?; - - self.writer --- -2.24.1 - diff --git a/rust-plist.spec b/rust-plist.spec index 08f5ee6..28ac057 100644 --- a/rust-plist.spec +++ b/rust-plist.spec @@ -5,8 +5,8 @@ %global crate plist Name: rust-%{crate} -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Rusty plist parser # Upstream license specification: MIT @@ -14,9 +14,6 @@ License: MIT URL: https://crates.io/crates/plist Source: %{crates_source} -# Fix for 32-bit targets, https://github.com/ebarnard/rust-plist/pull/47 -Patch1: 0001-Make-sure-offset_table_offset-is-written-as-8-bytes.patch - ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} BuildArch: noarch @@ -86,6 +83,9 @@ which use "serde" feature of "%{crate}" crate. %endif %changelog +* Tue Mar 03 2020 Josh Stone - 0.5.3-1 +- Update to 0.5.3 + * Thu Jan 30 2020 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 385ee1e..e87597f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plist-0.5.1.crate) = 46ee6109bdff92a68c886a0751fedb149d760e38e07469cd507ca5ff17c463e460ae0b377e53bd412becf17ae74df09ccc67713800f09d4b3aa41ed5978a8dd3 +SHA512 (plist-0.5.3.crate) = 027668a043c8ae53e9be5ad22cc7e7a8674757f8dd6b79ce10c04d276e9d4dff26bd9995baa315c87982abee47611e5368ad6c65e3a1e3fb3231614da9c1402d