diff --git a/.gitignore b/.gitignore index 9eba066..aa5b9b2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /CBOR-XS-1.83.tar.gz /CBOR-XS-1.84.tar.gz /CBOR-XS-1.85.tar.gz +/CBOR-XS-1.86.tar.gz diff --git a/CBOR-XS-1.84-Fix-formatting-a-pointer-difference.patch b/CBOR-XS-1.84-Fix-formatting-a-pointer-difference.patch deleted file mode 100644 index fbc0bcf..0000000 --- a/CBOR-XS-1.84-Fix-formatting-a-pointer-difference.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8f9b642f14c5de5303326a5b32f6d267ed7349b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 21 Oct 2021 15:32:08 +0200 -Subject: [PATCH] Fix formatting a pointer difference -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 11 warned: - -XS.xs: In function 'decode_cbor': -XS.xs:1478:14: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat=] - 1478 | croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ - | | - | long int - -Signed-off-by: Petr Písař ---- - XS.xs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/XS.xs b/XS.xs -index f4e2b4c..bfc7178 100644 ---- a/XS.xs -+++ b/XS.xs -@@ -1475,7 +1475,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) - if (dec.err_sv) - sv_2mortal (dec.err_sv); - -- croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); -+ croak ("%s, at offset %td (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); - } - - sv = sv_2mortal (sv); --- -2.31.1 - diff --git a/perl-CBOR-XS.spec b/perl-CBOR-XS.spec index 0ee9f37..2706655 100644 --- a/perl-CBOR-XS.spec +++ b/perl-CBOR-XS.spec @@ -1,5 +1,5 @@ Name: perl-CBOR-XS -Version: 1.85 +Version: 1.86 Release: 1%{?dist} Summary: Concise Binary Object Representation (CBOR) # COPYING: GPLv3+ @@ -12,8 +12,6 @@ Source0: https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{ver Patch0: CBOR-XS-1.6-Include-ecb.h-from-system.patch # Silent compiler warnings Patch1: CBOR-XS-1.84-Cast-char-and-U8-where-needed.patch -# Fix formatting an error message, mailed to the upstream -Patch2: CBOR-XS-1.84-Fix-formatting-a-pointer-difference.patch BuildRequires: coreutils BuildRequires: findutils # gcc for standard header files @@ -101,6 +99,9 @@ make test %{_libexecdir}/%{name} %changelog +* Fri Nov 05 2021 Petr Pisar - 1.86-1 +- 1.86 bump (bug #2020382) + * Mon Oct 25 2021 Petr Pisar - 1.85-1 - 1.85 bump diff --git a/sources b/sources index 17b2482..a48cace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CBOR-XS-1.85.tar.gz) = 7da6ed389f5a9492656f50aa835db72ac1f9fb85597cce8dfce1779939edb5f8cd3083e1d774bd2780d79013ce7d4952d29b48c5eb484f32ea74d86ddc850a9c +SHA512 (CBOR-XS-1.86.tar.gz) = 44fa695d5c4f8cce121d4a31cc0a51625b21423a20e241557206216a7f6129cc13062f1c98e9f5b77b032898858a998e4c00d1139724bfaee8a21e0f13ca787c