Version bump.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 150 insertions, 10 deletions

diff --git a/dev-util/trinity/ChangeLog b/dev-util/trinity/ChangeLog
index 1731747fe808..c1660bac65fd 100644
--- a/dev-util/trinity/ChangeLog
+++ b/dev-util/trinity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/trinity
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/ChangeLog,v 1.3 2013/05/16 09:23:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/ChangeLog,v 1.4 2013/09/07 20:22:43 radhermit Exp $
+
+*trinity-1.2 (07 Sep 2013)
+
+  07 Sep 2013; Tim Harder <radhermit@gentoo.org> +trinity-1.2.ebuild,
+  +files/trinity-1.2-btrfs-headers.patch,
+  +files/trinity-1.2-videodev2-ioctls.patch:
+  Version bump.
 
 *trinity-9999 (16 May 2013)
 
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 938d55c91d32..c97b403074b5 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -2,19 +2,23 @@
 Hash: SHA256
 
 AUX trinity-1.1-flags.patch 630 SHA256 398f245960cf31219a487ec8d571b57b0b874b196f63c7fc90cfa8c680b84604 SHA512 b1779eeaf082f736666806b7483f50ad6d570a15330df327bb756c2b9a413610fef7f94574ce35510e9626563ccbcce3689fa80609e25fa52d1de1a6de887e6f WHIRLPOOL 6eb53f75dc9d197e863c902b9624635fa97683e8def1abe41ab60d93cee3b194690bd8ee3414d65212cbde5a415e83b17fc38b94545892a378dab0399dfe2be6
+AUX trinity-1.2-btrfs-headers.patch 1116 SHA256 2e61abe06fb4707a68186fe893095bf5a86248cbf5551fc18022bd321f57ec71 SHA512 4495445f900c00adb7cb8248a6335eb06947207301350185b2d77fdf932c24aabb5d8c8e3d229415bedf1ba435ad29a315ee00dc616ecf0e0df791f2b837ff1d WHIRLPOOL 1c8d3d26c7515f47e07682195884164b34e40b21e3ec4dc8165546ce11cf306abc9944eb0e0fb11847379a85d09a23c6381106026d872a10cc347a377522bb12
+AUX trinity-1.2-videodev2-ioctls.patch 1231 SHA256 45977c1d79a68a2741eee9794c50eae62377bba2913404ec5d144c6827916398 SHA512 d90b19a580824269b7e57847fc1a15d19de26e77713fab858328c291fbf02216346145d7d092401fad253015995fcdd5045ff4e2235c9b674841d0ddb68e5f8f WHIRLPOOL 93b4c0ad47490479b5dddce8719251f94b024f342560b101e628993c818001c4bd318ab9201bd9e1d6a3156b569153a18c05d6014908589fefdd14020c4e7fb2
 DIST trinity-1.1.tgz 115894 SHA256 926a1d6595d9fc29ad79075b6603e4bbfe42df3e04215bfce2502f4b554447cb SHA512 a10af383cf085e4ee3e22a66e0da79409570fa4e72f64b892566c499f04cf23122064e99984e7712c58fc81498300e38248b78c91d8e0397074714205af28b5a WHIRLPOOL dbc3ba3dc3248178652d0d32f787e51a0c617d31b54d9053632b9a8ae23e6dd7426d53c37fbfef7a48846e4afbb3a37b029a54ee98a81179cc90ab75f16dae0b
+DIST trinity-1.2.tgz 171946 SHA256 71132fca0ed016dcb39a3f1d9fa16a68971e2e9eff0b94bbacdf3d7ff101b6d5 SHA512 5a96db85ce0a34c345c803c6983bc4f191a8c25d54ff90f61eafeb6cb747a4170097821bf070a77920831a35a19b8d2bbc7b32d51194e45060abbd235a96b0d7 WHIRLPOOL 3713baba7a7e0a3f8996a8eee658d9905129aeb5d7f8a42179851c0e17b33aae9dbfaa206ff27b3b1786c47ccb8d4d45ba0732df09c689e1341133bcb3f0d119
 EBUILD trinity-1.1.ebuild 682 SHA256 a13b8f8e5496a2312e21103d0e61731d70888e637d485ca6438a91b7693df728 SHA512 4d38978f49e4d935e57abeba167cd55e51012825af87faf7a8b60da36f82fc44d714a3f59bc3b18fa617fa0c9829c2b28c7ef9bdcf3aa1c2e4154f110d9d3f51 WHIRLPOOL a52f635056cb2c46afd877c2fea766f1ae40022baa2a173c0c908c4f0b400fb665823f371ba91cc7a1c6765f7e517704a9f8d8de2c2e5a5742ff260505102059
+EBUILD trinity-1.2.ebuild 1117 SHA256 cb02aa539612eba16a0c8c87f2a1d5591edfe938064d8301335d4b3545e27977 SHA512 764d587e96c00ea429fa9f82fee3b92bf35947ae60837bee412213e85ae20f06202e403470481ff563ac50b247b42f7aaecfdac3cf9a9f102817ae2244b8bad8 WHIRLPOOL 83246c3d0b3c3d45d11ec0b9ee1609dafe293aeb3df161584908f62898bd5cb19feb17aa704056fb3ce2dde4ab26e76593bfcf5db2be8a18cbde4fd429d79df4
 EBUILD trinity-9999.ebuild 981 SHA256 6adf23a8e04b62449c28d594801b2abcf5cf8e9032366fa10612bb2e8673ab92 SHA512 b79f9dbc357f51d5563dfaaec5a84763dfbc2ba2fb019e9be264c24bb63e7c187b025756a19a31dea1827d83091bd777304a0bab69a0d2905fa64724a42e158d WHIRLPOOL 8570cc4a23cda3585264a5088ad04e4e090e57c1fdb2fddd748e878c2008880e0ec15b6f8828114e956d4306d131fd1f49a7f1af52b439b3b69cd9698b4d39b2
-MISC ChangeLog 645 SHA256 37030bc6943d482f73045b74c9b60f4756e20f68306f4e654e2313a27c858233 SHA512 877b2ba73cc0fd5df94440a3b504ddb6c73338474d1069ec6c21af9993ab17de940be307337cb87eb93630e58fcb026577e655ae903f98386984c5662ef20cc7 WHIRLPOOL 4999a06bc6b103d7539f8e1ad5e0937919f01a79724b69f424b696e468f3ece42ee088fb2138f78a338e3b78f3a64182013d5a2ceea254313f61eccecc5cba7b
+MISC ChangeLog 847 SHA256 9c36b41f797db8823af27e7059179097b0de1c86fbec2ee65e4acebbb19da41c SHA512 79194bd293da3af75fb072f2fa8434d10cf4062b543f4997c8f0f2a09a660cade44002fc2f59358dafd56f0ef951c562941d6c489d754228658f674bb52898d3 WHIRLPOOL 4b998b4fc52e6b1f06c249c3e899ad4815695cec001a4e96b374b390b98d817d85f04e44a68d925942d43e53a07af659ad139f0e6e9b0ab8fad95d29556d3d20
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlKWmAAoJEEqz6FtPBkyj4GUH/Rwt9o2mpJTGrEBgSSmFDKLJ
-MeBP/h8z5ALG/Fly32TZMY2puB7oxYDQux28gb1kktlhxtIBnKcTxRIvEunbigGZ
-OxS+t3KitoBp+nGZxQChxED6yQKoemZ07ALRytPgi6U8ey/0Wt1bN84kG71w0aGz
-6uEpKGAvaEFKscSSS3X/Da70OutGoqcLB6VcVonApvZ+iARSSPP3+f9PMa1hFt7d
-2sPwQtrkqLHZ0KitlPew4eebJDoPshiPgM80Ddsfz4bpMBxZcFBxC3RkxupWF92I
-8PeGowEfkbs13A6ESazXzZ2TF0yPxNqisYpc9I7omGcbFyUQfIcB5G00+Y2K5B0=
-=2I3B
+iQEcBAEBCAAGBQJSK4sXAAoJEEqz6FtPBkyjZyoIAJcfTM9i/wPa6KLUoeKqTQ9g
+E+tK718j1IUKCNga8vvF2S4ha52GbbuTXwkKR1R+CGPkPbHGw+LHBgBFK7nOBTmq
+9blso1Ij9PGV/OsQL3bNTBMOJG2YdzCuOTOYH0osGux6ffsenAaR0qcAY/6mWxVS
+Ng4+n3y9LA7S4n+BaRpv7SBymly9c0Ar0XKdEzHTTeOjbbHluUPl/whSthGeoZtd
+9Qzt8d0ZaGKYb4DL2rbczCE8HabuW5OLK2A1ly2YPnhB+gqL+tJHoSbssYPh8zQ2
+za4IMSSFq/O446WV7fND53mI/5hmX0fbaUZmzAQ0O899jcgsmm9gMon9+cILM+g=
+=qEEy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
new file mode 100644
index 000000000000..81eb170fcbae
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
@@ -0,0 +1,39 @@
+From 2f51ba47d4e16aaa877956e2876f81ed50af5c5d Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi@etezian.org>
+Date: Wed, 24 Jul 2013 12:31:05 +0200
+Subject: [PATCH] ioctls: btrfs-control: fix header inclusion order
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch enables newer linux/btrfs.h in Kernel headers 3.11,
+where NULL is not recognized as a define. This is done by
+including  stdlib.h before linux/btrfs.h. It gets rid of the
+following compiling error:
+
+In file included from ioctls/btrfs-control.c:5:0:
+/usr/include/linux/btrfs.h: In function ‘btrfs_err_str’:
+/usr/include/linux/btrfs.h:486:11: error: ‘NULL’ undeclared (first use in
+    return NULL;
+           ^
+
+Signed-off-by: Andi Shyti <andi@etezian.org>
+---
+ ioctls/btrfs-control.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ioctls/btrfs-control.c b/ioctls/btrfs-control.c
+index 35e5389..3b0b50a 100644
+--- a/ioctls/btrfs-control.c
++++ b/ioctls/btrfs-control.c
+@@ -2,6 +2,7 @@
+ 
+ #ifdef USE_BTRFS
+ 
++#include <stdlib.h>
+ #include <linux/btrfs.h>
+ 
+ #include "trinity.h"
+-- 
+1.8.3.2
+
diff --git a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
new file mode 100644
index 000000000000..c7240b7c15c0
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
@@ -0,0 +1,40 @@
+From 54c5f3cce91ed914b1abbd3bafe4877e413947fa Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi@etezian.org>
+Date: Wed, 24 Jul 2013 00:42:07 +0200
+Subject: [PATCH] ioctls: videodev2: check if defines are obsolete
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In kernel headers 3.11 the VIDIOC_DBG_G_CHIP_IDENT define is
+considered obsolete, therefore removed, generating the following
+compiling error:
+
+ioctls/videodev2.c:72:15: error: ‘VIDIOC_DBG_G_CHIP_IDENT’ undeclared here (not in a function)
+  IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
+               ^
+
+Check the definition of it before using it
+
+Signed-off-by: Andi Shyti <andi@etezian.org>
+---
+ ioctls/videodev2.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c
+index 0d1473e..03a5ae5 100644
+--- a/ioctls/videodev2.c
++++ b/ioctls/videodev2.c
+@@ -69,7 +69,9 @@ static const struct ioctl videodev2_ioctls[] = {
+ 	IOCTL(VIDIOC_TRY_ENCODER_CMD),
+ 	IOCTL(VIDIOC_DBG_S_REGISTER),
+ 	IOCTL(VIDIOC_DBG_G_REGISTER),
++#ifdef VIDIOC_DBG_G_CHIP_IDENT
+ 	IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
++#endif
+ 	IOCTL(VIDIOC_S_HW_FREQ_SEEK),
+ #ifdef VIDIOC_ENUM_DV_PRESETS
+ 	IOCTL(VIDIOC_ENUM_DV_PRESETS),
+-- 
+1.8.3.2
+
diff --git a/dev-util/trinity/trinity-1.2.ebuild b/dev-util/trinity/trinity-1.2.ebuild
new file mode 100644
index 000000000000..8f738b964113
--- /dev/null
+++ b/dev-util/trinity/trinity-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/trinity-1.2.ebuild,v 1.1 2013/09/07 20:22:43 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	sed -e 's/^CFLAGS = /CFLAGS +=/' \
+		-e 's/-g -O2//' \
+		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
+		-e '/^CFLAGS += -Werror/d' \
+		-i Makefile || die
+
+	epatch "${FILESDIR}"/${PN}-1.2-videodev2-ioctls.patch
+	epatch "${FILESDIR}"/${PN}-1.2-btrfs-headers.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}