From 5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Oct 2022 01:55:31 +0100 Subject: gentoo auto-resync : 18:10:2022 - 01:55:31 --- dev-util/rr/Manifest | 6 +- dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch | 62 +++++++++++++++++ dev-util/rr/metadata.xml | 2 +- dev-util/rr/rr-5.5.0.ebuild | 68 ------------------ dev-util/rr/rr-5.6.0-r1.ebuild | 80 ++++++++++++++++++++++ 5 files changed, 146 insertions(+), 72 deletions(-) create mode 100644 dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch delete mode 100644 dev-util/rr/rr-5.5.0.ebuild create mode 100644 dev-util/rr/rr-5.6.0-r1.ebuild (limited to 'dev-util/rr') diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest index f0245535c0a4..06b05c800246 100644 --- a/dev-util/rr/Manifest +++ b/dev-util/rr/Manifest @@ -1,5 +1,5 @@ -DIST mozilla-rr-5.5.0.tar.gz 1477110 BLAKE2B d37162ef68b20f1ce7878c338f480e6e1ba1850e37d2c6728705b3ab8791897bfc238c950fd5f318dc2ba0be0df04571888092418b227e396c2c524121ad8345 SHA512 4101de8ccf46533e5fc8e72f99bff39253a40543510d9bc9a611ed0909efcd45a050244994a9ebc878d1c6d0af548ec7e2879d1e737f6455db732f75175ab497 +AUX rr-5.6.0-linux-headers-6.0.patch 2303 BLAKE2B 3f804757bc221617939bcfd128546f2bb66d0bd5ec8efb42a6cd05b0aac6e83513d8df89e7838673bc53228801d83ca57a888701539007b73ab9a734d6e2674f SHA512 21216496235e7d7507d319a0b8489a96f44f711dc0727b6bd1828ac80e1ac174a9bf2c9ced7ccadd0cd6d6af64a7a2b1a3f71a25816bef8b6d6e2f884ecd85eb DIST mozilla-rr-5.6.0.tar.gz 1579320 BLAKE2B 14ea99c4486c72db844b5cad3f0c300d7bf5d49449e7080ed0484f89022be6d9b7f81b3808b65f59028a5256a6b3f6508729d5b7e8f3f45d8353ceb7ae2a577a SHA512 4b5ef65b6c6a4b62fc72949b4541aaf608f6133ea0b6c2e529a8eed725e6a0b5186f20ed60b210821e6929410e1f21723840eacfdc85bf12c87703e7ebf5f9a7 -EBUILD rr-5.5.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680 +EBUILD rr-5.6.0-r1.ebuild 1487 BLAKE2B 3ab41e5c4a3febb41e810b4c2f063c92cf58935632c1def384c81cad64f55aa95469e5bae91dc46820cc1c945946525b43f68cb81c624902defa0801aca2e4c0 SHA512 15e6f1b099e16dcf0deb9b9e3f6ff1199002ff0e41060e51f4fd5f44d6fd8127876c22954eba83b48767792f4f45445766be58c7c19a72178b1e603d4ab4c57d EBUILD rr-5.6.0.ebuild 1426 BLAKE2B 3a342707b60f863d85b32eef3b7692225df1c9ca795aae0e2d3ae454e945f02d915e4452f0edd932d50091aed7dbd7c982c55dd28fdd65aa12dcce9fa7e1825e SHA512 828f8e4e466c8790f8217f59c2b3023a02de5bc0e5065911d438cc95d91c7c0b822189d12c479e0a78db3ed771ca64e4cce5489d00b1b69924e914461443ef92 -MISC metadata.xml 444 BLAKE2B ffed074f3322dfc2fb772a2b5e7056c1899e9f424e41f774a9da86af028322f5e3b4e371fbb624b9448733c30778fcfcf4cd7a54f40148d9db24702d5beb5a6f SHA512 481d21665113f88c355c0097b6ba0980d62570d53eb130096ee8db32c46eaa1e5f8f9746d2f7a9bf1bded5b725d4805d875abb81e2d7cb6e7c3fc8cf472c3274 +MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b diff --git a/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch b/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch new file mode 100644 index 000000000000..36a911bcbece --- /dev/null +++ b/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch @@ -0,0 +1,62 @@ +https://github.com/rr-debugger/rr/commit/2979c60ef8bbf7c940afd90172ddc5d8863f766e +https://github.com/rr-debugger/rr/issues/3369 +https://bugs.gentoo.org/877157 + +From 2979c60ef8bbf7c940afd90172ddc5d8863f766e Mon Sep 17 00:00:00 2001 +From: Robert O'Callahan +Date: Thu, 25 Aug 2022 20:40:59 +1200 +Subject: [PATCH] Avoid creating a struct with elements after + ethtool_sset_info's variable-length-array. + +Resolves #3369 +--- a/src/record_syscall.cc ++++ b/src/record_syscall.cc +@@ -1450,17 +1450,17 @@ template void get_ethtool_gstrings_arch(RecordTask* t) { + AutoRemoteSyscalls remote(t); + + // Do a ETHTOOL_GSSET_INFO to get the number of strings +- struct SingleStringSet { +- ethtool_sset_info et; +- uint32_t data; +- }; +- SingleStringSet sss; +- sss.et.cmd = ETHTOOL_GSSET_INFO; +- sss.et.reserved = 0; +- sss.et.sset_mask = 1 << et_gstrings.string_set; +- AutoRestoreMem sss_mem(remote, &sss, sizeof(sss)); +- +- ifreq.ifr_ifru.ifru_data = sss_mem.get(); ++ ethtool_sset_info et; ++ et.cmd = ETHTOOL_GSSET_INFO; ++ et.reserved = 0; ++ et.sset_mask = 1 << et_gstrings.string_set; ++ std::vector buffer; ++ buffer.resize(sizeof(et) + sizeof(uint32_t)); ++ memcpy(buffer.data(), &et, sizeof(et)); ++ memset(buffer.data() + sizeof(et), 0, sizeof(uint32_t)); ++ AutoRestoreMem et_mem(remote, buffer.data(), buffer.size()); ++ ++ ifreq.ifr_ifru.ifru_data = et_mem.get(); + AutoRestoreMem ifr_mem(remote, &ifreq, sizeof(ifreq)); + + long ret = remote.syscall(regs.original_syscallno(), regs.arg1(), +@@ -1470,8 +1470,7 @@ template void get_ethtool_gstrings_arch(RecordTask* t) { + return; + } + +- sss = t->read_mem(sss_mem.get().cast()); +- ++ uint32_t data = t->read_mem((et_mem.get() + sizeof(et)).cast()); + // Now do the ETHTOOL_GSTRINGS call + ret = remote.syscall(regs.original_syscallno(), regs.arg1(), SIOCETHTOOL, + regs.arg3()); +@@ -1479,7 +1478,7 @@ template void get_ethtool_gstrings_arch(RecordTask* t) { + if (ret < 0) { + return; + } +- t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*sss.data); ++ t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*data); + } + + static void get_ethtool_gstrings(RecordTask* t) { + diff --git a/dev-util/rr/metadata.xml b/dev-util/rr/metadata.xml index 873579e9b8df..dc95c45f1987 100644 --- a/dev-util/rr/metadata.xml +++ b/dev-util/rr/metadata.xml @@ -10,6 +10,6 @@ Luca Barbato - mozilla/rr + rr-debugger/rr diff --git a/dev-util/rr/rr-5.5.0.ebuild b/dev-util/rr/rr-5.5.0.ebuild deleted file mode 100644 index 73cc6777d148..000000000000 --- a/dev-util/rr/rr-5.5.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -CMAKE_BUILD_TYPE=Release - -inherit cmake linux-info python-single-r1 - -DESCRIPTION="Record and Replay Framework" -HOMEPAGE="https://rr-project.org/" -SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz" - -LICENSE="MIT BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="multilib test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - sys-libs/zlib:= - dev-libs/capnproto:= - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - sys-devel/gdb[xml]" -# Add all the deps needed only at build/test time. -DEPEND+=" - test? ( - $(python_gen_cond_dep ' - dev-python/pexpect[${PYTHON_USEDEP}] - ') - sys-devel/gdb[xml] - )" - -RESTRICT="test" # toolchain and kernel version dependent - -pkg_setup() { - if use kernel_linux; then - CONFIG_CHECK="SECCOMP" - linux-info_pkg_setup - fi - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -i 's:-Werror::' CMakeLists.txt || die #609192 -} - -src_test() { - if has usersandbox ${FEATURES} ; then - ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping." - return 0 - fi - - cmake_src_test -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -Ddisable32bit=$(usex !multilib) #636786 - ) - - cmake_src_configure -} diff --git a/dev-util/rr/rr-5.6.0-r1.ebuild b/dev-util/rr/rr-5.6.0-r1.ebuild new file mode 100644 index 000000000000..096ff7b1f8c8 --- /dev/null +++ b/dev-util/rr/rr-5.6.0-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) +CMAKE_BUILD_TYPE=Release + +inherit cmake linux-info python-single-r1 + +DESCRIPTION="Record and Replay Framework" +HOMEPAGE="https://rr-project.org/" +SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz" + +LICENSE="MIT BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="multilib test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + dev-libs/capnproto:= + sys-libs/zlib:= +" +RDEPEND=" + ${DEPEND} + sys-devel/gdb[xml] +" +# Add all the deps needed only at build/test time. +DEPEND+=" + test? ( + $(python_gen_cond_dep ' + dev-python/pexpect[${PYTHON_USEDEP}] + ') + sys-devel/gdb[xml] + )" + +QA_FLAGS_IGNORED=" + usr/lib.*/rr/librrpage.so + usr/lib.*/rr/librrpage_32.so +" + +RESTRICT="test" # toolchain and kernel version dependent + +PATCHES=( + "${FILESDIR}"/${P}-linux-headers-6.0.patch +) + +pkg_setup() { + if use kernel_linux; then + CONFIG_CHECK="SECCOMP" + linux-info_pkg_setup + fi + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i 's:-Werror::' CMakeLists.txt || die #609192 +} + +src_test() { + if has usersandbox ${FEATURES} ; then + ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping." + return 0 + fi + + cmake_src_test +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -Ddisable32bit=$(usex !multilib) #636786 + ) + + cmake_src_configure +} -- cgit v1.2.3