From 4e0f61672a4cd8a3d8afc21e9afc2a7acd849976 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Dec 2022 03:12:12 +0000 Subject: gentoo auto-resync : 07:12:2022 - 03:12:11 --- dev-libs/Manifest.gz | Bin 95825 -> 95832 bytes dev-libs/boost/Manifest | 3 - .../boost/files/boost-1.79.0-CVE-2012-2677.patch | 121 --------------------- .../files/boost-1.79.0-disable_icu_rpath.patch | 29 ----- .../files/boost-1.79.0-fix-mips1-transition.patch | 39 ------- dev-libs/leatherman/Manifest | 2 - dev-libs/leatherman/leatherman-1.12.7.ebuild | 56 ---------- 7 files changed, 250 deletions(-) delete mode 100644 dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch delete mode 100644 dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch delete mode 100644 dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch delete mode 100644 dev-libs/leatherman/leatherman-1.12.7.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 13cad8f5025a..489873412a76 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 7c3b3f286b28..638661cc6468 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,9 +1,6 @@ -AUX boost-1.79.0-CVE-2012-2677.patch 4694 BLAKE2B 1bebe2393b61f2e43af4af28ca338711e63d968dc66fcbf9a656a1e6a6efc5f1c2aada7789b42d002bee56b06c8d0a4d78aead914b2e59d4cee2760a347ca66f SHA512 8a92bec0db2814d887d392cad7897fc7f43de7316f2823618446b8eee5a2f3a93639d5c317650956462b50f04457c447931110cb927b34251888de1b7f1a08ca AUX boost-1.79.0-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2 AUX boost-1.79.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b481576a08138be826f7383a689a6c0725d491a244dc8697fc39fac1a79e4639ba51b3a3eb7ee2f2e11a20883de0ecd3dd3c2fc2c9cd SHA512 28952e7cd791678be0963beb0a29e3e40b54a8c3618c66a8b8d21ab63c414771cfa1e9961f08c0b3818bd4c311c122e777109e15002a71230b0c3c9dbc4d6075 AUX boost-1.79.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf -AUX boost-1.79.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0 -AUX boost-1.79.0-fix-mips1-transition.patch 1623 BLAKE2B c44ed1a6eaf89e30c4150b42e5b26cebc8742b2446939cd3310c45a5f4c6c6d6bd84ef72f2a47991cea8a664296854651d857609a8f5500e283176de99d68dfd SHA512 aec8ddd77e25e5549c12099e57c66354baa9da79188ee7a054e98b5ad9d7f8510e7f00ccd8fd3e50d004f184ea6e3ef62f815e05db16740d286171dce2d83929 AUX boost-1.80.0-disable_icu_rpath.patch 632 BLAKE2B f7bccbc7cf00a6c3a6eb63bddb049647c958592c4768d0a8868b7b03f02e37de54722da930340fa91c5b3b3ba1f44b1c4e0b28525c8ccf19f643dbe4b3d0561b SHA512 21c9afc7f8c6095476b075f78f3af7e8afaf50f33ec8166b5a11ed7d778c80e3a81c8ef04a20d8878a7bb47ba9cb947f7688de52fa7598497866d76fcb678f05 AUX boost-1.80.0-fix-mips1-transition.patch 1041 BLAKE2B 03ac38ed4d403f1d75a3ade98076593e93336c77e807ab2ce0f5b9393bb2f7dd59c56a9e0fba647825eca0310e2e3f9eacd52eff17f8363cb76c9559413612c5 SHA512 a61e75322486e1e09efcf2e8f3d341c600c6b871d15ac3478573758b33cf7e9752a8576d4e02c4331dc38d568fb3386e733826502c6183aea2e1e90d9283c1a2 AUX boost-1.80.0-python3.11.patch 1285 BLAKE2B 070def79a53193d7e181060da15d072fb94e371b9d9358546e8f4d9fb9159d03ffc0b69e83fea92cf1c0cbade26e4c3b0f0e0ef5068ae58c9885bc021c25b5d6 SHA512 b3ef223668d2e1aa3e14efb0a1bca8ac323d00eab62d5d4f8d3144dff68e1c99a6d32de98f953e3c712f2b173fbc69a81d10f6d8747ab0ba301e049cbb92e9f8 diff --git a/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch b/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch deleted file mode 100644 index 5dfbf85bc63f..000000000000 --- a/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch +++ /dev/null @@ -1,121 +0,0 @@ -https://src.fedoraproject.org/rpms/boost/raw/master/f/boost-1.58.0-pool.patch -https://bugzilla.redhat.com/show_bug.cgi?id=828856 -https://bugs.gentoo.org/620468 -https://svn.boost.org/trac10/ticket/6701 - ---- a/boost/pool/pool.hpp -+++ b/boost/pool/pool.hpp -@@ -27,4 +27,6 @@ - #include - -+// std::numeric_limits -+#include - // boost::integer::static_lcm - #include -@@ -356,4 +358,11 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = integer::static_lcm::value + sizeof(size_type); -+ return (std::numeric_limits::max() - POD_size) / alloc_size(); -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -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. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -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. -- //! \returns 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(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -408,5 +419,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -709,7 +721,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- 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, -@@ -749,7 +761,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- 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, -@@ -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(); -@@ -841,7 +855,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- 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, ---- 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 -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include -+#include -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch deleted file mode 100644 index 32faf8d0eb31..000000000000 --- a/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/libs/locale/build/Jamfile.v2 -+++ b/libs/locale/build/Jamfile.v2 -@@ -65,8 +65,8 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; -- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; -+ ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) shared ; -+ ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) shared ; - } - else - { -@@ -124,7 +124,6 @@ - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared -- $(ICU_PATH)/bin - shared ; - - -@@ -183,7 +182,6 @@ - icuuc_64/shared/shared - icudt_64/shared/shared - icuin_64/shared/shared -- $(ICU_PATH)/bin64 - shared ; - - diff --git a/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch b/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch deleted file mode 100644 index 81b29ac6cac1..000000000000 --- a/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and -https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming. - ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -634,7 +634,7 @@ rule address-model ( ) - return @boostcpp.deduce-address-model ; - } - --local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; -+local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; - feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; - for a in $(deducable-architectures) - { -@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * ) - { - local result ; - local filtered = [ toolset-properties $(properties) ] ; -- local names = arm mips1 power riscv s390x sparc x86 combined ; -+ local names = arm mips power riscv s390x sparc x86 combined ; - local idx = [ configure.find-builds "default architecture" : $(filtered) - : /boost/architecture//arm -- : /boost/architecture//mips1 -+ : /boost/architecture//mips - : /boost/architecture//power - : /boost/architecture//riscv - : /boost/architecture//s390x ---- a/libs/config/checks/architecture/Jamfile.jam -+++ b/libs/config/checks/architecture/Jamfile.jam -@@ -18,7 +18,8 @@ obj 64 : 64.cpp ; - - obj arm : arm.cpp ; - obj combined : combined.cpp ; --obj mips1 : mips1.cpp ; -+obj mips : mips1.cpp ; -+alias mips1 : mips ; # Backwards compatibility - obj power : power.cpp ; - obj riscv : riscv.cpp ; - obj sparc : sparc.cpp ; diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 59c9c0d577c5..5c1a0a583606 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,10 +1,8 @@ AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486 -DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56 DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad DIST leatherman-1.12.9.tar.gz 816107 BLAKE2B 1c2e50767585a30da40fdacde0aa8655cefc2a41cadd24a7689be5da0afcbe8627293d37780442873907996f01401b46340a3d7be5d9b2a65b2f87191daca6c3 SHA512 e69f2b0c04a1cbd20e097abcc020e7b27fb74f168207fcbcffce9fd0edd1760acc75d5c5f645d3a798f106e129ce73e512f0c11699733475b290dfc876de0565 -EBUILD leatherman-1.12.7.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b EBUILD leatherman-1.12.8.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b EBUILD leatherman-1.12.9.ebuild 1272 BLAKE2B 203a4934e6a2fc4d650e18b9098796b0b3c42127c0bb289b14748d6cdbe308fc4172b053640b4c75b7141a1fcf08b79ca6285be148b5297917dc0a16b42fadc1 SHA512 616ba5f626163adeab958343ddc1d7c11473fe898b6a841d0a6b3a8d878baf084f3fee80d2721c99815e84fb4da3aa6b8fd46e0a2e2a16ae38d6987835816eb7 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2 diff --git a/dev-libs/leatherman/leatherman-1.12.7.ebuild b/dev-libs/leatherman/leatherman-1.12.7.ebuild deleted file mode 100644 index 06e7e264bf51..000000000000 --- a/dev-libs/leatherman/leatherman-1.12.7.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A C++ toolkit" -HOMEPAGE="https://github.com/puppetlabs/leatherman" -SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" -IUSE="debug static-libs test" -#RESTRICT="!test? ( test )" -RESTRICT="test" # restricted til we don't need the shared_nowide patch - -RDEPEND="dev-libs/boost:=[nls] - net-misc/curl" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/portage-sandbox-test-fix.patch - "${FILESDIR}"/1.12.2-shared_nowide.patch -) - -src_prepare() { - sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die - # vendored boost lib conflicts with boost 1.73 and above - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DLEATHERMAN_ENABLE_TESTING=$(usex test) - # We depend on Boost with nls, so this is always true - -DLEATHERMAN_USE_ICU=ON - - -DLEATHERMAN_SHARED=$(usex !static-libs) - ) - - if use debug; then - mycmakeargs+=( - -DCMAKE_BUILD_TYPE=Debug - ) - fi - - cmake_src_configure -} - -src_test() { - "${WORKDIR}/${P}"_build/bin/leatherman_test || die -} -- cgit v1.2.3