diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/clippy/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/clippy/clippy-7.5.1.ebuild | 36 | ||||
| -rw-r--r-- | dev-util/clippy/clippy-8.0-r1.ebuild | 38 | ||||
| -rw-r--r-- | dev-util/clippy/clippy-8.0.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/trinity/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/trinity/files/trinity-1.9-gcc10_fix.patch | 34 | ||||
| -rw-r--r-- | dev-util/trinity/files/trinity-1.9-include_types_h.patch | 33 | ||||
| -rw-r--r-- | dev-util/trinity/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-util/trinity/trinity-1.9.ebuild | 51 | ||||
| -rw-r--r-- | dev-util/trinity/trinity-9999.ebuild | 46 |
10 files changed, 4 insertions, 251 deletions
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest index a8d0e815dbf3..2bc6fd7faacc 100644 --- a/dev-util/clippy/Manifest +++ b/dev-util/clippy/Manifest @@ -1,3 +1 @@ -DIST clippy-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e DIST clippy-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f -DIST clippy-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a diff --git a/dev-util/clippy/clippy-7.5.1.ebuild b/dev-util/clippy/clippy-7.5.1.ebuild deleted file mode 100644 index 3c82791f374e..000000000000 --- a/dev-util/clippy/clippy-7.5.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="frr-${PV}" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit autotools python-single-r1 - -DESCRIPTION="Standalone clippy tool built from FRR sources" -HOMEPAGE="https://frrouting.org/" -SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" -BDEPEND="sys-devel/flex" - -S="${WORKDIR}/frr-${MY_P}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --enable-clippy-only -} - -src_install() { - dobin lib/clippy -} diff --git a/dev-util/clippy/clippy-8.0-r1.ebuild b/dev-util/clippy/clippy-8.0-r1.ebuild deleted file mode 100644 index 80f02d174db9..000000000000 --- a/dev-util/clippy/clippy-8.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="frr-${PV}" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit autotools python-single-r1 - -DESCRIPTION="Standalone clippy tool built from FRR sources" -HOMEPAGE="https://frrouting.org/" -SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/frr-${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - virtual/libelf:= -" -RDEPEND="${DEPEND}" -BDEPEND="sys-devel/flex" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --enable-clippy-only -} - -src_install() { - dobin lib/clippy -} diff --git a/dev-util/clippy/clippy-8.0.1.ebuild b/dev-util/clippy/clippy-8.0.1.ebuild index 80f02d174db9..d00ad8f3e138 100644 --- a/dev-util/clippy/clippy-8.0.1.ebuild +++ b/dev-util/clippy/clippy-8.0.1.ebuild @@ -17,6 +17,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# standalone clippy does not have any tests +# restrict to prevent bug 811753 +RESTRICT="test" + DEPEND=" ${PYTHON_DEPS} virtual/libelf:= diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest deleted file mode 100644 index 859d43bcd23c..000000000000 --- a/dev-util/trinity/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST trinity-1.9.tar.xz 216364 BLAKE2B dbf5af03539fc7bac37fd49f495e3feb506c7a403f72d0ef0b85327a3714b8edef52260a03dce1082db05d520376d7b96b0f85d541d6dff67e1245b0e1b35fe8 SHA512 3a2ab84b61b450d50e46a5da5dffa803f92bf469fc3d04ff4cb39f26b4f486bede9790bb48fc6b3bbda0ee882f0acf5b610d39e86b16bea7f2207adef94be31a diff --git a/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch b/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch deleted file mode 100644 index 9a17adaebcf9..000000000000 --- a/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8 Mon Sep 17 00:00:00 2001 -From: Vinson Lee <vlee@freedesktop.org> -Date: Thu, 30 Jan 2020 22:09:45 -0800 -Subject: [PATCH] Fix build with GCC 10. - - CC trinity -/usr/bin/ld: debug.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: log-files.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: log.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: main.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: output.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: params.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: shm.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here -/usr/bin/ld: trinity.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here - -Fixes: 13856316c259 ("reinstate the log-to-file code for now.") -Signed-off-by: Vinson Lee <vlee@freedesktop.org> ---- - include/logfile.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/logfile.h b/include/logfile.h -index 90ea8b23..2305ac15 100644 ---- a/include/logfile.h -+++ b/include/logfile.h -@@ -5,7 +5,7 @@ - FILE *find_logfile_handle(void); - void synclogs(void); - --FILE *mainlogfile; -+extern FILE *mainlogfile; - void open_main_logfile(void); - void close_logfile(FILE **handle); - diff --git a/dev-util/trinity/files/trinity-1.9-include_types_h.patch b/dev-util/trinity/files/trinity-1.9-include_types_h.patch deleted file mode 100644 index 0b8318ba2fb9..000000000000 --- a/dev-util/trinity/files/trinity-1.9-include_types_h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 45fdc97620063be4318b9b361482fa1b5463e1d5 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Mon, 18 Nov 2019 10:14:55 +0100 -Subject: [PATCH] modify_ldt: include linux/types.h before ASSEMBLY == 1 - -Otherwise we see a lot of: -In file included from /usr/include/bits/statx.h:30, - from /usr/include/sys/stat.h:446, - from include/files.h:3, - from include/shm.h:6, - from syscalls/x86/modify_ldt.c:12: -/usr/include/linux/stat.h:57:2: error: unknown type name '__s64' - 57 | __s64 tv_sec; - | ^~~~~ -/usr/include/linux/stat.h:58:2: error: unknown type name '__u32' - 58 | __u32 tv_nsec; - | ^~~~~ ---- - syscalls/x86/modify_ldt.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/syscalls/x86/modify_ldt.c b/syscalls/x86/modify_ldt.c -index f2eaf065..0221561a 100644 ---- a/syscalls/x86/modify_ldt.c -+++ b/syscalls/x86/modify_ldt.c -@@ -6,6 +6,7 @@ - */ - #include <stdlib.h> - #include <sys/types.h> -+#include <linux/types.h> /* before __ASSEMBLY__ == 1 */ - #define __ASSEMBLY__ 1 - #include <asm/ldt.h> - #include "sanitise.h" diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml deleted file mode 100644 index b31b0d62e9a9..000000000000 --- a/dev-util/trinity/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/trinity/trinity-1.9.ebuild b/dev-util/trinity/trinity-1.9.ebuild deleted file mode 100644 index ac180ea5a3ad..000000000000 --- a/dev-util/trinity/trinity-1.9.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="A Linux system call fuzz tester" -HOMEPAGE="https://github.com/kernelslacker/trinity/" -SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -# We need newer headers to avoid compilation failures in the BPF stuff. -DEPEND=" - >=sys-kernel/linux-headers-4.8 -" - -PATCHES=( - "${FILESDIR}/${P}-gcc10_fix.patch" - "${FILESDIR}/${P}-include_types_h.patch" -) - -src_prepare() { - sed -e 's/-g -O2//' \ - -e 's/-D_FORTIFY_SOURCE=2//' \ - -e 's/-Werror//' \ - -e '/-o $@/s/$(LDFLAGS) //' \ - -i Makefile || die - - tc-export CC - default -} - -src_compile() { - emake V=1 -} - -src_install() { - dobin ${PN} - dodoc Documentation/* README - doman trinity.1 - - if use examples ; then - exeinto /usr/share/doc/${PF}/scripts - doexe scripts/* - docompress -x /usr/share/doc/${PF}/scripts - fi -} diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild deleted file mode 100644 index 061594cb7681..000000000000 --- a/dev-util/trinity/trinity-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs git-r3 - -EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git" - -DESCRIPTION="A Linux system call fuzz tester" -HOMEPAGE="https://github.com/kernelslacker/trinity/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples" - -# We need newer headers to avoid compilation failures in the BPF stuff. -DEPEND=" - >=sys-kernel/linux-headers-4.8 -" - -src_prepare() { - sed -e 's/-g -O2//' \ - -e 's/-D_FORTIFY_SOURCE=2//' \ - -e 's/-Werror//' \ - -e '/-o $@/s/$(LDFLAGS) //' \ - -i Makefile || die - - tc-export CC - default -} - -src_compile() { - emake V=1 -} - -src_install() { - dobin ${PN} - dodoc Documentation/* README - doman trinity.1 - - if use examples ; then - exeinto /usr/share/doc/${PF}/scripts - doexe scripts/* - docompress -x /usr/share/doc/${PF}/scripts - fi -} |