From 613ee18483a3556298c093eb09c7f64b88fe584d Mon Sep 17 00:00:00 2001 From: tapplencourt Date: Thu, 19 Sep 2024 10:30:10 -0500 Subject: [PATCH 1/6] add racc --- packages/ruby-nokogiri/package.py | 2 +- packages/ruby-racc/package.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/ruby-racc/package.py diff --git a/packages/ruby-nokogiri/package.py b/packages/ruby-nokogiri/package.py index 041dfa6..3263891 100644 --- a/packages/ruby-nokogiri/package.py +++ b/packages/ruby-nokogiri/package.py @@ -17,5 +17,5 @@ class RubyNokogiri(RubyPackage): version('1.12.5', sha256='2b20905942acc580697c8c496d0d1672ab617facb9d30d156b3c7676e67902ec', expand=False) depends_on('ruby@2.5.0:', type=('build', 'run')) - depends_on('ruby-rake@13.0.0:', type=('build')) + depends_on('ruby-racc@1.8.1:', type=('build','run')) depends_on('ruby-mini-portile2@2.6.1', type=('build', 'run')) diff --git a/packages/ruby-racc/package.py b/packages/ruby-racc/package.py new file mode 100644 index 0000000..1f8e73f --- /dev/null +++ b/packages/ruby-racc/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +class RubyRacc(RubyPackage): + """ Racc is an LALR(1) parser generator. + It is written in Ruby itself, and generates Ruby program.""" + + homepage = "https://rubygems.org/gems/racc" + url = "https://rubygems.org/downloads/racc-1.8.1.gem" + + version('1.8.1', sha256='54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98', expand=False) + + depends_on('ruby@2.5.0:', type=('build', 'run')) From d0238b6f57f0db983045c3a094323f0564195390 Mon Sep 17 00:00:00 2001 From: tapplencourt Date: Thu, 19 Sep 2024 11:21:24 -0500 Subject: [PATCH 2/6] valid hash --- packages/ruby-racc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ruby-racc/package.py b/packages/ruby-racc/package.py index 1f8e73f..cbfd15d 100644 --- a/packages/ruby-racc/package.py +++ b/packages/ruby-racc/package.py @@ -11,6 +11,6 @@ class RubyRacc(RubyPackage): homepage = "https://rubygems.org/gems/racc" url = "https://rubygems.org/downloads/racc-1.8.1.gem" - version('1.8.1', sha256='54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98', expand=False) + version('1.8.1', sha256='4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f', expand=False) depends_on('ruby@2.5.0:', type=('build', 'run')) From bd810d5d1601a09b5def010cab7f42f578503132 Mon Sep 17 00:00:00 2001 From: tapplencourt Date: Thu, 19 Sep 2024 13:15:13 -0500 Subject: [PATCH 3/6] remove dependcy --- packages/ruby-ffi/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ruby-ffi/package.py b/packages/ruby-ffi/package.py index 4bf35dc..5760235 100644 --- a/packages/ruby-ffi/package.py +++ b/packages/ruby-ffi/package.py @@ -14,5 +14,4 @@ class RubyFfi(RubyPackage): version('1.15.4', sha256='56cfca5261ead48688241236adfefb07a000a6d17184d7a4eed48d55b9675d6b', expand=False) - depends_on('ruby-rake@13.0.0:', type=('build')) depends_on('ruby@2.3.0:', type=('build', 'run')) From 7396a63cb8432204b81e359c7ec8b5751ef170c5 Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Thu, 19 Sep 2024 15:54:54 -0500 Subject: [PATCH 4/6] Update bt2 master string patch. --- ...racter-from-stopping-string-decoding.patch | 61 +++++++++++++++++++ packages/babeltrace2/d2d2e6cc_cpp.patch | 16 ----- packages/babeltrace2/package.py | 2 +- 3 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 packages/babeltrace2/0001-Prevent-null-character-from-stopping-string-decoding.patch delete mode 100644 packages/babeltrace2/d2d2e6cc_cpp.patch diff --git a/packages/babeltrace2/0001-Prevent-null-character-from-stopping-string-decoding.patch b/packages/babeltrace2/0001-Prevent-null-character-from-stopping-string-decoding.patch new file mode 100644 index 0000000..7de1d4d --- /dev/null +++ b/packages/babeltrace2/0001-Prevent-null-character-from-stopping-string-decoding.patch @@ -0,0 +1,61 @@ +From d16b0c927b33d9ff24889c9dbde00e9186a010d7 Mon Sep 17 00:00:00 2001 +From: Brice Videau +Date: Thu, 19 Sep 2024 15:48:08 -0500 +Subject: [PATCH] Prevent null character from stopping string decoding. + +--- + src/plugins/ctf/common/src/msg-iter.cpp | 33 +++---------------------- + 1 file changed, 3 insertions(+), 30 deletions(-) + +diff --git a/src/plugins/ctf/common/src/msg-iter.cpp b/src/plugins/ctf/common/src/msg-iter.cpp +index 36e2088b8..fc4082998 100644 +--- a/src/plugins/ctf/common/src/msg-iter.cpp ++++ b/src/plugins/ctf/common/src/msg-iter.cpp +@@ -748,41 +748,14 @@ void MsgIter::_handleBlobRawDataItem(const RawDataItem& item) + + void MsgIter::_handleStrRawDataItem(const RawDataItem& item) + { +- if (_mHaveNullChar) { +- /* No more text data */ +- return; +- } +- + if (_mCurStrFieldEncoding == StrEncoding::Utf8) { +- /* Try to find the first U+0000 codepoint */ +- const auto endIt = std::find(item.data().begin(), item.data().end(), 0); +- _mHaveNullChar = endIt != item.data().end(); +- + /* Append to current string field */ + this->_stackTopCurSubField().asString().append( +- reinterpret_cast(item.data().data()), endIt - item.data().begin()); ++ reinterpret_cast(item.data().data()), ++ item.data().end() - item.data().begin()); + } else { +- /* Try to find the first U+0000 codepoint */ +- auto endIt = item.data().end(); +- const auto afterNullCpIt = bt2c::call([this, &item] { +- if (_mCurStrFieldEncoding == StrEncoding::Utf16Be || +- _mCurStrFieldEncoding == StrEncoding::Utf16Le) { +- return _mUtf16NullCpFinder.findNullCp(item.data()); +- } else { +- BT_ASSERT_DBG(_mCurStrFieldEncoding == StrEncoding::Utf32Be || +- _mCurStrFieldEncoding == StrEncoding::Utf32Le); +- return _mUtf32NullCpFinder.findNullCp(item.data()); +- } +- }); +- +- if (afterNullCpIt) { +- /* Found U+0000 */ +- endIt = *afterNullCpIt; +- _mHaveNullChar = true; +- } +- + /* Append to current string buffer */ +- _mStrBuf.insert(_mStrBuf.end(), item.data().begin(), endIt); ++ _mStrBuf.insert(_mStrBuf.end(), item.data().begin(), item.data().end()); + } + } + +-- +2.39.3 (Apple Git-146) + diff --git a/packages/babeltrace2/d2d2e6cc_cpp.patch b/packages/babeltrace2/d2d2e6cc_cpp.patch deleted file mode 100644 index 97d02a8..0000000 --- a/packages/babeltrace2/d2d2e6cc_cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/ctf/common/src/msg-iter/msg-iter.cpp b/src/plugins/ctf/common/src/msg-iter/msg-iter.cpp -index 5f38ec6c..354080de 100644 ---- a/src/plugins/ctf/common/src/msg-iter/msg-iter.cpp -+++ b/src/plugins/ctf/common/src/msg-iter/msg-iter.cpp -@@ -1924,11 +1924,6 @@ static enum bt_bfcr_status bfcr_unsigned_int_char_cb(uint64_t value, struct ctf_ - goto end; - } - -- if (value == 0) { -- msg_it->done_filling_string = true; -- goto end; -- } -- - string_field = stack_top(msg_it->stack)->base; - BT_ASSERT_DBG(bt_field_get_class_type(string_field) == BT_FIELD_CLASS_TYPE_STRING); - diff --git a/packages/babeltrace2/package.py b/packages/babeltrace2/package.py index 03f6aba..19fbc2c 100644 --- a/packages/babeltrace2/package.py +++ b/packages/babeltrace2/package.py @@ -63,7 +63,7 @@ class Babeltrace2(AutotoolsPackage): # Add varient pour esam patch('d2d2e6cc.patch', when='@:2.0.999') - patch('d2d2e6cc_cpp.patch', when='@2.1:') + patch('0001-Prevent-null-character-from-stopping-string-decoding.patch', when='@2.1:') patch('0db1832.patch', when='@:2.0.4') patch('3079913.patch', when='@:2.0.999') From f997ea305e310971dac4443479279ec6b464c604 Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Thu, 19 Sep 2024 17:22:29 -0500 Subject: [PATCH 5/6] Update userspace rcu version to 0.14.1 --- packages/lttng-tools/package.py | 2 +- packages/userspace-rcu/package.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/lttng-tools/package.py b/packages/lttng-tools/package.py index 7abac78..9324b9c 100644 --- a/packages/lttng-tools/package.py +++ b/packages/lttng-tools/package.py @@ -43,7 +43,7 @@ class LttngTools(AutotoolsPackage): depends_on('libtool', type='build') depends_on('libuuid') depends_on('popt@1.13:') - depends_on('userspace-rcu@0.14.0:', when='@2.14:') + depends_on('userspace-rcu@0.14.1:', when='@2.14:') depends_on('userspace-rcu@0.11.0:', when='@2.11:') depends_on('userspace-rcu@0.9.0:', when='@:2.10.999') depends_on('libxml2@2.7.6:') diff --git a/packages/userspace-rcu/package.py b/packages/userspace-rcu/package.py index c33b485..7df34f1 100644 --- a/packages/userspace-rcu/package.py +++ b/packages/userspace-rcu/package.py @@ -14,6 +14,7 @@ class UserspaceRcu(AutotoolsPackage): homepage = "https://liburcu.org/" url = "https://github.com/urcu/userspace-rcu/archive/v0.11.1.tar.gz" + version('0.14.1', sha256='231acb13dc6ec023e836a0f0666f6aab47dc621ecb1d2cd9d9c22f922678abc0') version('0.14.0', sha256='42fb5129a3fffe5a4b790dfe1ea3a734c69ee095fefbf649326269bba94c262d') version('0.13.3', sha256='2752d58f05859e8d1c458c6d162f03625dcd51c28e65c54fb419f4074bb07a65') version('0.13.2', sha256='312d95376e76068b8cc70347676f1570f4f20b3014862f729dc538a316593824') From 5e615f3963abb1581c4b178b52ad1943b8806510 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 19 Sep 2024 18:22:30 -0500 Subject: [PATCH 6/6] Update package.py --- packages/userspace-rcu/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/userspace-rcu/package.py b/packages/userspace-rcu/package.py index 7df34f1..9f3ae4d 100644 --- a/packages/userspace-rcu/package.py +++ b/packages/userspace-rcu/package.py @@ -14,7 +14,7 @@ class UserspaceRcu(AutotoolsPackage): homepage = "https://liburcu.org/" url = "https://github.com/urcu/userspace-rcu/archive/v0.11.1.tar.gz" - version('0.14.1', sha256='231acb13dc6ec023e836a0f0666f6aab47dc621ecb1d2cd9d9c22f922678abc0') + version('0.14.1', sha256='d8f883c774e1be4fecb216e0ed594fb595ecb04a15720db876ae29a41e198437') version('0.14.0', sha256='42fb5129a3fffe5a4b790dfe1ea3a734c69ee095fefbf649326269bba94c262d') version('0.13.3', sha256='2752d58f05859e8d1c458c6d162f03625dcd51c28e65c54fb419f4074bb07a65') version('0.13.2', sha256='312d95376e76068b8cc70347676f1570f4f20b3014862f729dc538a316593824')