From b3f2504c1d05b5999b74b2135860fc721e3adf68 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 07:41:50 +0100 Subject: gentoo auto-resync : 15:07:2022 - 07:41:50 --- dev-util/Manifest.gz | Bin 67796 -> 67808 bytes dev-util/gn/Manifest | 2 + dev-util/gn/gn-0.2049.ebuild | 64 ++++++++++++ dev-util/google-perftools/Manifest | 2 + .../google-perftools/google-perftools-2.10.ebuild | 116 +++++++++++++++++++++ dev-util/samurai/Manifest | 6 +- .../files/samurai-1.2-null_pointer_fix.patch | 36 ++++++- dev-util/samurai/samurai-1.2-r1.ebuild | 32 ------ dev-util/samurai/samurai-1.2-r2.ebuild | 32 ++++++ dev-util/samurai/samurai-9999.ebuild | 4 +- 10 files changed, 256 insertions(+), 38 deletions(-) create mode 100644 dev-util/gn/gn-0.2049.ebuild create mode 100644 dev-util/google-perftools/google-perftools-2.10.ebuild delete mode 100644 dev-util/samurai/samurai-1.2-r1.ebuild create mode 100644 dev-util/samurai/samurai-1.2-r2.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 01ad964160b1..1bffbd14657f 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest index ab64f6726d45..0f286d5fb5fc 100644 --- a/dev-util/gn/Manifest +++ b/dev-util/gn/Manifest @@ -1,4 +1,6 @@ AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971 DIST gn-0.1943.tar.xz 706792 BLAKE2B 51889ad85e86e702c2690c5c23010d666ef0467be92d982e6dea2eec2e20774c04425900cad64672c7782bf36e62984e612c04ff0f1c7e9598f2877270cf8504 SHA512 4e3270e13e35fa0ede3c81b563b72a9e9baee18b6412d32603d3c7a327315ceea86dc28c9c3b01c9e9f4d520e222dfeabe152f946eb0947d9285359568934864 +DIST gn-0.2049.tar.xz 727960 BLAKE2B fe93d09c1fa5b6267a4d26f37ec42e629b36645ef58bf6ebcc07dd8cd2ee9509c1e997182251a3e2c3ef3c5b7d636c9a8228c1e49d1d7245b3ebdac36e7c5a1a SHA512 f3e6dc87d647702c5d22793e2eed3e9950f8c9a6d7178eae67bb7d6518b6533c74fa3f43245fb9e422994a27f1a0f1986709f91e7ce2ed78eb5f17838f75e1db EBUILD gn-0.1943.ebuild 1294 BLAKE2B 702eebb55f4f625f6cf649a865e6801bb541249fe4d8abfbb2b4254dfb6557e8321304664ffe144794454014a6854ade8f90bca903568cb9a3aa41ff07947469 SHA512 28eac75e4ecd6d4e2323ce1ec9161ee5d80e10b1706edd6931ab9c5169b8c68d7e33af3aa9c061cd1f2c9397e312e82ec079d43846f83da1c0132d32393610bc +EBUILD gn-0.2049.ebuild 1319 BLAKE2B 414ac7c17df00df8bc64a40a211ad3b07b1a33cf34946e2aff3205d4391f1bb6a6c5a7dc223b47b80438d8235a6f7c17f00bd1a29cf84df2cd4889022863865f SHA512 8d330d34745688f8005745a769df4b5b3e2b198aa85a503bc6bb924f5cab5920a641bdf51b68262555b21db240f303cb93c77bee80f9f3a7730aaf04431bca20 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf diff --git a/dev-util/gn/gn-0.2049.ebuild b/dev-util/gn/gn-0.2049.ebuild new file mode 100644 index 000000000000..e8ce49ec53a2 --- /dev/null +++ b/dev-util/gn/gn-0.2049.ebuild @@ -0,0 +1,64 @@ +# Copyright 2018-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit ninja-utils python-any-r1 toolchain-funcs + +DESCRIPTION="GN is a meta-build system that generates build files for Ninja" +HOMEPAGE="https://gn.googlesource.com/" +SRC_URI="https://dev.gentoo.org/~xen0n/distfiles/dev-util/gn/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="vim-syntax" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/ninja +" + +PATCHES=( + "${FILESDIR}"/gn-gen-r5.patch +) + +pkg_setup() { + : +} + +src_configure() { + python_setup + tc-export AR CC CXX + unset CFLAGS + set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings + echo "$@" >&2 + "$@" || die + cat >out/last_commit_position.h <<-EOF || die + #ifndef OUT_LAST_COMMIT_POSITION_H_ + #define OUT_LAST_COMMIT_POSITION_H_ + #define LAST_COMMIT_POSITION_NUM ${PV##0.} + #define LAST_COMMIT_POSITION "${PV}" + #endif // OUT_LAST_COMMIT_POSITION_H_ + EOF +} + +src_compile() { + eninja -C out gn +} + +src_test() { + eninja -C out gn_unittests + out/gn_unittests || die +} + +src_install() { + dobin out/gn + einstalldocs + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles + doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} + fi +} diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest index 06240fee46cc..2157c5b56aad 100644 --- a/dev-util/google-perftools/Manifest +++ b/dev-util/google-perftools/Manifest @@ -1,4 +1,6 @@ AUX google-perftools-2.9.1-disable-generic-dynamic-tls.patch 1429 BLAKE2B 69dfc7f24fe7d765f4ad6e118ff4b78de070bd471a92ab19bf7349addfc8ce477e14513bada0168fce675aac75e413d26319a784f0ecd5fbfc7e4750b4b1a35e SHA512 a85a631761df4e5a0d38f2e1ce9cb48f3299bb83f7b73cefe872d31f2cf08ec0fffe2c5918dd6e769d83a726404bf94c72857a3870a8823d4dea12d686a4bbd8 +DIST gperftools-2.10.tar.gz 926512 BLAKE2B e92fb751f9e695d21edf5fce443f3d3641fcff15cbd6b5d868bc77fbe622594be824b75c8d45513c7f82b9e574c690133b8502d4574162948a77886d5166b92d SHA512 4400711723be9401f519d85b3b69c026e4715473cbed48ab0573df17abdf895fb971ee969875fe5127a2e8b9aba90d858285e50c8e012384c2c36d5a76b1f0c4 DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab +EBUILD google-perftools-2.10.ebuild 3144 BLAKE2B f29dbf09225f703bc54aaf54ecb1589d2f7cb5b763f0338737d0bd0aeb41ac31d639a429471751e5f7377d9c03f08fbe8b7f6fc8f828d756b3bc8f46dac6244e SHA512 a366994f9e076f0570a9f2e00cfae288db927a7b109d9c89f465d28820ea405168b404a392359e0dbbab3e6eefadd47d8ea2b5d93ec3393afbac780eae0fd009 EBUILD google-perftools-2.9.1-r2.ebuild 3138 BLAKE2B ce4ec06f068b4b4b3ed05000e4f6549c33b94dd0f204e94a22289d7c4b3b2c38270978905a7a26036a912b8665ae6cccf47dddd894287206919deec5d2d88d6c SHA512 2c0ef217d45aa7a31b427637ac32d3959ab5cb838a6bbccc9978a9bab2d263f487a3ba49a50e96658a9b3a64511d52589dafadf4435160d351161779f992d1c3 MISC metadata.xml 1129 BLAKE2B 441935f9605b2c11fb02f4698375b87cdf7a30596f36c5d069ef3bec2599181bc91321b0bbea21f0841d2abdcca58aa1a4732d486bc5719b90f4eb6558fc2404 SHA512 624d8b8fcf555aa62b57c32443eef40fa350ffe346f84dadb33bcb8c8dc192749deee2ca01e121ac82d4e349bcc179af0f897a4b6b696741aefe01ce79abe916 diff --git a/dev-util/google-perftools/google-perftools-2.10.ebuild b/dev-util/google-perftools/google-perftools-2.10.ebuild new file mode 100644 index 000000000000..42f067fa0ced --- /dev/null +++ b/dev-util/google-perftools/google-perftools-2.10.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="gperftools-${PV}" +inherit flag-o-matic autotools vcs-snapshot multilib-minimal + +DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE="https://github.com/gperftools/gperftools" +SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0/4" +# contains ASM code, with support for +# freebsd x86/amd64 +# linux amd64/arm/arm64/ppc/ppc64/riscv/x86 +# OSX ppc/amd64 +# AIX ppc/ppc64 +KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +IUSE="largepages largepages64k +debug minimal optimisememory test static-libs" + +RESTRICT="!test? ( test )" + +# TODO: remove the riscv special case once either libunwind has begun supporting this arch +# or this package allows using llvm-libunwind for other arches +DEPEND="!ppc64? ( + riscv? ( sys-libs/llvm-libunwind:= ) + !riscv? ( sys-libs/libunwind:= ) +)" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # Please keep this if possible on bumps, check Fedora if needs rebasing + # Allows correct functionality on e.g. arm64, bug #818871 + "${FILESDIR}"/${PN}-2.9.1-disable-generic-dynamic-tls.patch +) + +pkg_setup() { + # set up the make options in here so that we can actually make use + # of them on both compile and install. + + # Avoid building the unit testing if we're not going to execute + # tests; this trick here allows us to ignore the tests without + # touching the build system (and thus without rebuilding + # autotools). Keep commented as long as it's restricted. + use test || \ + MAKEOPTS+=" noinst_PROGRAMS= " +} + +src_prepare() { + default + + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES + use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K + use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW + append-flags -fno-strict-aliasing -fno-omit-frame-pointer + + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + $(use_enable debug debugalloc) + ) + + if [[ ${ABI} == x32 ]]; then + myeconfargs+=( --enable-minimal ) + else + myeconfargs+=( $(use_enable minimal) ) + fi + + if use arm64 || use s390; then + # Use the same arches for disabling TLS (thread local storage) + # as Fedora, but we might need to expand this list if we get + # more odd segfaults in consumers like in bug #818871. + myeconfargs+=( --disable-general-dynamic-tls ) + fi + + econf "${myeconfargs[@]}" +} + +src_test() { + if has sandbox ${FEATURES}; then + ewarn "Unable to run tests when sandbox is enabled." + ewarn "See https://bugs.gentoo.org/290249" + return 0 + fi + + multilib-minimal_src_test +} + +src_install() { + if ! use minimal && has x32 ${MULTILIB_ABIS}; then + MULTILIB_WRAPPED_HEADERS=( + /usr/include/gperftools/heap-checker.h + /usr/include/gperftools/heap-profiler.h + /usr/include/gperftools/stacktrace.h + /usr/include/gperftools/profiler.h + ) + fi + + multilib-minimal_src_install +} + +multilib_src_install_all() { + einstalldocs + + use static-libs || find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-util/samurai/Manifest b/dev-util/samurai/Manifest index 8dff97ee5bde..a75ab4b76e9d 100644 --- a/dev-util/samurai/Manifest +++ b/dev-util/samurai/Manifest @@ -1,5 +1,5 @@ -AUX samurai-1.2-null_pointer_fix.patch 758 BLAKE2B c476434d74927d78dbd8f97e3d3e588abee22fc5650b40ead47b5b08e5dee6029253c54047f7f78f611e0ba3008c13b77775727ee547aee6d8bab5d56e99c80e SHA512 0504b137fc9ac113453075a22bdfac4ab7616f668e640b7125041400729aaecad1173c528934223246035f68a95d92c6a85e62d1ea5fea996d85647cb33483eb +AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225 -EBUILD samurai-1.2-r1.ebuild 719 BLAKE2B 083a7a57c20ee650cdcd23063e2d4cf21a7b72e8bad821809429ef0f74cc8dc4f037af3bd5c578d90d9fa71f05ddd268b31ad683854e8caeb2f27f24d852e27d SHA512 f2a98101f6835a85642105633256dc62d443bc9e3fd264cbfba6c5e32ca4fd8dbc3d76ed7a5c68131045fbd0d82115c27037fc852bf4c5b35bfe4b13cd2109e8 -EBUILD samurai-9999.ebuild 655 BLAKE2B 758ccc46bbc5975620bfb9f07fc229c761318794a3db4637efe018f780eba4bcf86fd946e21d09ef4e60dcbfa449990012fd4a64f51afb0935f20946b60a185a SHA512 5b72cb8d504c2abddea126375cb7d1c3283f4b172e1d2288f838d53d2477b0ef270ec74fbbd089a48df21112ba5de6822ab349a5b33da409815e6bfda0b1f29b +EBUILD samurai-1.2-r2.ebuild 725 BLAKE2B 505faf54c1b00aa5f3b7e1ea47346baf341f250d699c01c4e577ce3c6235e2b6d5075b39109a221a1cb760dffde0e50e0f84be372d18906663c18aa4c5b6aaf4 SHA512 e1eb5941b90e176a32038ac0125cf0c7634d3a8278ae166fc354049ecbd2b29bd35cf177c54c5287398ce9878487c95e900c0be9481ca5f74443eb87989e035f +EBUILD samurai-9999.ebuild 660 BLAKE2B 07025a4190abf3106c4616c32728c375a567bc369c7bc41da0128b0880b077879c55e57e7fe37e4de280d8c4c3d9f063846d67b352507a2daab3f75bb3aaef4e SHA512 c589c262cf3b6c76c7be16c78ba945cd20b4a5d3f7fc08220ec68d9271f35ad9b7c54eb3123bb69696e86040e9b3eda8bbed9ba7c93c66b2c2c7aff788c4b586 MISC metadata.xml 450 BLAKE2B 0c3c483cfd71441603a81d9c1c6015336ad104d14a6db7d77819dda52e7b3a58e141e82808b636f430ef501f8f7dbc96b48a56e41f79327ad8d458f42fef4c92 SHA512 511af6f135b9cce7f5fb8e66c583e398479e9639b42f26d63cd01937a5976317e8d9e5949f03cd36d908192a9a4413680872ca99aa6b9e8d882eaeaf1069e1b6 diff --git a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch index fbc97b03d478..76ffc8cd350f 100644 --- a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch +++ b/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch @@ -1,3 +1,37 @@ +CVE-2021-30218 + CVE-2021-30219 +Bug: https://bugs.gentoo.org/786951 + +Upstream-Commit: https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918 +From e84b6d99c85043fa1ba54851ee500540ec206918 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 2 Apr 2021 17:27:48 -0700 +Subject: [PATCH] util: Check for NULL string in writefile + +This check was there previously, but was removed in f549b757 with +the addition of a check during parse that every rule has rspfile +if and only if it has rspfile_content. However, this fails to +consider the possibility of those variables coming from the edge +or global environment. So, re-add the check. + +Fixes #67 (https://github.com/michaelforney/samurai/issues/67). +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index ea5c3ce..2a59881 100644 +--- a/util.c ++++ b/util.c +@@ -258,7 +258,7 @@ writefile(const char *name, struct string *s) + return -1; + } + ret = 0; +- if (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0) { ++ if (s && (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0)) { + warn("write %s:", name); + ret = -1; + } +Upstream-Commit: https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655 From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 4 Apr 2021 03:50:09 -0700 @@ -6,7 +40,7 @@ Subject: [PATCH] parse: Check for non-empty command/rspfile/rspfile_content This matches ninja behavior and prevents the possibility of a rule with an empty (NULL) command string. -Fixes #68. +Fixes #68 (https://github.com/michaelforney/samurai/issues/68). --- parse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-util/samurai/samurai-1.2-r1.ebuild b/dev-util/samurai/samurai-1.2-r1.ebuild deleted file mode 100644 index c2072fc277b1..000000000000 --- a/dev-util/samurai/samurai-1.2-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="ninja-compatible build tool written in C" -HOMEPAGE="https://github.com/michaelforney/samurai" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/michaelforney/samurai.git" -else - SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="ISC Apache-2.0 MIT" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${P}-null_pointer_fix.patch" #786957 -) - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc README.md -} diff --git a/dev-util/samurai/samurai-1.2-r2.ebuild b/dev-util/samurai/samurai-1.2-r2.ebuild new file mode 100644 index 000000000000..5a7727cbbf8c --- /dev/null +++ b/dev-util/samurai/samurai-1.2-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="ninja-compatible build tool written in C" +HOMEPAGE="https://github.com/michaelforney/samurai" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/michaelforney/samurai.git" +else + SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="ISC Apache-2.0 MIT" +SLOT="0" + +PATCHES=( + "${FILESDIR}/${P}-null_pointer_fix.patch" # 786951 +) + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dodoc README.md +} diff --git a/dev-util/samurai/samurai-9999.ebuild b/dev-util/samurai/samurai-9999.ebuild index 6895ee86fc65..6e723875bada 100644 --- a/dev-util/samurai/samurai-9999.ebuild +++ b/dev-util/samurai/samurai-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs -- cgit v1.2.3