From 7a29ed0a6beb75a5a63fec28e8522646ab355c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Mon, 29 Feb 2016 08:48:28 +0100 Subject: 1.41 bump
--- .gitignore | 1 + CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch | 77 ------------------------ CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch | 77 ++++++++++++++++++++++++ perl-CBOR-XS.spec | 12 ++-- sources | 2 +- 5 files changed, 87 insertions(+), 82 deletions(-) delete mode 100644 CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch create mode 100644 CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch diff --git a/.gitignore b/.gitignore index 1aef69e..497332a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /CBOR-XS-1.3.tar.gz /CBOR-XS-1.4.tar.gz +/CBOR-XS-1.41.tar.gz diff --git a/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch b/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch deleted file mode 100644 index 5be587f..0000000 --- a/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch +++ /dev/null @@ -1,77 +0,0 @@ -From cb69e201f5e1107e6aa75799b29cf52a91b94922 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> -Date: Tue, 29 Sep 2015 10:31:58 +0200 -Subject: [PATCH] Cast char* and U8* where needed -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building with GCC 5.1.1 and perl-5.22.0 produces various warnings about -mismatching signess. This patch corrects it. - -Signed-off-by: Petr Písař <[email protected]> ---- - XS.xs | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/XS.xs b/XS.xs -index ab487f9..e413936 100644 ---- a/XS.xs -+++ b/XS.xs -@@ -767,7 +767,7 @@ decode_he (dec_t *dec, HV *hv) - dec->cur += len; - - if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) -- if (!is_utf8_string (key, len)) -+ if (!is_utf8_string ((U8*)key, len)) - ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); - - hv_store (hv, key, -len, decode_sv (dec), 0); -@@ -856,7 +856,7 @@ decode_str (dec_t *dec, int utf8) - STRLEN len = decode_uint (dec); - - WANT (len); -- sv_catpvn (sv, dec->cur, len); -+ sv_catpvn (sv, (char *)dec->cur, len); - dec->cur += len; - } - } -@@ -865,7 +865,7 @@ decode_str (dec_t *dec, int utf8) - STRLEN len = decode_uint (dec); - - WANT (len); -- sv = newSVpvn (dec->cur, len); -+ sv = newSVpvn ((char*)dec->cur, len); - dec->cur += len; - - if (ecb_expect_false (dec->stringref) -@@ -876,7 +876,7 @@ decode_str (dec_t *dec, int utf8) - if (utf8) - { - if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) -- if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) -+ if (!is_utf8_string ((U8*)SvPVX (sv), SvCUR (sv))) - ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); - - SvUTF8_on (sv); -@@ -1183,7 +1183,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) - sv = decode_sv (&dec); - - if (offset_return) -- *offset_return = dec.cur; -+ *offset_return = (char *)dec.cur; - - if (!(offset_return || !sv)) - if (dec.cur != dec.end && !dec.err) -@@ -1233,7 +1233,7 @@ incr_parse (CBOR *self, SV *cborstr) - 1, 2, 4, 8,-1,-1,-1,-2 - }; - -- const U8 *p = SvPVX (cborstr) + self->incr_pos; -+ const U8 *p = (U8*)SvPVX (cborstr) + self->incr_pos; - U8 m = *p & MINOR_MASK; - IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]); - I8 ilen = incr_len[m]; --- -2.5.0 - diff --git a/CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch b/CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch new file mode 100644 index 0000000..463a5cd --- /dev/null +++ b/CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch @@ -0,0 +1,77 @@ +From 8a46c1a9758a359755d2f33f641a264c6d3c69a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> +Date: Tue, 29 Sep 2015 10:31:58 +0200 +Subject: [PATCH] Cast char* and U8* where needed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building with GCC 5.1.1 and perl-5.22.0 produces various warnings about +mismatching signess. This patch corrects it. + +Signed-off-by: Petr Písař <[email protected]> +--- + XS.xs | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/XS.xs b/XS.xs +index c46a5e7..56223bd 100644 +--- a/XS.xs ++++ b/XS.xs +@@ -770,7 +770,7 @@ decode_he (dec_t *dec, HV *hv) + dec->cur += len; + + if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) +- if (!is_utf8_string (key, len)) ++ if (!is_utf8_string ((U8*)key, len)) + ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); + + hv_store (hv, key, -len, decode_sv (dec), 0); +@@ -859,7 +859,7 @@ decode_str (dec_t *dec, int utf8) + STRLEN len = decode_uint (dec); + + WANT (len); +- sv_catpvn (sv, dec->cur, len); ++ sv_catpvn (sv, (char *)dec->cur, len); + dec->cur += len; + } + } +@@ -868,7 +868,7 @@ decode_str (dec_t *dec, int utf8) + STRLEN len = decode_uint (dec); + + WANT (len); +- sv = newSVpvn (dec->cur, len); ++ sv = newSVpvn ((char*)dec->cur, len); + dec->cur += len; + + if (ecb_expect_false (dec->stringref) +@@ -879,7 +879,7 @@ decode_str (dec_t *dec, int utf8) + if (utf8) + { + if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) +- if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) ++ if (!is_utf8_string ((U8*)SvPVX (sv), SvCUR (sv))) + ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); + + SvUTF8_on (sv); +@@ -1189,7 +1189,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) + sv = decode_sv (&dec); + + if (offset_return) +- *offset_return = dec.cur; ++ *offset_return = (char *)dec.cur; + + if (!(offset_return || !sv)) + if (dec.cur != dec.end && !dec.err) +@@ -1239,7 +1239,7 @@ incr_parse (CBOR *self, SV *cborstr) + 1, 2, 4, 8,-1,-1,-1,-2 + }; + +- const U8 *p = SvPVX (cborstr) + self->incr_pos; ++ const U8 *p = (U8*)SvPVX (cborstr) + self->incr_pos; + U8 m = *p & MINOR_MASK; + IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]); + I8 ilen = incr_len[m]; +-- +2.5.0 + diff --git a/perl-CBOR-XS.spec b/perl-CBOR-XS.spec index 5aeb8a9..9115d81 100644 --- a/perl-CBOR-XS.spec +++ b/perl-CBOR-XS.spec @@ -1,5 +1,6 @@ +%global cpan_version 1.41 Name: perl-CBOR-XS -Version: 1.4 +Version: %(echo %{cpan_version} | sed 's/\(\..\)\(.\)/\1.\2/') Release: 1%{?dist} Summary: Concise Binary Object Representation (CBOR) # COPYING: GPLv3+ @@ -8,11 +9,11 @@ Summary: Concise Binary Object Representation (CBOR) License: GPLv3+ and (BSD or GPLv2+) Group: Development/Libraries URL: http://search.cpan.org/dist/CBOR-XS/ -Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{cpan_version}.tar.gz # Use system libecb Patch0: CBOR-XS-1.3-Include-ecb.h-from-system.patch # Silent compiler warnings -Patch1: CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch +Patch1: CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch BuildRequires: coreutils BuildRequires: findutils # gcc for standard header files @@ -47,7 +48,7 @@ when you can represent something useful in JSON, you should be able to represent it in CBOR. %prep -%setup -q -n CBOR-XS-%{version} +%setup -q -n CBOR-XS-%{cpan_version} %patch0 -p1 %patch1 -p1 # Remove bundled libecb @@ -75,6 +76,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Feb 29 2016 Petr Pisar <[email protected]> - 1.4.1-1 +- 1.41 bump + * Tue Feb 09 2016 Petr Pisar <[email protected]> - 1.4-1 - 1.4 bump diff --git a/sources b/sources index 8895ab0..d1bed03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -624bd6819d34067eab6ffc8df0fb789f CBOR-XS-1.4.tar.gz +b76eee24f9bb8adc766b2867f18fe493 CBOR-XS-1.41.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-CBOR-XS.git/commit/?h=f24&id=7a29ed0a6beb75a5a63fec28e8522646ab355c23 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list [email protected] http://lists.fedoraproject.org/admin/lists/[email protected]
