From 17e5f1ea4a2e1c5664f96480ca46348d008e8711 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 May 2024 00:01:14 +0100 Subject: gentoo auto-resync : 10:05:2024 - 00:01:13 --- dev-util/crash/Manifest | 9 ++-- dev-util/crash/crash-8.0.3-r1.ebuild | 74 -------------------------- dev-util/crash/crash-8.0.4.ebuild | 1 - dev-util/crash/crash-8.0.5.ebuild | 68 +++++++++++++++++++++++ dev-util/crash/crash-9999.ebuild | 1 - dev-util/crash/files/crash-8.0.3-strlcpy.patch | 26 --------- 6 files changed, 72 insertions(+), 107 deletions(-) delete mode 100644 dev-util/crash/crash-8.0.3-r1.ebuild create mode 100644 dev-util/crash/crash-8.0.5.ebuild delete mode 100644 dev-util/crash/files/crash-8.0.3-strlcpy.patch (limited to 'dev-util/crash') diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest index a1301c94c40f..c88b153523b9 100644 --- a/dev-util/crash/Manifest +++ b/dev-util/crash/Manifest @@ -1,9 +1,8 @@ -AUX crash-8.0.3-strlcpy.patch 843 BLAKE2B 6e1fad896042099a63e9f5047cfdafa680cfb2ee08ba0bc5960cf0a836e98a2dd059851cd4dd88688df62c814f6f1c2cd1598a08f8cef37cf40fc7987d4ee1fb SHA512 af927a1fcd39d730bb976fcfc5fb8c8b15962f69d3ef3023900a6876cfd8bbc571be4d56e86a59f992f2eb1945588dc77e9110bedfe60f88de5b372a76b03e2f DIST crash-8.0.3-extra-0.tar.xz 696 BLAKE2B 1a90e1b7ba87188cd438e8f9ca17276986b6fdeee00804a3dadf2979bfab0769bcf7df3bedaba75bdf9297eeb013929ba6ea0b98b228fa51d9a7fa09a77c01cf SHA512 c0f29c3b13ccbbc8a0c3366ec75797501c141e3c9c1085dbea1bec89e1b35b837528fabf0fe031e0cb2d725780bffb71e1f27657e75dd9aa2f0c4bc625d251b2 -DIST crash-8.0.3.tar.gz 1330456 BLAKE2B 0e277033ff16f2080af630fded3a2d458d580c9aafe1303e5cc291d39ca33a10fe942eb8f33308b2734494ad83913df45e8c192a2aab47f4473dffad777b57a2 SHA512 1ce7fda89274051cea02a049a674f2ca43fc02e00121f951af0d4c23c7b74cc79949ec376bb6737f82b95fec0cbe495b53a09df7e5f1f31ee5a829c1d53d0ba0 DIST crash-8.0.4.tar.gz 1339636 BLAKE2B e383e40e16f54c0a0b34d30be784d7c7306b2922e8505067eaf31519707f514fc07dffcfc868b9dd21c6baaa68f9ae3bb6b3e363fa02a7260e1a090649082293 SHA512 a08589026515990eee555af6eeba0457433fe41263512ed67dfcac1cf49a8f61dc794081f4984700d8dfed228440a1d7928fdd1f5cf4ae8a45cf39eb49d3470b +DIST crash-8.0.5.tar.gz 1436933 BLAKE2B a3e940167a83b901d3842d10add29e55f49188a0cc6430f975242c8365742cbb75d7f5f36f26eff51e5bc1a9ac2e893de4631378814cc2b27da3241f5062b788 SHA512 0e199899fcc479eeebd1177a88dfe26725d9f63361d5ff7dbf9cb0f8425d3c6b8d60aada0a4312f61eecfe0ed0cca346034e12accbf5896446db8d9fb7d55e05 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41 -EBUILD crash-8.0.3-r1.ebuild 1861 BLAKE2B 3bca0a6005426df521a48531aa9c96a52e032629bc4f2ba1917d5aa0ba2712957d99a71daf04ff732d5e62326afc6d0026bef976b30a6ae79b770bb2375adbad SHA512 d236e9ebbbd4926eb3afd09226474848f7119b24bebe1e4e1b6d5d9ffd62ac5666cc4d3a5579c6237500b0b40c85867a085a0a802db81f809619ebd6a042f122 -EBUILD crash-8.0.4.ebuild 1753 BLAKE2B ede17a583190a2b6dda52f0c7ab3ec098a05234ff5146d3e80a62b315b9389d7bd914c58ead1b94d4a5fc0c0003665ee91beef458aa17c1b1c4a48a96fab951d SHA512 40f310e72bbb4ac488614e6bb14c4221321e770c741a2d0f6cf143ba532190579efb7ff2b9b68b7cb884032e30314d49f3356ef7300cf7d5b0656fc6409252c8 -EBUILD crash-9999.ebuild 1122 BLAKE2B 5b4d8b2171f8a9dea23a21cfc98200da19ba944a7e70981cc5782ffdee85b63486e0646fecf2959d4f22280d8395a66a1332fe5e63c05adbfa89bad29b4ac099 SHA512 df0b21fb2d02ad7df74963037874be90641efdf34d590323bddb59141b3913d89fad55d392db6ac4907f87fade4c0042444eb6192c9a2e6a3cd50e94aaea3ba6 +EBUILD crash-8.0.4.ebuild 1745 BLAKE2B c5d08fd11d98c741bb0f19b945a8b8721e31449d1ecf3b71813fc168f9e303aeb8602eb1388e65e966000854a2942766f135284e5ab09e918b5a6b9f40ccd12c SHA512 1d1a4541becf4b7dac35caa74393ed5d70ac8f038f21d87ad523826758aa69f2ba54ce97f717be80417cee1992315fe5f191a86aaeffe83957fdf77a11f19a0a +EBUILD crash-8.0.5.ebuild 1745 BLAKE2B c5d08fd11d98c741bb0f19b945a8b8721e31449d1ecf3b71813fc168f9e303aeb8602eb1388e65e966000854a2942766f135284e5ab09e918b5a6b9f40ccd12c SHA512 1d1a4541becf4b7dac35caa74393ed5d70ac8f038f21d87ad523826758aa69f2ba54ce97f717be80417cee1992315fe5f191a86aaeffe83957fdf77a11f19a0a +EBUILD crash-9999.ebuild 1114 BLAKE2B ea3570d055867c724f08ee31be556fc83c289ccdecf6968fa5c2f1e99b86d803c02400cf9fd6d77d4d2fb4a314f29003c46d0b5377f3dd6f32ffd54461b62c4d SHA512 c5d54830d132841377f5ba34d866c20c2dae5cf6c844f511eccb73c7913fd2f92026e7f9250d83cc22c5b19d28ccce11a87c6b243e15c2289265a5ea59b89f4b MISC metadata.xml 725 BLAKE2B aa1069adb8920a1a083071898391a4544489b3ba5d177160e2e0bf53c1bf88da930fe6da700dfca263f4bb381d01194da156b28b6e05d251bd3e9d3b45f6aa21 SHA512 6d5757aae00249a9f62c67c15ac032c9b3275068b14c02f4edeb425910ce1cfaf8a135ef49356e78ba2c836c627b576f4b45bdc8b8f8131d38175d9e22660912 diff --git a/dev-util/crash/crash-8.0.3-r1.ebuild b/dev-util/crash/crash-8.0.3-r1.ebuild deleted file mode 100644 index a7ffd58cb9a5..000000000000 --- a/dev-util/crash/crash-8.0.3-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -GDB_VERSION=10.2 -UPSTREAM_VER= -EXTRA_VER=0 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/crash-utility/crash.git" - SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz" - EGIT_BRANCH="master" - inherit git-r3 -else - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz" - - [[ -n ${EXTRA_VER} ]] && \ - EXTRA_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-extra-${EXTRA_VER}.tar.xz" - - SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ${UPSTREAM_PATCHSET_URI} ${EXTRA_PATCHSET_URI} - mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz" - KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~riscv ~s390 ~x86" -fi - -DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps" -HOMEPAGE="https://crash-utility.github.io/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# there is no "make test" target, but there is a test.c so the automatic -# make rules catch it and tests fail -RESTRICT="test" - -PATCHES=( - # bug 911929, patch already in upstream, drop in next version bump - "${FILESDIR}/${P}-strlcpy.patch" -) - -src_prepare() { - default - - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Crash's Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - if [[ -n ${EXTRA_VER} ]]; then - einfo "Try to apply Crash's Extra patch set" - eapply "${WORKDIR}"/patches-extra - fi - - sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die - ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die -} - -src_configure() { - # bug #858344 - filter-lto - - default -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} diff --git a/dev-util/crash/crash-8.0.4.ebuild b/dev-util/crash/crash-8.0.4.ebuild index 2e850186dedf..74c81736beaa 100644 --- a/dev-util/crash/crash-8.0.4.ebuild +++ b/dev-util/crash/crash-8.0.4.ebuild @@ -32,7 +32,6 @@ HOMEPAGE="https://crash-utility.github.io/" LICENSE="GPL-3" SLOT="0" -IUSE="" # there is no "make test" target, but there is a test.c so the automatic # make rules catch it and tests fail RESTRICT="test" diff --git a/dev-util/crash/crash-8.0.5.ebuild b/dev-util/crash/crash-8.0.5.ebuild new file mode 100644 index 000000000000..74c81736beaa --- /dev/null +++ b/dev-util/crash/crash-8.0.5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +GDB_VERSION=10.2 +UPSTREAM_VER= +EXTRA_VER=0 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/crash-utility/crash.git" + SRC_URI="mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz" + EGIT_BRANCH="master" + inherit git-r3 +else + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz" + + [[ -n ${EXTRA_VER} ]] && \ + EXTRA_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-8.0.3-extra-${EXTRA_VER}.tar.xz" + + SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + ${UPSTREAM_PATCHSET_URI} ${EXTRA_PATCHSET_URI} + mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz" + KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~riscv ~s390 ~x86" +fi + +DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps" +HOMEPAGE="https://crash-utility.github.io/" + +LICENSE="GPL-3" +SLOT="0" +# there is no "make test" target, but there is a test.c so the automatic +# make rules catch it and tests fail +RESTRICT="test" + +src_prepare() { + default + + if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Crash's Upstream patch set" + eapply "${WORKDIR}"/patches-upstream + fi + + if [[ -n ${EXTRA_VER} ]]; then + einfo "Try to apply Crash's Extra patch set" + eapply "${WORKDIR}"/patches-extra + fi + + sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die + ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die +} + +src_configure() { + # bug #858344 + filter-lto + + default +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild index 34c8d94dfb93..19f6c44c6ec3 100644 --- a/dev-util/crash/crash-9999.ebuild +++ b/dev-util/crash/crash-9999.ebuild @@ -22,7 +22,6 @@ HOMEPAGE="https://crash-utility.github.io/" LICENSE="GPL-3" SLOT="0" -IUSE="" # there is no "make test" target, but there is a test.c so the automatic # make rules catch it and tests fail RESTRICT="test" diff --git a/dev-util/crash/files/crash-8.0.3-strlcpy.patch b/dev-util/crash/files/crash-8.0.3-strlcpy.patch deleted file mode 100644 index 0701f99470a8..000000000000 --- a/dev-util/crash/files/crash-8.0.3-strlcpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/defs.h b/defs.h -index 8f7d1fa..26afe23 100644 ---- a/defs.h -+++ b/defs.h -@@ -5553,7 +5553,7 @@ uint32_t swap32(uint32_t, int); - uint64_t swap64(uint64_t, int); - ulong *get_cpumask_buf(void); - int make_cpumask(char *, ulong *, int, int *); --size_t strlcpy(char *, char *, size_t); -+size_t strlcpy(char *, const char *, size_t) __attribute__ ((__weak__)); - struct rb_node *rb_first(struct rb_root *); - struct rb_node *rb_parent(struct rb_node *, struct rb_node *); - struct rb_node *rb_right(struct rb_node *, struct rb_node *); -diff --git a/tools.c b/tools.c -index 392a797..0f2db10 100644 ---- a/tools.c -+++ b/tools.c -@@ -6795,7 +6795,7 @@ make_cpumask_error: - * always be NULL-terminated. - */ - size_t --strlcpy(char *dest, char *src, size_t size) -+strlcpy(char *dest, const char *src, size_t size) - { - size_t ret = strlen(src); - -- cgit v1.2.3