Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cmis-client for openSUSE:Factory
checked in at 2024-09-16 17:40:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmis-client (Old)
and /work/SRC/openSUSE:Factory/.cmis-client.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmis-client"
Mon Sep 16 17:40:29 2024 rev:25 rq:1201384 version:0.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmis-client/cmis-client.changes 2024-09-13
14:25:31.221795047 +0200
+++ /work/SRC/openSUSE:Factory/.cmis-client.new.29891/cmis-client.changes
2024-09-16 17:40:40.651101205 +0200
@@ -1,0 +2,15 @@
+Mon Sep 16 09:21:11 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Add 71.patch: fix comment and harmonise the version branches
+
+-------------------------------------------------------------------
+Mon Sep 16 08:27:08 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Add 70.patch: fix build with Boost < 1.66
+
+-------------------------------------------------------------------
+Fri Sep 13 15:12:41 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Add 69.patch: fix regression building against Boost < 1.86
+
+-------------------------------------------------------------------
New:
----
69.patch
70.patch
71.patch
BETA DEBUG BEGIN:
New:
- Add 69.patch: fix regression building against Boost < 1.86
New:
- Add 70.patch: fix build with Boost < 1.66
New:
- Add 71.patch: fix comment and harmonise the version branches
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmis-client.spec ++++++
--- /var/tmp/diff_new_pack.NTQW2y/_old 2024-09-16 17:40:41.299128234 +0200
+++ /var/tmp/diff_new_pack.NTQW2y/_new 2024-09-16 17:40:41.299128234 +0200
@@ -16,6 +16,7 @@
#
+%{!?make_build:%global make_build make %{?_smp_mflags}}
%define sover 0_6-6
%define incname 0.6
%define _name libcmis
@@ -29,6 +30,9 @@
Source0:
https://github.com/tdf/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM -- Fux build against boost 1.86
Patch0:
https://patch-diff.githubusercontent.com/raw/tdf/libcmis/pull/68.patch
+Patch1:
https://patch-diff.githubusercontent.com/raw/tdf/libcmis/pull/69.patch
+Patch2:
https://patch-diff.githubusercontent.com/raw/tdf/libcmis/pull/70.patch
+Patch3:
https://patch-diff.githubusercontent.com/raw/tdf/libcmis/pull/71.patch
BuildRequires: docbook2X
BuildRequires: gcc-c++
BuildRequires: intltool
@@ -97,7 +101,7 @@
--disable-silent-rules \
--disable-static \
--disable-werror
-make %{?_smp_mflags}
+%make_build
%install
%make_install
@@ -106,9 +110,9 @@
%check
# bypass bug 955832
%ifarch ppc64le
-make -k check %{?_smp_mflags} || echo "ignore check error"
+%make_build -k check || echo "ignore check error"
%else
-make check %{?_smp_mflags}
+%make_build check
%endif
%post -n %{_name}-%{sover} -p /sbin/ldconfig
++++++ 69.patch ++++++
>From 0753091be57edae28655e43a9bae9e4c4e414117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
Date: Fri, 13 Sep 2024 16:02:13 +0100
Subject: [PATCH] sha1 test fails with older boost
<fridrich> 1) test: XmlTest::sha1Test (F) line: 588 test-xmlutils.cxx
<fridrich> equality assertion failed
<fridrich> - Expected: f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0
<fridrich> - Actual : 8b9efff79be0b27b5d5a9370c50c5e78f0abd0d9
---
src/libcmis/xml-utils.cxx | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
index cdf088f..3568ec6 100644
--- a/src/libcmis/xml-utils.cxx
+++ b/src/libcmis/xml-utils.cxx
@@ -536,17 +536,19 @@ namespace libcmis
boost::uuids::detail::sha1::digest_type digest;
sha1.get_digest( digest );
- // by using a pointer to unsigned char, we can read the
- // object representation of either typedef.
- const unsigned char* ptr = reinterpret_cast<const unsigned char*>(
digest );
-
stringstream out;
// Setup writing mode. Every number must produce two
// hexadecimal digits, including possible leading 0s, or we get
// less than 40 digits as result.
out << hex << setfill('0') << right;
- for ( int i = 0; i < sizeof( digest ); ++ptr, ++i )
+#if BOOST_VERSION < 108600
+ for ( int i = 0; i < 5; ++i )
+ out << setw(8) << digest[i];
+#else
+ const unsigned char* ptr = reinterpret_cast<const unsigned char*>(
digest );
+ for ( size_t i = 0; i < sizeof( digest ); ++ptr, ++i )
out << setw(2) << static_cast<int>( *ptr );
+#endif
return out.str();
}
++++++ 70.patch ++++++
>From 8cf58e67c8a77a81bb8392886468e12c0f96d9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Mon, 16 Sep 2024 10:21:42 +0200
Subject: [PATCH] Fix build with boost < 1.66 and simplify a bit
---
src/libcmis/xml-utils.cxx | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
index 3568ec6..20c671e 100644
--- a/src/libcmis/xml-utils.cxx
+++ b/src/libcmis/xml-utils.cxx
@@ -531,9 +531,14 @@ namespace libcmis
boost::uuids::detail::sha1 sha1;
sha1.process_bytes( str.c_str(), str.size() );
- // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5]
+ // on boost < 1.66.0, digest_type is typedef'd as reference to
unsigned int[5]
+ // on boost >= 1.66.0 and < 1.86.0, digest_type is typedef'd as
unsigned int[5]
// on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20]
+#if BOOST_VERSION < 106600
+ unsigned int digest[5];
+#else
boost::uuids::detail::sha1::digest_type digest;
+#endif
sha1.get_digest( digest );
stringstream out;
@@ -541,14 +546,8 @@ namespace libcmis
// hexadecimal digits, including possible leading 0s, or we get
// less than 40 digits as result.
out << hex << setfill('0') << right;
-#if BOOST_VERSION < 108600
- for ( int i = 0; i < 5; ++i )
- out << setw(8) << digest[i];
-#else
- const unsigned char* ptr = reinterpret_cast<const unsigned char*>(
digest );
- for ( size_t i = 0; i < sizeof( digest ); ++ptr, ++i )
- out << setw(2) << static_cast<int>( *ptr );
-#endif
+ for ( size_t i = 0; i < sizeof( digest ) / sizeof( digest[0] ); ++i )
+ out << setw(2 * sizeof( digest[0] )) << static_cast<int>(
digest[i] );
return out.str();
}
++++++ 71.patch ++++++
>From 34e02902beec2d985dd66ee25c37b0b1bd1498a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Mon, 16 Sep 2024 10:59:19 +0200
Subject: [PATCH] Fix comment and sync the #if BOOST_VERSION to avoid including
a redirecting header
---
src/libcmis/xml-utils.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
index 20c671e..38e01ec 100644
--- a/src/libcmis/xml-utils.cxx
+++ b/src/libcmis/xml-utils.cxx
@@ -36,10 +36,10 @@
#include <boost/algorithm/string.hpp>
#include <boost/version.hpp>
-#if BOOST_VERSION >= 106800
-#include <boost/uuid/detail/sha1.hpp>
-#else
+#if BOOST_VERSION < 106600
#include <boost/uuid/sha1.hpp>
+#else
+#include <boost/uuid/detail/sha1.hpp>
#endif
#include <curl/curl.h>
@@ -542,7 +542,7 @@ namespace libcmis
sha1.get_digest( digest );
stringstream out;
- // Setup writing mode. Every number must produce two
+ // Setup writing mode. Every byte must produce two
// hexadecimal digits, including possible leading 0s, or we get
// less than 40 digits as result.
out << hex << setfill('0') << right;
