| 1 |
commit: ad1b678690ba50a48fff3ac231747c9dcc043f05 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 14 15:13:26 2019 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 14 15:13:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1b6786 |
| 7 |
|
| 8 |
dev-util/trinity: version bump |
| 9 |
|
| 10 |
Take an orphaned package for a maintenace. |
| 11 |
Update to version 1.9 which fixes bug 669604. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/669604 |
| 14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-util/trinity/Manifest | 1 + |
| 18 |
dev-util/trinity/metadata.xml | 11 +++++++---- |
| 19 |
.../trinity/{trinity-9999.ebuild => trinity-1.9.ebuild} | 15 ++++++++++----- |
| 20 |
dev-util/trinity/trinity-9999.ebuild | 9 +++++++-- |
| 21 |
4 files changed, 25 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest |
| 24 |
index 8a55880f359..dec5c8d1afd 100644 |
| 25 |
--- a/dev-util/trinity/Manifest |
| 26 |
+++ b/dev-util/trinity/Manifest |
| 27 |
@@ -1 +1,2 @@ |
| 28 |
DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4 |
| 29 |
+DIST trinity-1.9.tar.xz 216364 BLAKE2B dbf5af03539fc7bac37fd49f495e3feb506c7a403f72d0ef0b85327a3714b8edef52260a03dce1082db05d520376d7b96b0f85d541d6dff67e1245b0e1b35fe8 SHA512 3a2ab84b61b450d50e46a5da5dffa803f92bf469fc3d04ff4cb39f26b4f486bede9790bb48fc6b3bbda0ee882f0acf5b610d39e86b16bea7f2207adef94be31a |
| 30 |
|
| 31 |
diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml |
| 32 |
index 1d8df37aeeb..7471f506688 100644 |
| 33 |
--- a/dev-util/trinity/metadata.xml |
| 34 |
+++ b/dev-util/trinity/metadata.xml |
| 35 |
@@ -1,8 +1,11 @@ |
| 36 |
<?xml version="1.0" encoding="UTF-8"?> |
| 37 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 38 |
<pkgmetadata> |
| 39 |
- <!-- maintainer-needed --> |
| 40 |
- <upstream> |
| 41 |
- <remote-id type="github">kernelslacker/trinity</remote-id> |
| 42 |
- </upstream> |
| 43 |
+ <maintainer type="person"> |
| 44 |
+ <email>bircoph@g.o</email> |
| 45 |
+ <name>Andrew Savchenko</name> |
| 46 |
+ </maintainer> |
| 47 |
+ <upstream> |
| 48 |
+ <remote-id type="github">kernelslacker/trinity</remote-id> |
| 49 |
+ </upstream> |
| 50 |
</pkgmetadata> |
| 51 |
|
| 52 |
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-1.9.ebuild |
| 53 |
similarity index 68% |
| 54 |
copy from dev-util/trinity/trinity-9999.ebuild |
| 55 |
copy to dev-util/trinity/trinity-1.9.ebuild |
| 56 |
index 4245b613481..583104b92a5 100644 |
| 57 |
--- a/dev-util/trinity/trinity-9999.ebuild |
| 58 |
+++ b/dev-util/trinity/trinity-1.9.ebuild |
| 59 |
@@ -1,23 +1,27 @@ |
| 60 |
-# Copyright 1999-2018 Gentoo Authors |
| 61 |
+# Copyright 1999-2019 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
EAPI=7 |
| 65 |
-inherit toolchain-funcs git-r3 |
| 66 |
- |
| 67 |
-EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git" |
| 68 |
+inherit toolchain-funcs |
| 69 |
|
| 70 |
DESCRIPTION="A Linux system call fuzz tester" |
| 71 |
HOMEPAGE="http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/" |
| 72 |
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz" |
| 73 |
|
| 74 |
LICENSE="GPL-2" |
| 75 |
SLOT="0" |
| 76 |
+KEYWORDS="~amd64 ~x86" |
| 77 |
IUSE="examples" |
| 78 |
|
| 79 |
-DEPEND="sys-kernel/linux-headers" |
| 80 |
+# We need newer headers to avoid compilation failures in the BPF stuff. |
| 81 |
+DEPEND=" |
| 82 |
+ >=sys-kernel/linux-headers-4.8 |
| 83 |
+" |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
sed -e 's/-g -O2//' \ |
| 87 |
-e 's/-D_FORTIFY_SOURCE=2//' \ |
| 88 |
+ -e 's/-Werror//' \ |
| 89 |
-e '/-o $@/s/$(LDFLAGS) //' \ |
| 90 |
-i Makefile || die |
| 91 |
|
| 92 |
@@ -32,6 +36,7 @@ src_compile() { |
| 93 |
src_install() { |
| 94 |
dobin ${PN} |
| 95 |
dodoc Documentation/* README |
| 96 |
+ doman trinity.1 |
| 97 |
|
| 98 |
if use examples ; then |
| 99 |
exeinto /usr/share/doc/${PF}/scripts |
| 100 |
|
| 101 |
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild |
| 102 |
index 4245b613481..3910c2f87cd 100644 |
| 103 |
--- a/dev-util/trinity/trinity-9999.ebuild |
| 104 |
+++ b/dev-util/trinity/trinity-9999.ebuild |
| 105 |
@@ -1,4 +1,4 @@ |
| 106 |
-# Copyright 1999-2018 Gentoo Authors |
| 107 |
+# Copyright 1999-2019 Gentoo Authors |
| 108 |
# Distributed under the terms of the GNU General Public License v2 |
| 109 |
|
| 110 |
EAPI=7 |
| 111 |
@@ -13,11 +13,15 @@ LICENSE="GPL-2" |
| 112 |
SLOT="0" |
| 113 |
IUSE="examples" |
| 114 |
|
| 115 |
-DEPEND="sys-kernel/linux-headers" |
| 116 |
+# We need newer headers to avoid compilation failures in the BPF stuff. |
| 117 |
+DEPEND=" |
| 118 |
+ >=sys-kernel/linux-headers-4.8 |
| 119 |
+" |
| 120 |
|
| 121 |
src_prepare() { |
| 122 |
sed -e 's/-g -O2//' \ |
| 123 |
-e 's/-D_FORTIFY_SOURCE=2//' \ |
| 124 |
+ -e 's/-Werror//' \ |
| 125 |
-e '/-o $@/s/$(LDFLAGS) //' \ |
| 126 |
-i Makefile || die |
| 127 |
|
| 128 |
@@ -32,6 +36,7 @@ src_compile() { |
| 129 |
src_install() { |
| 130 |
dobin ${PN} |
| 131 |
dodoc Documentation/* README |
| 132 |
+ doman trinity.1 |
| 133 |
|
| 134 |
if use examples ; then |
| 135 |
exeinto /usr/share/doc/${PF}/scripts |
Archives