commit
f32e3524b8
@ -0,0 +1 @@
|
||||
SOURCES/msgpack-3.1.0.tar.gz
|
@ -0,0 +1 @@
|
||||
3dd788be2100a10d99a62fc89464c80c748fbb8f SOURCES/msgpack-3.1.0.tar.gz
|
@ -0,0 +1,61 @@
|
||||
From 53d2ea9ad3cc20e1beac2e1c014082c25e221182 Mon Sep 17 00:00:00 2001
|
||||
From: Takatoshi Kondo <redboltz@gmail.com>
|
||||
Date: Sun, 26 Aug 2018 10:58:47 +0900
|
||||
Subject: [PATCH] Fixed #724.
|
||||
|
||||
Fixed type mismatch in msgpack_timestamp.
|
||||
Added 64bit singed postfix.
|
||||
---
|
||||
include/msgpack/timestamp.h | 8 ++++++--
|
||||
include/msgpack/v1/adaptor/cpp11/chrono.hpp | 4 ++--
|
||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/msgpack/timestamp.h b/include/msgpack/timestamp.h
|
||||
index 4d7df83d..76139312 100644
|
||||
--- a/include/msgpack/timestamp.h
|
||||
+++ b/include/msgpack/timestamp.h
|
||||
@@ -28,13 +28,17 @@ static inline bool msgpack_object_to_timestamp(const msgpack_object* obj, msgpac
|
||||
switch (obj->via.ext.size) {
|
||||
case 4:
|
||||
ts->tv_nsec = 0;
|
||||
- _msgpack_load32(uint32_t, obj->via.ext.ptr, &ts->tv_sec);
|
||||
+ {
|
||||
+ uint32_t v;
|
||||
+ _msgpack_load32(uint32_t, obj->via.ext.ptr, &v);
|
||||
+ ts->tv_sec = v;
|
||||
+ }
|
||||
return true;
|
||||
case 8: {
|
||||
uint64_t value;
|
||||
_msgpack_load64(uint64_t, obj->via.ext.ptr, &value);
|
||||
ts->tv_nsec = (uint32_t)(value >> 34);
|
||||
- ts->tv_sec = value & 0x00000003ffffffffL;
|
||||
+ ts->tv_sec = value & 0x00000003ffffffffLL;
|
||||
return true;
|
||||
}
|
||||
case 12:
|
||||
diff --git a/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
|
||||
index 1e08355e..db2035b7 100644
|
||||
--- a/include/msgpack/v1/adaptor/cpp11/chrono.hpp
|
||||
+++ b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
|
||||
@@ -41,7 +41,7 @@ struct as<std::chrono::system_clock::time_point> {
|
||||
uint64_t value;
|
||||
_msgpack_load64(uint64_t, o.via.ext.data(), &value);
|
||||
uint32_t nanosec = static_cast<uint32_t>(value >> 34);
|
||||
- uint64_t sec = value & 0x00000003ffffffffL;
|
||||
+ uint64_t sec = value & 0x00000003ffffffffLL;
|
||||
tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
|
||||
std::chrono::nanoseconds(nanosec));
|
||||
tp += std::chrono::seconds(sec);
|
||||
@@ -79,7 +79,7 @@ struct convert<std::chrono::system_clock::time_point> {
|
||||
uint64_t value;
|
||||
_msgpack_load64(uint64_t, o.via.ext.data(), &value);
|
||||
uint32_t nanosec = static_cast<uint32_t>(value >> 34);
|
||||
- uint64_t sec = value & 0x00000003ffffffffL;
|
||||
+ uint64_t sec = value & 0x00000003ffffffffLL;
|
||||
tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
|
||||
std::chrono::nanoseconds(nanosec));
|
||||
tp += std::chrono::seconds(sec);
|
||||
--
|
||||
2.17.1
|
||||
|
@ -0,0 +1,181 @@
|
||||
%global __cmake_in_source_build 1
|
||||
|
||||
Name: msgpack
|
||||
Version: 3.1.0
|
||||
Release: 9%{?dist}
|
||||
Summary: Binary-based efficient object serialization library
|
||||
|
||||
License: Boost
|
||||
URL: http://msgpack.org
|
||||
Source0: https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{name}-%{version}.tar.gz
|
||||
Patch: 0001-Fixed-724.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: doxygen
|
||||
# for %%check
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%description
|
||||
MessagePack is a binary-based efficient object serialization
|
||||
library. It enables to exchange structured objects between many
|
||||
languages like JSON. But unlike JSON, it is very fast and small.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Libraries and header files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Libraries and header files for %{name}
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
sed -i "s|-std=c++98|-std=gnu++11|g" CMakeLists.txt
|
||||
|
||||
%build
|
||||
if test ! -e "obj"; then
|
||||
mkdir obj
|
||||
fi
|
||||
pushd obj
|
||||
%cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} -Dlibdir=%{_libdir} -DBUILD_SHARED_LIBS=ON
|
||||
%make_build
|
||||
|
||||
popd
|
||||
|
||||
%check
|
||||
pushd obj
|
||||
# https://github.com/msgpack/msgpack-c/issues/697
|
||||
export GTEST_FILTER=-object_with_zone.ext_empty
|
||||
make test || {
|
||||
cat Testing/Temporary/LastTest.log;
|
||||
exit 1;
|
||||
}
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
make install/fast DESTDIR=$RPM_BUILD_ROOT -C obj
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE_1_0.txt COPYING
|
||||
%doc AUTHORS ChangeLog NOTICE README README.md
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/msgpack.pc
|
||||
%{_libdir}/cmake/msgpack
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Aug 31 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 3.1.0-9
|
||||
- Rebuilt for MSVSphere 9.4
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Aug 22 2018 Daiki Ueno <dueno@redhat.com> - 3.1.0-1
|
||||
- new upstream release
|
||||
- cmake configuration files no longer rely on nonexistent static libraries
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jun 7 2018 Daiki Ueno <dueno@redhat.com> - 3.0.1-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.4.2-4
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Feb 21 2017 Daiki Ueno <dueno@redhat.com> - 1.4.2-1
|
||||
- new upstream release
|
||||
- avoid FTBFS with GCC7
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Apr 7 2016 Daiki Ueno <dueno@redhat.com> - 1.4.1-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Dec 10 2015 Neal Gompa <ngompa13{%}gmail{*}com> - 1.3.0-1
|
||||
- Upgrade to 1.3.0 upstream release
|
||||
- Drop unneeded patch
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.5.9-3
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Fri Jul 11 2014 Daiki Ueno <dueno@redhat.com> - 0.5.9-1
|
||||
- new upstream release
|
||||
- apply patch to fix int->float test failure
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu Jan 9 2014 Daiki Ueno <dueno@redhat.com> - 0.5.8-1
|
||||
- new upstream release
|
||||
- remove patches that are no longer needed
|
||||
|
||||
* Tue Aug 27 2013 Dan Horák <dan[at]danny.cz> - 0.5.7-5
|
||||
- apply upstream fix for big endians
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Feb 15 2012 Daiki Ueno <dueno@redhat.com> - 0.5.7-1
|
||||
- initial packaging for Fedora
|
||||
|
Loading…
Reference in new issue