From c3bf7d6e03d6131128cf473430c3f8bafe594c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Tue, 9 Feb 2016 16:34:28 +0100
Subject: 1.4 bump
---
.gitignore | 1 +
.rpmlint | 2 +
CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch | 77 -------------------------
CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch | 77 +++++++++++++++++++++++++
perl-CBOR-XS.spec | 11 ++--
sources | 2 +-
6 files changed, 88 insertions(+), 82 deletions(-)
create mode 100644 .rpmlint
delete mode 100644 CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch
create mode 100644 CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch
diff --git a/.gitignore b/.gitignore
index cd636cb..1aef69e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/CBOR-XS-1.3.tar.gz
+/CBOR-XS-1.4.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..7c16114
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* (versa|superset)");
diff --git a/CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch
b/CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch
deleted file mode 100644
index 6601267..0000000
--- a/CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From fb089d08ff9bc5cf45570b950aa33e50ee62371b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-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ř <ppi...@redhat.com>
----
- XS.xs | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/XS.xs b/XS.xs
-index 0af7c95..134ed9e 100644
---- a/XS.xs
-+++ b/XS.xs
-@@ -765,7 +765,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);
-@@ -854,7 +854,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;
- }
- }
-@@ -863,7 +863,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)
-@@ -874,7 +874,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);
-@@ -1181,7 +1181,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)
-@@ -1231,7 +1231,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.4.3
-
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
new file mode 100644
index 0000000..5be587f
--- /dev/null
+++ b/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch
@@ -0,0 +1,77 @@
+From cb69e201f5e1107e6aa75799b29cf52a91b94922 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+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ř <ppi...@redhat.com>
+---
+ 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/perl-CBOR-XS.spec b/perl-CBOR-XS.spec
index ef5fae5..5aeb8a9 100644
--- a/perl-CBOR-XS.spec
+++ b/perl-CBOR-XS.spec
@@ -1,6 +1,6 @@
Name: perl-CBOR-XS
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Concise Binary Object Representation (CBOR)
# COPYING: GPLv3+
## Replaced by system header-only package
@@ -12,7 +12,7 @@ Source0:
http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{version}.
# Use system libecb
Patch0: CBOR-XS-1.3-Include-ecb.h-from-system.patch
# Silent compiler warnings
-Patch1: CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch
+Patch1: CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch
BuildRequires: coreutils
BuildRequires: findutils
# gcc for standard header files
@@ -41,7 +41,7 @@ Requires: perl(URI)
%description
This module converts Perl data structures to the Concise Binary Object
-Representation (CBOR) and vice versa. CBOR is a fast binary serialisation
+Representation (CBOR) and vice versa. CBOR is a fast binary serialization
format that aims to use an (almost) superset of the JSON data model, i.e.
when you can represent something useful in JSON, you should be able to
represent it in CBOR.
@@ -75,6 +75,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Tue Feb 09 2016 Petr Pisar <ppi...@redhat.com> - 1.4-1
+- 1.4 bump
+
* Thu Feb 04 2016 Fedora Release Engineering <rel...@fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 55774d7..8895ab0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bfeba032f5fdbf45ef7275ddb37af97 CBOR-XS-1.3.tar.gz
+624bd6819d34067eab6ffc8df0fb789f CBOR-XS-1.4.tar.gz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-CBOR-XS.git/commit/?h=master&id=c3bf7d6e03d6131128cf473430c3f8bafe594c46
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-de...@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-de...@lists.fedoraproject.org
