epel9
Petr Písař 9 years ago
parent c3bf7d6e03
commit 7a29ed0a6b

1
.gitignore vendored

@ -1,2 +1,3 @@
/CBOR-XS-1.3.tar.gz
/CBOR-XS-1.4.tar.gz
/CBOR-XS-1.41.tar.gz

@ -1,4 +1,4 @@
From cb69e201f5e1107e6aa75799b29cf52a91b94922 Mon Sep 17 00:00:00 2001
From 8a46c1a9758a359755d2f33f641a264c6d3c69a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 29 Sep 2015 10:31:58 +0200
Subject: [PATCH] Cast char* and U8* where needed
@ -15,10 +15,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/XS.xs b/XS.xs
index ab487f9..e413936 100644
index c46a5e7..56223bd 100644
--- a/XS.xs
+++ b/XS.xs
@@ -767,7 +767,7 @@ decode_he (dec_t *dec, HV *hv)
@@ -770,7 +770,7 @@ decode_he (dec_t *dec, HV *hv)
dec->cur += len;
if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
@ -27,7 +27,7 @@ index ab487f9..e413936 100644
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)
@@ -859,7 +859,7 @@ decode_str (dec_t *dec, int utf8)
STRLEN len = decode_uint (dec);
WANT (len);
@ -36,7 +36,7 @@ index ab487f9..e413936 100644
dec->cur += len;
}
}
@@ -865,7 +865,7 @@ decode_str (dec_t *dec, int utf8)
@@ -868,7 +868,7 @@ decode_str (dec_t *dec, int utf8)
STRLEN len = decode_uint (dec);
WANT (len);
@ -45,7 +45,7 @@ index ab487f9..e413936 100644
dec->cur += len;
if (ecb_expect_false (dec->stringref)
@@ -876,7 +876,7 @@ decode_str (dec_t *dec, int utf8)
@@ -879,7 +879,7 @@ decode_str (dec_t *dec, int utf8)
if (utf8)
{
if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
@ -54,7 +54,7 @@ index ab487f9..e413936 100644
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)
@@ -1189,7 +1189,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return)
sv = decode_sv (&dec);
if (offset_return)
@ -63,7 +63,7 @@ index ab487f9..e413936 100644
if (!(offset_return || !sv))
if (dec.cur != dec.end && !dec.err)
@@ -1233,7 +1233,7 @@ incr_parse (CBOR *self, SV *cborstr)
@@ -1239,7 +1239,7 @@ incr_parse (CBOR *self, SV *cborstr)
1, 2, 4, 8,-1,-1,-1,-2
};

@ -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 <ppisar@redhat.com> - 1.4.1-1
- 1.41 bump
* Tue Feb 09 2016 Petr Pisar <ppisar@redhat.com> - 1.4-1
- 1.4 bump

@ -1 +1 @@
624bd6819d34067eab6ffc8df0fb789f CBOR-XS-1.4.tar.gz
b76eee24f9bb8adc766b2867f18fe493 CBOR-XS-1.41.tar.gz

Loading…
Cancel
Save