[rpms/soci] update-to-4.1.4: Upstream update

[rpms/soci] update-to-4.1.4: Upstream update

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : 5e01ef8a64fa055922b546ddb931f357d24ce1b3
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2020-06-05T01:02:19+02:00
Stats  : +9/-9 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/5e01ef8a64fa055922b546ddb931f357d24ce1b3?branch=update-to-4.1.4

Log:
Upstream update

---
diff --git a/soci.spec b/soci.spec
index d2fbbfe..7c595f1 100644
--- a/soci.spec
+++ b/soci.spec
@@ -21,19 +21,16 @@
 ##
 #
 Name:           soci
-Version:        4.0.1.alpha1
-%global ups_ver 4.0.1-alpha1
+Version:        4.0.1.alpha2
+%global ups_ver 4.0.1-alpha2
 Release:        1%{?dist}
 Summary:        The database access library for C++ programmers
 License:        Boost
 URL:            https://github.com/SOCI/%{name}
 Source0:        %{url}/archive/%{ups_version}.tar.gz#/%{name}-%{version}.tar.gz
 
-# For some reason, as of November 2019, it does not compile on ARMv7hl
-# See https://koji.fedoraproject.org/koji/taskinfo?taskID=38562666
 # Upstream issue: https://github.com/SOCI/soci/pull/815
-#ExcludeArch:    armv7hl
-Patch0:         soci-werror.patch
+#Patch0:         soci-werror.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  gcc gcc-c++
@@ -184,7 +181,7 @@ library. The documentation is the same as at the %{name} web page.
 
 %prep
 %setup -q -n %{name}-%{ups_ver}
-%patch -p1
+#%%patch -p1
 
 # Rename change-log and license file, so that they comply with
 # packaging standard
@@ -325,7 +322,10 @@ rm -f %{buildroot}%{_libdir}/*.a
 %doc AUTHORS ChangeLog COPYING NEWS README docs
 
 %changelog
-* Thu Feb 06 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.0.alpha1-1
+* Thu Jun 04 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.1.alpha2-1
+- Upstream update
+
+* Thu Jun 04 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.1.alpha1-1
 - Attempt to rebuild on armv7hl
 - Uptream update
 

diff --git a/sources b/sources
index 9c7b32e..34512b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (soci-4.0.1.alpha1.tar.gz) = 6c79e17e15c43af8bae47be375f6b975e3f383bd9843dbac106a6ea7bcf86645050bbad15a6b6a421bd0e058d3b3be14cfd8617b4c8dbdac436c42b92f679eb1
+SHA512 (soci-4.0.1.alpha2.tar.gz) = 33ef2a5d146dedbe6f8f06aa6f242b20db4c6780b475e737d95fbb7b529a860f2781772fa397a03485b637d418d8047940911a9f10c29ce5b9b05386c3977992

[rpms/soci] update-to-4.1.4: Upstream update

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : 77f1f4a9eee44f884f33bcd52e07170c0d4c8b7a
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2021-05-18T00:46:32+02:00
Stats  : +39/-11 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/77f1f4a9eee44f884f33bcd52e07170c0d4c8b7a?branch=update-to-4.1.4

Log:
Upstream update

---
diff --git a/soci-test-signal-contexpr.patch b/soci-test-signal-contexpr.patch
new file mode 100644
index 0000000..5d19b61
--- /dev/null
+++ b/soci-test-signal-contexpr.patch
@@ -0,0 +1,21 @@
+--- a/tests/catch.hpp.old	2021-05-17 23:58:05.610815253 +0200
++++ b/tests/catch.hpp	2021-05-17 23:59:08.753674174 +0200
+@@ -6489,7 +6489,7 @@
+         static bool isSet;
+         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+         static stack_t oldSigStack;
+-        static char altStackMem[SIGSTKSZ];
++        static char altStackMem[8192];
+ 
+         static void handleSignal( int sig ) {
+             std::string name = "<unknown signal>";
+@@ -6540,7 +6540,7 @@
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++    char FatalConditionHandler::altStackMem[8192] = {};
+ 
+ } // namespace Catch
+ 
+

diff --git a/soci-uninit.patch b/soci-uninit.patch
index 17f3cd8..26bd408 100644
--- a/soci-uninit.patch
+++ b/soci-uninit.patch
@@ -1,7 +1,6 @@
-diff -Nrup a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp
---- a/src/backends/mysql/session.cpp	2019-11-09 12:08:01.000000000 -0700
-+++ b/src/backends/mysql/session.cpp	2019-12-19 22:08:48.011411151 -0700
-@@ -180,10 +180,12 @@ void parse_connect_string(const string &
+--- a/src/backends/mysql/session.cpp.old	2021-04-20 11:43:34.000000000 +0200
++++ b/src/backends/mysql/session.cpp	2021-05-17 23:17:32.259053974 +0200
+@@ -180,10 +180,12 @@
      *password_p = false;
      *db_p = false;
      *unix_socket_p = false;
@@ -13,4 +12,5 @@ diff -Nrup a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp
 +    *local_infile = 0;
      *local_infile_p = false;
      *charset_p = false;
-     *connect_timeout_p = false;
+     *reconnect_p = false;
+

diff --git a/soci.spec b/soci.spec
index 3490c5e..655a908 100644
--- a/soci.spec
+++ b/soci.spec
@@ -21,18 +21,21 @@
 ##
 #
 Name:           soci
-Version:        4.0.1.alpha2
-%global ups_ver 4.0.1-alpha2
-Release:        8%{?dist}
+Version:        4.0.2
+%global ups_ver 4.0.2
+Release:        1%{?dist}
 Summary:        The database access library for C++ programmers
 License:        Boost
 URL:            https://github.com/SOCI/%{name}
-Source0:        %{url}/archive/%{ups_version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{ups_ver}.tar.gz#/%{name}-%{version}.tar.gz
 
 # Upstream issue: https://github.com/SOCI/soci/pull/815
 #Patch0:         soci-werror.patch
 # Works around a false positive -Wuninitialized error exposed by LTO
 Patch1:		soci-uninit.patch
+# Works around the compilation error with gcc 10
+Patch2:         soci-test-signal-contexpr.patch
+
 
 BuildRequires:  dos2unix
 BuildRequires:  gcc gcc-c++
@@ -185,6 +188,7 @@ library. The documentation is the same as at the %{name} web page.
 %setup -q -n %{name}-%{ups_ver}
 #%%patch -p1
 %patch1 -p1
+%patch2 -p1
 
 # Rename change-log and license file, so that they comply with
 # packaging standard
@@ -227,7 +231,7 @@ dos2unix AUTHORS README ChangeLog COPYING NEWS
 
 # CMake helpers 
 mkdir -p %{buildroot}%{_datadir}/%{name}
-mv -f %{buildroot}%{_prefix}/cmake %{buildroot}%{_datadir}/%{name}/CMake
+mv -f %{buildroot}%{_libdir}/cmake %{buildroot}%{_datadir}/%{name}/CMake
 
 # Remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_libdir}/*.a
@@ -321,6 +325,9 @@ rm -f %{buildroot}%{_libdir}/*.a
 %doc AUTHORS ChangeLog COPYING NEWS README docs
 
 %changelog
+* Mon May 17 2021 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.2-1
+- Upstream update
+
 * Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 4.0.1.alpha2-8
 - rebuild for libpq ABI fix rhbz#1908268
 

diff --git a/sources b/sources
index 34512b8..ee83e46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (soci-4.0.1.alpha2.tar.gz) = 33ef2a5d146dedbe6f8f06aa6f242b20db4c6780b475e737d95fbb7b529a860f2781772fa397a03485b637d418d8047940911a9f10c29ce5b9b05386c3977992
+SHA512 (soci-4.0.2.tar.gz) = 65e04bfe0b61890b1c1f7c7a3973ee58533373d49bca84fe1dea5062c1d3366aab9bcf1fb8ccc310b2d7fe8961d493d5a649736384e2cb536c651a315ce07d93