packages/boost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!38 Update to 1.77

Browse Source 
From: @sdlzx
Reviewed-by: 
Signed-off-by:
This commit is contained in:
openeuler-ci-bot 2021-09-22 06:34:32 +00:00 committed by Gitee
commit 45229ddd0d
6 changed files with 132 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
boost-1.58.0-pool-test_linking.patch
View File

@ -1,33 +0,0 @@
diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
@@ -22,18 +22,18 @@ import os ;
import testing ;
test-suite pool :
- [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 ]
- [ run test_pool_alloc.cpp ]
- [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 ]
- [ run test_msvc_mem_leak_detect.cpp ]
- [ run test_bug_3349.cpp ]
- [ run test_bug_4960.cpp ]
+ [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
+ [ run test_pool_alloc.cpp <library>/boost/system//boost_system ]
+ [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
[ run test_bug_1252.cpp : : :
<toolset>clang:<cxxflags>-Wno-c++11-long-long
<toolset>gcc:<cxxflags>-Wno-long-long
- <toolset>pathscale:<cxxflags>-Wno-long-long ]
- [ run test_bug_2696.cpp ]
- [ run test_bug_5526.cpp ]
+ <toolset>pathscale:<cxxflags>-Wno-long-long <library>/boost/system//boost_system ]
+ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
+ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
[ compile test_poisoned_macros.cpp ]
;
--
2.19.1

17
boost-1.66.0-no-rpath.patch → boost-1.77-build-drop-rpath.patch
View File

@ -1,8 +1,18 @@
From 8f85a56a883d3712d4d0cb23dc22ccdfb8201f12 Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Wed, 15 Sep 2021 23:41:16 +0800
Subject: [PATCH] Drop rpath
Originally-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
tools/build/src/tools/gcc.jam | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
index ff3209f7b..04520bc01 100644 index f48a00dc9..5c4e3e3ed 100644
--- a/tools/build/src/tools/gcc.jam --- a/tools/build/src/tools/gcc.jam
+++ b/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam
@@ -1132,17 +1132,17 @@ actions link.mingw bind LIBRARIES @@ -1034,17 +1034,17 @@ actions link.mingw bind LIBRARIES
actions link.dll.mingw bind LIBRARIES actions link.dll.mingw bind LIBRARIES
{ {
@ -24,4 +34,5 @@ index ff3209f7b..04520bc01 100644
### ###
-- --
2.23.0 2.31.1

80
boost-1.58.0-pool.patch → boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch
View File

@ -1,15 +1,32 @@
Index: boost/pool/pool.hpp From b59c1be697a001a71f6b92660e41d8915eea941d Mon Sep 17 00:00:00 2001
=================================================================== From: Orgad Shaneh <orgads@gmail.com>
--- boost/pool/pool.hpp (revision 78317) Date: Thu, 9 Sep 2021 10:28:13 +0300
+++ boost/pool/pool.hpp (revision 78326) Subject: [PATCH] fix integer overflows in pool::ordered_malloc
@@ -27,4 +27,6 @@
Fixes trac #6701 (https://svn.boost.org/trac10/ticket/6701).
Originally-by: Jonathan Wakely <jwakely.boost@kayari.org>
---
boost/pool/pool.hpp | 32 +++++++++++++++++++++++---------
libs/pool/test/test_bug_6701.cpp | 27 +++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 9 deletions(-)
create mode 100644 libs/pool/test/test_bug_6701.cpp
diff --git a/boost/pool/pool.hpp b/boost/pool/pool.hpp
index c47b11faf..a899ca0a2 100644
--- a/boost/pool/pool.hpp
+++ b/boost/pool/pool.hpp
@@ -26,6 +26,8 @@
#include <boost/pool/poolfwd.hpp> #include <boost/pool/poolfwd.hpp>
+// std::numeric_limits +// std::numeric_limits
+#include <boost/limits.hpp> +#include <boost/limits.hpp>
// boost::integer::static_lcm // boost::integer::static_lcm
#include <boost/integer/common_factor_ct.hpp> #include <boost/integer/common_factor_ct.hpp>
@@ -358,4 +360,11 @@ // boost::simple_segregated_storage
@@ -355,6 +357,13 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
return s;
} }
+ size_type max_chunks() const + size_type max_chunks() const
@ -21,27 +38,29 @@ Index: boost/pool/pool.hpp
+ +
static void * & nextof(void * const ptr) static void * & nextof(void * const ptr)
{ //! \returns Pointer dereferenced. { //! \returns Pointer dereferenced.
@@ -377,5 +388,7 @@ //! (Provided and used for the sake of code readability :)
@@ -375,6 +384,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
//! the first time that object needs to allocate system memory. //! the first time that object needs to allocate system memory.
//! The default is 32. This parameter may not be 0. //! The default is 32. This parameter may not be 0.
- //! \param nmax_size is the maximum number of chunks to allocate in one block. //! \param nmax_size is the maximum number of chunks to allocate in one block.
+ //! \param nmax_size is the maximum number of chunks to allocate in one block.
+ set_next_size(nnext_size); + set_next_size(nnext_size);
+ set_max_size(nmax_size); + set_max_size(nmax_size);
} }
@@ -400,7 +413,7 @@ ~pool()
@@ -398,8 +409,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
} }
void set_next_size(const size_type nnext_size) void set_next_size(const size_type nnext_size)
- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
- //! \returns nnext_size. - //! \returns nnext_size.
- next_size = start_size = nnext_size; - next_size = start_size = nnext_size;
+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
+ BOOST_USING_STD_MIN(); + BOOST_USING_STD_MIN();
+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
} }
size_type get_max_size() const size_type get_max_size() const
@@ -410,5 +423,6 @@ { //! \returns max_size.
@@ -407,7 +418,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
}
void set_max_size(const size_type nmax_size) void set_max_size(const size_type nmax_size)
{ //! Set max_size. { //! Set max_size.
- max_size = nmax_size; - max_size = nmax_size;
@ -49,7 +68,9 @@ Index: boost/pool/pool.hpp
+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
} }
size_type get_requested_size() const size_type get_requested_size() const
@@ -713,7 +727,7 @@ { //! \returns the requested size passed into the constructor.
@@ -708,9 +720,9 @@ void * pool<UserAllocator>::malloc_need_resize()
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
if(!max_size) if(!max_size)
- next_size <<= 1; - next_size <<= 1;
@ -59,7 +80,9 @@ Index: boost/pool/pool.hpp
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
// initialize it, // initialize it,
@@ -753,7 +767,7 @@ store().add_block(node.begin(), node.element_size(), partition_size);
@@ -748,9 +760,9 @@ void * pool<UserAllocator>::ordered_malloc_need_resize()
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
if(!max_size) if(!max_size)
- next_size <<= 1; - next_size <<= 1;
@ -69,14 +92,18 @@ Index: boost/pool/pool.hpp
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
// initialize it, // initialize it,
@@ -797,4 +811,6 @@ // (we can use "add_block" here because we know that
@@ -792,6 +804,8 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n)
{ //! Gets address of a chunk n, allocating new memory if not already available.
//! \returns Address of chunk n if allocated ok. //! \returns Address of chunk n if allocated ok.
//! \returns 0 if not enough memory for n chunks. //! \returns 0 if not enough memory for n chunks.
+ if (n > max_chunks()) + if (n > max_chunks())
+ return 0; + return 0;
const size_type partition_size = alloc_size(); const size_type partition_size = alloc_size();
@@ -845,7 +861,7 @@ const size_type total_req_size = n * requested_size;
@@ -840,9 +854,9 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n)
BOOST_USING_STD_MIN(); BOOST_USING_STD_MIN();
if(!max_size) if(!max_size)
- next_size <<= 1; - next_size <<= 1;
@ -86,14 +113,16 @@ Index: boost/pool/pool.hpp
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
// insert it into the list, // insert it into the list,
Index: libs/pool/test/test_bug_6701.cpp // handle border case.
=================================================================== diff --git a/libs/pool/test/test_bug_6701.cpp b/libs/pool/test/test_bug_6701.cpp
--- libs/pool/test/test_bug_6701.cpp (revision 78326) new file mode 100644
+++ libs/pool/test/test_bug_6701.cpp (revision 78326) index 000000000..e484d3c7e
--- /dev/null
+++ b/libs/pool/test/test_bug_6701.cpp
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* Copyright (C) 2012 Étienne Dupuis +/* Copyright (C) 2012 Étienne Dupuis
+* +*
+* Use, modification and distribution is subject to the +* Use, modification and distribution is subject to the
+* Boost Software License, Version 1.0. (See accompanying +* Boost Software License, Version 1.0. (See accompanying
+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) +* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+*/ +*/
@ -109,7 +138,7 @@ Index: libs/pool/test/test_bug_6701.cpp
+ +
+ void *x = p.malloc(); + void *x = p.malloc();
+ BOOST_ASSERT(!x); + BOOST_ASSERT(!x);
+ +
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); + BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); + BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
+ +
@ -118,3 +147,6 @@ Index: libs/pool/test/test_bug_6701.cpp
+ +
+ return 0; + return 0;
+} +}
--
2.31.1

137
boost.spec
View File

@ -1,9 +1,6 @@
%global boost_docdir __tmp_docdir %global boost_docdir __tmp_docdir
%global boost_examplesdir __tmp_examplesdir %global boost_examplesdir __tmp_examplesdir
%global version_enc 1_76_0 %global version_enc 1_77_0
%global toplev_dirname %{name}_%{version_enc}
%global sonamever %{version}
%global python3_lib_version 38
%bcond_with mpich %bcond_with mpich
%bcond_with openmpi %bcond_with openmpi
@ -20,31 +17,27 @@
%bcond_with docs_generated %bcond_with docs_generated
Name: boost Name: boost
Version: 1.76.0 Version: 1.77.0
Release: 1 Release: 1
Summary: The free peer-reviewed portable C++ source libraries Summary: The free peer-reviewed portable C++ source libraries
License: Boost Software license V1.0 License: Boost Software license V1.0
URL: http://www.boost.org URL: http://www.boost.org
Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2 Source0: https://boostorg.jfrog.io/ui/native/main/release/1.77.0/source/%{name}_%{version_enc}.tar.gz
Source1: libboost_thread.so Source1: libboost_thread.so
Source2: bjam Source2: bjam
# https://bugzilla.redhat.com/show_bug.cgi?id=828856 # https://bugzilla.redhat.com/show_bug.cgi?id=828856
# https://bugzilla.redhat.com/show_bug.cgi?id=828857 # https://bugzilla.redhat.com/show_bug.cgi?id=828857
# https://svn.boost.org/trac/boost/ticket/6701 # https://svn.boost.org/trac/boost/ticket/6701
Patch1: boost-1.58.0-pool.patch # https://github.com/boostorg/pool/pull/42
Patch1: boost-1.77-pool-fix-interger-overflows-in-pool-ordered_malloc.patch
# https://svn.boost.org/trac/boost/ticket/9038
Patch2: boost-1.58.0-pool-test_linking.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1318383 # https://bugzilla.redhat.com/show_bug.cgi?id=1318383
Patch3: boost-1.66.0-no-rpath.patch Patch2: boost-1.77-build-drop-rpath.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1899888 # https://bugzilla.redhat.com/show_bug.cgi?id=1899888
# https://github.com/boostorg/locale/issues/52 # https://github.com/boostorg/locale/issues/52
Patch4: boost-1.73-locale-empty-vector.patch Patch3: boost-1.73-locale-empty-vector.patch
Patch9000: regex-fix-dead-loop-in-parse_repeat.patch
Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
Requires: %{name}-chrono%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
@ -586,14 +579,7 @@ Historically, Boost.Jam is based on on FTJam and on Perforce Jam but has grown
a number of significant features and is now developed independently. a number of significant features and is now developed independently.
%prep %prep
%setup -q -n %{toplev_dirname} %autosetup -p1 -n %{name}_%{version_enc}
find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch9000 -p1
%build %build
%if %{with python3} %if %{with python3}
@ -687,8 +673,6 @@ echo ============================= build Boost.Build ==================
: :
%install %install
cd %{_builddir}/%{toplev_dirname}
%if 0%{with openmpi} || 0%{with mpich} %if 0%{with openmpi} || 0%{with mpich}
module purge ||: module purge ||:
%endif %endif
@ -869,145 +853,145 @@ fi
%files contract %files contract
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_contract.so.%{sonamever} %{_libdir}/libboost_contract.so.%{version}
%files atomic %files atomic
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_atomic.so.%{sonamever} %{_libdir}/libboost_atomic.so.%{version}
%files chrono %files chrono
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_chrono.so.%{sonamever} %{_libdir}/libboost_chrono.so.%{version}
%files container %files container
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_container.so.%{sonamever} %{_libdir}/libboost_container.so.%{version}
%files context %files context
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_context.so.%{sonamever} %{_libdir}/libboost_context.so.%{version}
%files coroutine %files coroutine
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_coroutine.so.%{sonamever} %{_libdir}/libboost_coroutine.so.%{version}
%files date-time %files date-time
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_date_time.so.%{sonamever} %{_libdir}/libboost_date_time.so.%{version}
%files fiber %files fiber
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_fiber.so.%{sonamever} %{_libdir}/libboost_fiber.so.%{version}
%files filesystem %files filesystem
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_filesystem.so.%{sonamever} %{_libdir}/libboost_filesystem.so.%{version}
%files graph %files graph
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_graph.so.%{sonamever} %{_libdir}/libboost_graph.so.%{version}
%files iostreams %files iostreams
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_iostreams.so.%{sonamever} %{_libdir}/libboost_iostreams.so.%{version}
%files json %files json
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_json.so.%{sonamever} %{_libdir}/libboost_json.so.%{version}
%files locale %files locale
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_locale.so.%{sonamever} %{_libdir}/libboost_locale.so.%{version}
%files log %files log
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_log.so.%{sonamever} %{_libdir}/libboost_log.so.%{version}
%{_libdir}/libboost_log_setup.so.%{sonamever} %{_libdir}/libboost_log_setup.so.%{version}
%files math %files math
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_math_c99.so.%{sonamever} %{_libdir}/libboost_math_c99.so.%{version}
%{_libdir}/libboost_math_c99f.so.%{sonamever} %{_libdir}/libboost_math_c99f.so.%{version}
%{_libdir}/libboost_math_c99l.so.%{sonamever} %{_libdir}/libboost_math_c99l.so.%{version}
%{_libdir}/libboost_math_tr1.so.%{sonamever} %{_libdir}/libboost_math_tr1.so.%{version}
%{_libdir}/libboost_math_tr1f.so.%{sonamever} %{_libdir}/libboost_math_tr1f.so.%{version}
%{_libdir}/libboost_math_tr1l.so.%{sonamever} %{_libdir}/libboost_math_tr1l.so.%{version}
%files nowide %files nowide
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_nowide.so.%{sonamever} %{_libdir}/libboost_nowide.so.%{version}
%if %{with python3} %if %{with python3}
%files numpy3 %files numpy3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy%{python3_lib_version}.so.%{sonamever} %{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{version}
%files python3 %files python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_python%{python3_lib_version}.so.%{sonamever} %{_libdir}/libboost_python%{python3_version_nodots}.so.%{version}
%files python3-devel %files python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy%{python3_lib_version}.so %{_libdir}/libboost_numpy%{python3_version_nodots}.so
%{_libdir}/libboost_python%{python3_lib_version}.so %{_libdir}/libboost_python%{python3_version_nodots}.so
%endif %endif
%files test %files test
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_prg_exec_monitor.so.%{sonamever} %{_libdir}/libboost_prg_exec_monitor.so.%{version}
%{_libdir}/libboost_unit_test_framework.so.%{sonamever} %{_libdir}/libboost_unit_test_framework.so.%{version}
%files program-options %files program-options
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_program_options.so.%{sonamever} %{_libdir}/libboost_program_options.so.%{version}
%files random %files random
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_random.so.%{sonamever} %{_libdir}/libboost_random.so.%{version}
%files regex %files regex
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_regex.so.%{sonamever} %{_libdir}/libboost_regex.so.%{version}
%files serialization %files serialization
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_serialization.so.%{sonamever} %{_libdir}/libboost_serialization.so.%{version}
%{_libdir}/libboost_wserialization.so.%{sonamever} %{_libdir}/libboost_wserialization.so.%{version}
%files stacktrace %files stacktrace
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever} %{_libdir}/libboost_stacktrace_addr2line.so.%{version}
%{_libdir}/libboost_stacktrace_basic.so.%{sonamever} %{_libdir}/libboost_stacktrace_basic.so.%{version}
%{_libdir}/libboost_stacktrace_noop.so.%{sonamever} %{_libdir}/libboost_stacktrace_noop.so.%{version}
%files system %files system
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_system.so.%{sonamever} %{_libdir}/libboost_system.so.%{version}
%files thread %files thread
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_thread.so.%{sonamever} %{_libdir}/libboost_thread.so.%{version}
%files timer %files timer
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_timer.so.%{sonamever} %{_libdir}/libboost_timer.so.%{version}
%files type_erasure %files type_erasure
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_type_erasure.so.%{sonamever} %{_libdir}/libboost_type_erasure.so.%{version}
%files wave %files wave
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_wave.so.%{sonamever} %{_libdir}/libboost_wave.so.%{version}
%files help %files help
%doc %{boost_docdir}/* %doc %{boost_docdir}/*
%files devel %files devel
%exclude %{_libdir}/libboost_numpy%{python3_lib_version}.so %exclude %{_libdir}/libboost_numpy%{python3_version_nodots}.so
%exclude %{_libdir}/libboost_python%{python3_lib_version}.so %exclude %{_libdir}/libboost_python%{python3_version_nodots}.so
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/*.so %{_libdir}/*.so
@ -1026,7 +1010,7 @@ fi
%files openmpi %files openmpi
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_mpi.so.%{version}
%files openmpi-devel %files openmpi-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
@ -1037,24 +1021,24 @@ fi
%files openmpi-python3 %files openmpi-python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_lib_version}.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version}
%{python3_sitearch}/openmpi/boost/ %{python3_sitearch}/openmpi/boost/
%files openmpi-python3-devel %files openmpi-python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_lib_version}.so %{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so
%endif %endif
%files graph-openmpi %files graph-openmpi
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{version}
%endif %endif
%if 0%{with mpich} %if 0%{with mpich}
%files mpich %files mpich
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi.so.%{sonamever} %{_libdir}/mpich/lib/libboost_mpi.so.%{version}
%files mpich-devel %files mpich-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
@ -1065,18 +1049,18 @@ fi
%files mpich-python3 %files mpich-python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python%{python3_lib_version}.so.%{sonamever} %{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version}
%{python3_sitearch}/mpich/boost/ %{python3_sitearch}/mpich/boost/
%files mpich-python3-devel %files mpich-python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python%{python3_lib_version}.so %{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so
%endif %endif
%files graph-mpich %files graph-mpich
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_graph_parallel.so.%{sonamever} %{_libdir}/mpich/lib/libboost_graph_parallel.so.%{version}
%endif %endif
@ -1095,6 +1079,9 @@ fi
%{_mandir}/man1/bjam.1* %{_mandir}/man1/bjam.1*
%changelog %changelog
* Wed Sep 15 2021 Liu Zixian <liuzixian4@huawei.com> - 1.77.0-1
- update to 1.77.0
* Sat Jul 24 2021 Liu Zixian <liuzixian4@huawei.com> - 1.76.0-1 * Sat Jul 24 2021 Liu Zixian <liuzixian4@huawei.com> - 1.76.0-1
- update to 1.76.0 - update to 1.76.0

BIN
boost_1_76_0.tar.bz2 → boost_1_77_0.tar.gz
View File

Binary file not shown.

33
regex-fix-dead-loop-in-parse_repeat.patch
View File

@ -1,33 +0,0 @@
From 91107fe78a290a7d25a042fec09ea89f14f480d9 Mon Sep 17 00:00:00 2001
From: xuhuijie <xuhuijie2@huawei.com>
Date: Wed, 16 Jun 2021 15:47:22 +0800
Subject: [PATCH] regex: fix dead loop in parse_repea
There is a bug in parse_repeat(), after deal with comment the
contin value will be always true. So we enter a dead loop. To deal with this,
we assign contin to false each time we enter the loop.
Testcase: boost::regex(std::string("1?+(?#)1"))
Signed-off-by: Xu Huijie <xuhuijie2@huawei.com>
---
boost/regex/v4/basic_regex_parser.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/boost/regex/v4/basic_regex_parser.hpp b/boost/regex/v4/basic_regex_parser.hpp
index 6c7065f05..de22f7000 100644
--- a/boost/regex/v4/basic_regex_parser.hpp
+++ b/boost/regex/v4/basic_regex_parser.hpp
@@ -1080,9 +1080,10 @@ bool basic_regex_parser<charT, traits>::parse_repeat(std::size_t low, std::size_
// Check for illegal following quantifier, we have to do this here, because
// the extra states we insert below circumvents our usual error checking :-(
//
- bool contin = false;
+ bool contin;
do
{
+ contin = false;
if ((this->flags() & (regbase::main_option_type | regbase::mod_x | regbase::no_perl_ex)) == regbase::mod_x)
{
// whitespace skip:
--
2.23.0