1 |
commit: 02d752ee80accd16327dc81649693fca298c15e0 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 6 01:37:44 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 6 01:39:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d752ee |
7 |
|
8 |
dev-util/trinity: new version 1.7. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-util/trinity/Manifest | 2 +- |
13 |
dev-util/trinity/files/trinity-1.7-cflags.patch | 14 +++++++++++ |
14 |
.../{trinity-1.6.ebuild => trinity-1.7.ebuild} | 28 ++++++++++------------ |
15 |
3 files changed, 28 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest |
18 |
index 579ef6af071..60d846d256c 100644 |
19 |
--- a/dev-util/trinity/Manifest |
20 |
+++ b/dev-util/trinity/Manifest |
21 |
@@ -1,2 +1,2 @@ |
22 |
DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43 |
23 |
-DIST trinity-1.6.tar.xz 177808 SHA256 e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 SHA512 43ceb5ef96e97d3c338deb582b250202073d6f203ee596ce676d77a52bcfe06f53e068d07a0ee9f1d49f74319e24ba885cb7529d8868ac67f0237f2c4cfde2de WHIRLPOOL f7afe7514fe2ac2b6de3c4a05f8a4bb0bb7a328267c093e924e6345f03ffa864be06a3223b32c24ab4e334b016868f66696417d7de30d2561ea71a1a67f45183 |
24 |
+DIST trinity-1.7.tar.xz 195488 SHA256 4cb2bd4049ce523fdf47490c4c18b8eb713c720d4b3b13d6ec2ae246aac908ad SHA512 bb702ec79494591e04c74279e39d6dd0c5779f7cb2696c306c94bee3a8aefb524e369674daadf02f70b58dbb19ad5699d2c331bc4c9089046d2214403a95ba87 WHIRLPOOL 2b14592a85e049eb0f41f611b645f38be61267a63f83e6ef08c2de35213398c61b30f85da4f4b37c4e9293f4c5064c317aad157df5bca5ca552bc378c2aa4837 |
25 |
|
26 |
diff --git a/dev-util/trinity/files/trinity-1.7-cflags.patch b/dev-util/trinity/files/trinity-1.7-cflags.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..accdae374bf |
29 |
--- /dev/null |
30 |
+++ b/dev-util/trinity/files/trinity-1.7-cflags.patch |
31 |
@@ -0,0 +1,14 @@ |
32 |
+diff --git a/Makefile b/Makefile |
33 |
+index c77d1f9..b970d08 100644 |
34 |
+--- a/Makefile |
35 |
++++ b/Makefile |
36 |
+@@ -10,7 +10,8 @@ endif |
37 |
+ CC := $(CROSS_COMPILE)$(CC) |
38 |
+ LD := $(CROSS_COMPILE)$(LD) |
39 |
+ |
40 |
+-CFLAGS += -Wall -Wextra -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__ |
41 |
++CFLAGS ?= -g -O2 -D_FORTIFY_SOURCE=2 |
42 |
++CFLAGS += -Wall -Wextra -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__ |
43 |
+ |
44 |
+ CFLAGS += $(shell if $(CC) -std=gnu11 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-std=gnu11"; else echo "-std=gnu99"; fi) |
45 |
+ |
46 |
|
47 |
diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.7.ebuild |
48 |
similarity index 53% |
49 |
rename from dev-util/trinity/trinity-1.6.ebuild |
50 |
rename to dev-util/trinity/trinity-1.7.ebuild |
51 |
index 3e03a8edb64..a25cbb887f2 100644 |
52 |
--- a/dev-util/trinity/trinity-1.6.ebuild |
53 |
+++ b/dev-util/trinity/trinity-1.7.ebuild |
54 |
@@ -1,9 +1,9 @@ |
55 |
-# Copyright 1999-2016 Gentoo Foundation |
56 |
+# Copyright 1999-2017 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
-EAPI=5 |
60 |
+EAPI=6 |
61 |
|
62 |
-inherit toolchain-funcs eutils |
63 |
+inherit toolchain-funcs |
64 |
|
65 |
DESCRIPTION="A Linux system call fuzz tester" |
66 |
HOMEPAGE="http://codemonkey.org.uk/projects/trinity/" |
67 |
@@ -14,31 +14,29 @@ SLOT="0" |
68 |
KEYWORDS="~amd64 ~x86" |
69 |
IUSE="examples" |
70 |
|
71 |
-DEPEND=" |
72 |
- app-arch/xz-utils |
73 |
- sys-kernel/linux-headers |
74 |
-" |
75 |
+# We need newer headers to avoid compilation failures in the BPF stuff. |
76 |
+DEPEND="app-arch/xz-utils |
77 |
+ >=sys-kernel/linux-headers-4.8" |
78 |
|
79 |
-src_prepare() { |
80 |
- epatch "${FILESDIR}"/${P}-cflags.patch |
81 |
- tc-export CC |
82 |
-} |
83 |
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" ) |
84 |
|
85 |
src_configure() { |
86 |
- ./configure.sh || die |
87 |
+ tc-export CC |
88 |
+ default |
89 |
} |
90 |
|
91 |
src_compile() { |
92 |
+ # Enable a verbose (i.e. not quiet) build. |
93 |
emake V=1 |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
- dobin ${PN} |
98 |
+ dobin "${PN}" |
99 |
dodoc Documentation/* README |
100 |
|
101 |
if use examples ; then |
102 |
- exeinto /usr/share/doc/${PF}/scripts |
103 |
+ exeinto "/usr/share/doc/${PF}/scripts" |
104 |
doexe scripts/* |
105 |
- docompress -x /usr/share/doc/${PF}/scripts |
106 |
+ docompress -x "/usr/share/doc/${PF}/scripts" |
107 |
fi |
108 |
} |