dev-libs/boost: rebase patches

Signed-off-by: David Seifert <soap@gentoo.org>

5 files changed, 12 insertions, 16 deletions

diff --git a/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch b/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
index ff947f74f1c4..5dfbf85bc63f 100644
--- a/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch
+++ b/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
@@ -3,10 +3,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=828856
 https://bugs.gentoo.org/620468
 https://svn.boost.org/trac10/ticket/6701
 
-Index: boost/pool/pool.hpp
-===================================================================
---- a/boost/pool/pool.hpp	(revision 78317)
-+++ b/boost/pool/pool.hpp	(revision 78326)
+--- a/boost/pool/pool.hpp
++++ b/boost/pool/pool.hpp
 @@ -27,4 +27,6 @@
  #include <boost/pool/poolfwd.hpp>
  
@@ -14,7 +12,7 @@ Index: boost/pool/pool.hpp
 +#include <boost/limits.hpp>
  // boost::integer::static_lcm
  #include <boost/integer/common_factor_ct.hpp>
-@@ -358,4 +360,11 @@
+@@ -356,4 +358,11 @@
      }
  
 +    size_type max_chunks() const
@@ -26,7 +24,7 @@ Index: boost/pool/pool.hpp
 +
      static void * & nextof(void * const ptr)
      { //! \returns Pointer dereferenced.
-@@ -377,5 +388,7 @@
+@@ -375,5 +384,7 @@
        //!   the first time that object needs to allocate system memory.
        //!   The default is 32. This parameter may not be 0.
 -      //! \param nmax_size is the maximum number of chunks to allocate in one block.
@@ -35,7 +33,7 @@ Index: boost/pool/pool.hpp
 +      set_max_size(nmax_size);
      }
  
-@@ -400,7 +413,7 @@
+@@ -398,7 +409,7 @@
      }
      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.
@@ -46,7 +44,7 @@ Index: boost/pool/pool.hpp
 +      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
      }
      size_type get_max_size() const
-@@ -410,5 +423,6 @@
+@@ -408,5 +419,6 @@
      void set_max_size(const size_type nmax_size)
      { //! Set max_size.
 -      max_size = nmax_size;
@@ -54,7 +52,7 @@ Index: boost/pool/pool.hpp
 +      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
      }
      size_type get_requested_size() const
-@@ -713,7 +727,7 @@
+@@ -709,7 +721,7 @@
    BOOST_USING_STD_MIN();
    if(!max_size)
 -    next_size <<= 1;
@@ -64,7 +62,7 @@ Index: boost/pool/pool.hpp
 +    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
  
    //  initialize it,
-@@ -753,7 +767,7 @@
+@@ -749,7 +761,7 @@
    BOOST_USING_STD_MIN();
    if(!max_size)
 -    next_size <<= 1;
@@ -74,14 +72,14 @@ Index: boost/pool/pool.hpp
 +    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
  
    //  initialize it,
-@@ -797,4 +811,6 @@
+@@ -793,4 +805,6 @@
    //! \returns Address of chunk n if allocated ok.
    //! \returns 0 if not enough memory for n chunks.
 +  if (n > max_chunks())
 +    return 0;
  
    const size_type partition_size = alloc_size();
-@@ -845,7 +861,7 @@
+@@ -841,7 +855,7 @@
    BOOST_USING_STD_MIN();
    if(!max_size)
 -    next_size <<= 1;
@@ -91,10 +89,8 @@ Index: boost/pool/pool.hpp
 +    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
  
    //  insert it into the list,
-Index: libs/pool/test/test_bug_6701.cpp
-===================================================================
---- a/libs/pool/test/test_bug_6701.cpp	(revision 78326)
-+++ b/libs/pool/test/test_bug_6701.cpp	(revision 78326)
+--- a/libs/pool/test/test_bug_6701.cpp
++++ b/libs/pool/test/test_bug_6701.cpp
 @@ -0,0 +1,27 @@
 +/* Copyright (C) 2012 Étienne Dupuis
 +* 
diff --git a/dev-libs/boost/files/boost-1.73-boost-mpi-python-PEP-328.patch b/dev-libs/boost/files/boost-1.79.0-boost-mpi-python-PEP-328.patch
index 444db2b60952..444db2b60952 100644
--- a/dev-libs/boost/files/boost-1.73-boost-mpi-python-PEP-328.patch
+++ b/dev-libs/boost/files/boost-1.79.0-boost-mpi-python-PEP-328.patch
diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.79.0-build-auto_index-tool.patch
index ca793b9d06eb..ca793b9d06eb 100644
--- a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
+++ b/dev-libs/boost/files/boost-1.79.0-build-auto_index-tool.patch
diff --git a/dev-libs/boost/files/boost-1.71.0-context-x32.patch b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
index 9ee3d545d618..9ee3d545d618 100644
--- a/dev-libs/boost/files/boost-1.71.0-context-x32.patch
+++ b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
diff --git a/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
index 32faf8d0eb31..32faf8d0eb31 100644
--- a/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch