public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2016-01-23 20:07 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-01-23 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     79c0961c3663153ecdba57233f7154fe701aef80
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 19:59:30 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 20:07:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c0961c

dev-util/trinity: remove old

Package-Manager: portage-2.2.27

 dev-util/trinity/Manifest                          |  4 --
 dev-util/trinity/files/trinity-1.1-flags.patch     | 20 ---------
 .../trinity/files/trinity-1.2-btrfs-headers.patch  | 39 -----------------
 .../files/trinity-1.2-videodev2-ioctls.patch       | 40 -----------------
 dev-util/trinity/files/trinity-1.4-flags.patch     | 20 ---------
 dev-util/trinity/trinity-1.1.ebuild                | 31 --------------
 dev-util/trinity/trinity-1.2.ebuild                | 50 ----------------------
 dev-util/trinity/trinity-1.3.ebuild                | 47 --------------------
 dev-util/trinity/trinity-1.4.ebuild                | 45 -------------------
 9 files changed, 296 deletions(-)

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 6ef37bd..6829e0b 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,5 +1 @@
-DIST trinity-1.1.tgz 115894 SHA256 926a1d6595d9fc29ad79075b6603e4bbfe42df3e04215bfce2502f4b554447cb SHA512 a10af383cf085e4ee3e22a66e0da79409570fa4e72f64b892566c499f04cf23122064e99984e7712c58fc81498300e38248b78c91d8e0397074714205af28b5a WHIRLPOOL dbc3ba3dc3248178652d0d32f787e51a0c617d31b54d9053632b9a8ae23e6dd7426d53c37fbfef7a48846e4afbb3a37b029a54ee98a81179cc90ab75f16dae0b
-DIST trinity-1.2.tgz 171946 SHA256 71132fca0ed016dcb39a3f1d9fa16a68971e2e9eff0b94bbacdf3d7ff101b6d5 SHA512 5a96db85ce0a34c345c803c6983bc4f191a8c25d54ff90f61eafeb6cb747a4170097821bf070a77920831a35a19b8d2bbc7b32d51194e45060abbd235a96b0d7 WHIRLPOOL 3713baba7a7e0a3f8996a8eee658d9905129aeb5d7f8a42179851c0e17b33aae9dbfaa206ff27b3b1786c47ccb8d4d45ba0732df09c689e1341133bcb3f0d119
-DIST trinity-1.3.tgz 192513 SHA256 53ea7ca66c022e1fd86b18a7a38f5dbbf3611a15e1bb1256ea6e8ac570378b0f SHA512 343dac85a2c7a433e3d1e71535e16285f766ded240d2e7ba0527e29ab46cb39e11e2134f95255e8792f0cd21a5fd55f90a34a3a9d348414d03e9e0bd06437f36 WHIRLPOOL c2ff46ad957ec6541f3898000a7e6982f9a34eaa0b849db601cf84a2570131baf1e7817f7c5bd517e8b492880c957d8d5527fec6944fefb5ba24e6c51f276fb8
-DIST trinity-1.4.tar.xz 156212 SHA256 a61fca0e35010820be4ba858dd7d103e6cc5975feef052f2cf56db71c8661ac1 SHA512 ffe7e5e9214056b39c0047ddd6463885701d075256a9416749cba638c625898eb7b0e2f74a17794fd4034dafdc949b8297e842815bb9b6d29392059a6a0d549b WHIRLPOOL 8df2d1a22e3259e00363f71010f723a421109022478dfe8bd318fa0304ec9baa705ad089e535545026066649e751d7c4d310ccfd92561a1dc0692c1df1695658
 DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43

diff --git a/dev-util/trinity/files/trinity-1.1-flags.patch b/dev-util/trinity/files/trinity-1.1-flags.patch
deleted file mode 100644
index fd794c6..0000000
--- a/dev-util/trinity/files/trinity-1.1-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trinity-1.1/Makefile
-+++ trinity-1.1/Makefile
-@@ -3,7 +3,7 @@
- INSTALL_PREFIX ?= $(DESTDIR)
- INSTALL_PREFIX ?= $(HOME)
- 
--CFLAGS = -Wall -W -g -O2 -I. -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
-+CFLAGS += -Wall -W -I. -Wimplicit -D_GNU_SOURCE
- #CFLAGS += $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-m32"; fi)
- CFLAGS += -Wdeclaration-after-statement
- CFLAGS += -Wformat=2
-@@ -49,7 +49,7 @@
- -include $(SRCS:%.c=$(DEPDIR)/%.d)
- 
- trinity: test $(OBJS) $(HEADERS)
--	$(CC) $(CFLAGS) -o trinity $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS)
- 	@mkdir -p tmp
- 
- df = $(DEPDIR)/$(*F)

diff --git a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
deleted file mode 100644
index 81eb170..0000000
--- a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index c7240b7..0000000
--- a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/trinity-1.4-flags.patch b/dev-util/trinity/files/trinity-1.4-flags.patch
deleted file mode 100644
index 5b63959..0000000
--- a/dev-util/trinity/files/trinity-1.4-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trinity-1.4/Makefile
-+++ trinity-1.4/Makefile
-@@ -9,7 +9,7 @@
- CC := $(CROSS_COMPILE)$(CC)
- LD := $(CROSS_COMPILE)$(LD)
- 
--CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
-+CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
- ifneq ($(SYSROOT),)
- CFLAGS += --sysroot=$(SYSROOT)
- endif
-@@ -84,7 +84,7 @@
- df = $(DEPDIR)/$(*D)/$(*F)
- 
- %.o : %.c
--	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
-+	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
- 	@mkdir -p $(DEPDIR)/$(*D)
- 	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
- 	@mv -f $(df).d $(df).d.tmp

diff --git a/dev-util/trinity/trinity-1.1.ebuild b/dev-util/trinity/trinity-1.1.ebuild
deleted file mode 100644
index edd1d36..0000000
--- a/dev-util/trinity/trinity-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-DEPEND="sys-kernel/linux-headers"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-	tc-export CC
-}
-
-src_configure() {
-	./configure.sh || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc Documentation/* README
-}

diff --git a/dev-util/trinity/trinity-1.2.ebuild b/dev-util/trinity/trinity-1.2.ebuild
deleted file mode 100644
index 72989d9..0000000
--- a/dev-util/trinity/trinity-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}

diff --git a/dev-util/trinity/trinity-1.3.ebuild b/dev-util/trinity/trinity-1.3.ebuild
deleted file mode 100644
index e5335da..0000000
--- a/dev-util/trinity/trinity-1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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)/' \
-		-i Makefile || die
-
-	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
-}

diff --git a/dev-util/trinity/trinity-1.4.ebuild b/dev-util/trinity/trinity-1.4.ebuild
deleted file mode 100644
index f303e35..0000000
--- a/dev-util/trinity/trinity-1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	app-arch/xz-utils
-	sys-kernel/linux-headers
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2016-03-06 21:00 Tim Harder
  0 siblings, 0 replies; 6+ messages in thread
From: Tim Harder @ 2016-03-06 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ef1e3691a08f60f32162c99edac0678482e261d4
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 20:59:29 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 21:00:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1e3691

dev-util/trinity: version bump to 1.6

 dev-util/trinity/Manifest                       |  1 +
 dev-util/trinity/files/trinity-1.6-cflags.patch | 11 ++++++
 dev-util/trinity/trinity-1.6.ebuild             | 45 +++++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 6829e0b..579ef6a 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1 +1,2 @@
 DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
+DIST trinity-1.6.tar.xz 177808 SHA256 e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 SHA512 43ceb5ef96e97d3c338deb582b250202073d6f203ee596ce676d77a52bcfe06f53e068d07a0ee9f1d49f74319e24ba885cb7529d8868ac67f0237f2c4cfde2de WHIRLPOOL f7afe7514fe2ac2b6de3c4a05f8a4bb0bb7a328267c093e924e6345f03ffa864be06a3223b32c24ab4e334b016868f66696417d7de30d2561ea71a1a67f45183

diff --git a/dev-util/trinity/files/trinity-1.6-cflags.patch b/dev-util/trinity/files/trinity-1.6-cflags.patch
new file mode 100644
index 0000000..9243619
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.6-cflags.patch
@@ -0,0 +1,11 @@
+--- trinity-1.6/Makefile
++++ trinity-1.6/Makefile
+@@ -10,7 +10,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ 
+ # Only enabled during development, and on gcc 4.9+
+ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)

diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.6.ebuild
new file mode 100644
index 0000000..86d54f4
--- /dev/null
+++ b/dev-util/trinity/trinity-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	app-arch/xz-utils
+	sys-kernel/linux-headers
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2017-05-06  1:45 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2017-05-06  1:45 UTC (permalink / raw
  To: gentoo-commits

commit:     02d752ee80accd16327dc81649693fca298c15e0
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 01:37:44 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat May  6 01:39:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d752ee

dev-util/trinity: new version 1.7.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/trinity/Manifest                          |  2 +-
 dev-util/trinity/files/trinity-1.7-cflags.patch    | 14 +++++++++++
 .../{trinity-1.6.ebuild => trinity-1.7.ebuild}     | 28 ++++++++++------------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 579ef6af071..60d846d256c 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,2 +1,2 @@
 DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
-DIST trinity-1.6.tar.xz 177808 SHA256 e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 SHA512 43ceb5ef96e97d3c338deb582b250202073d6f203ee596ce676d77a52bcfe06f53e068d07a0ee9f1d49f74319e24ba885cb7529d8868ac67f0237f2c4cfde2de WHIRLPOOL f7afe7514fe2ac2b6de3c4a05f8a4bb0bb7a328267c093e924e6345f03ffa864be06a3223b32c24ab4e334b016868f66696417d7de30d2561ea71a1a67f45183
+DIST trinity-1.7.tar.xz 195488 SHA256 4cb2bd4049ce523fdf47490c4c18b8eb713c720d4b3b13d6ec2ae246aac908ad SHA512 bb702ec79494591e04c74279e39d6dd0c5779f7cb2696c306c94bee3a8aefb524e369674daadf02f70b58dbb19ad5699d2c331bc4c9089046d2214403a95ba87 WHIRLPOOL 2b14592a85e049eb0f41f611b645f38be61267a63f83e6ef08c2de35213398c61b30f85da4f4b37c4e9293f4c5064c317aad157df5bca5ca552bc378c2aa4837

diff --git a/dev-util/trinity/files/trinity-1.7-cflags.patch b/dev-util/trinity/files/trinity-1.7-cflags.patch
new file mode 100644
index 00000000000..accdae374bf
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.7-cflags.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index c77d1f9..b970d08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,8 @@ endif
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -Wextra -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS ?= -g -O2 -D_FORTIFY_SOURCE=2
++CFLAGS += -Wall -Wextra -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ 
+ 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)
+ 

diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.7.ebuild
similarity index 53%
rename from dev-util/trinity/trinity-1.6.ebuild
rename to dev-util/trinity/trinity-1.7.ebuild
index 3e03a8edb64..a25cbb887f2 100644
--- a/dev-util/trinity/trinity-1.6.ebuild
+++ b/dev-util/trinity/trinity-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
 HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
@@ -14,31 +14,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="
-	app-arch/xz-utils
-	sys-kernel/linux-headers
-"
+# We need newer headers to avoid compilation failures in the BPF stuff.
+DEPEND="app-arch/xz-utils
+	>=sys-kernel/linux-headers-4.8"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	tc-export CC
-}
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
 
 src_configure() {
-	./configure.sh || die
+	tc-export CC
+	default
 }
 
 src_compile() {
+	# Enable a verbose (i.e. not quiet) build.
 	emake V=1
 }
 
 src_install() {
-	dobin ${PN}
+	dobin "${PN}"
 	dodoc Documentation/* README
 
 	if use examples ; then
-		exeinto /usr/share/doc/${PF}/scripts
+		exeinto "/usr/share/doc/${PF}/scripts"
 		doexe scripts/*
-		docompress -x /usr/share/doc/${PF}/scripts
+		docompress -x "/usr/share/doc/${PF}/scripts"
 	fi
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2018-10-20 12:17 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-10-20 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     13fb235948d859e2c248f68bc92644412a7f8a1b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 11:57:59 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 12:16:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13fb2359

dev-util/trinity: Apply Fedora/Debian fixes

Closes: https://bugs.gentoo.org/642936
Closes: https://bugs.gentoo.org/648962
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-util/trinity/files/trinity-autofs.patch        | 53 +++++++++++++++
 dev-util/trinity/files/trinity-irda.patch          | 47 +++++++++++++
 dev-util/trinity/files/trinity-memfd.patch         | 79 ++++++++++++++++++++++
 dev-util/trinity/files/trinity-net-protocols.patch | 11 +++
 dev-util/trinity/trinity-1.8.ebuild                | 15 +++-
 5 files changed, 202 insertions(+), 3 deletions(-)

diff --git a/dev-util/trinity/files/trinity-autofs.patch b/dev-util/trinity/files/trinity-autofs.patch
new file mode 100644
index 00000000000..b8a6c9fdbd5
--- /dev/null
+++ b/dev-util/trinity/files/trinity-autofs.patch
@@ -0,0 +1,53 @@
+--- a/configure.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/configure	2017-11-18 14:25:52.095495407 -0700
+@@ -47,6 +47,29 @@ check_header()
+ echo "[*] Checking system headers."
+ 
+ #############################################################################################
++# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
++echo -n "[*] Checking autofs headers ... "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <linux/auto_fs4.h>
++
++int main()
++{
++	return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++	MISSING_DEFS=1
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ # Are ipv6 headers usable ?
+ [ -z "$IPV6" ] && IPV6=yes
+ if [[ "$IPV6" == "yes" ]]; then
+@@ -290,6 +313,7 @@ fi
+ 
+ #############################################################################################
+ 
++check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
+--- a/ioctls/autofs.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/ioctls/autofs.c	2017-11-18 14:21:14.487774564 -0700
+@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
+ 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
++#ifdef PRE_4_14_KERNEL
+ 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
++#endif
+ 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
+ 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
+ 

diff --git a/dev-util/trinity/files/trinity-irda.patch b/dev-util/trinity/files/trinity-irda.patch
new file mode 100644
index 00000000000..eb298fd99d8
--- /dev/null
+++ b/dev-util/trinity/files/trinity-irda.patch
@@ -0,0 +1,47 @@
+--- a/configure.orig	2017-11-18 14:25:52.095495407 -0700
++++ b/configure	2018-07-21 11:44:59.235072132 -0600
+@@ -317,6 +317,7 @@ check_header linux/auto_fs4.h USE_AUTOFS
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
++check_header linux/irda.h USE_IRDA
+ check_header linux/rds.h USE_RDS
+ check_header linux/vfio.h USE_VFIO
+ check_header drm/drm.h USE_DRM
+--- a/net/protocols.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/protocols.c	2018-07-21 11:48:09.065940013 -0600
+@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRIN
+ #ifdef USE_RDS
+ 	[PF_RDS] = { .proto = &proto_rds },
+ #endif
++#ifdef USE_IRDA
+ 	[PF_IRDA] = { .proto = &proto_irda },
++#endif
+ 	[PF_LLC] = { .proto = &proto_llc },
+ 	[PF_CAN] = { .proto = &proto_can },
+ 	[PF_TIPC] = { .proto = &proto_tipc },
+--- a/net/proto-irda.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/proto-irda.c	2018-07-21 11:45:34.330047712 -0600
+@@ -4,13 +4,15 @@
+ #include <sys/un.h>
+ /* old irda.h does not include something which defines sa_family_t */
+ #include <netinet/in.h>
+-#include <linux/irda.h>
+ #include <stdlib.h>
+ #include "net.h"
+ #include "random.h"
+ #include "utils.h"	// RAND_ARRAY
+ #include "compat.h"
+ 
++#ifdef USE_IRDA
++#include <linux/irda.h>
++
+ static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
+ {
+ 	struct sockaddr_irda *irda;
+@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
+ 	.valid_triplets = irda_triplets,
+ 	.nr_triplets = ARRAY_SIZE(irda_triplets),
+ };
++
++#endif

diff --git a/dev-util/trinity/files/trinity-memfd.patch b/dev-util/trinity/files/trinity-memfd.patch
new file mode 100644
index 00000000000..d333aac2941
--- /dev/null
+++ b/dev-util/trinity/files/trinity-memfd.patch
@@ -0,0 +1,79 @@
+commit c93bb184ce996c4d77eefbae2ab0bf74f396ec45
+Author: Baruch Siach <baruch@tkos.co.il>
+Date:   Tue Mar 13 06:53:06 2018 +0200
+
+    memfd: fix build with glibc 2.27
+    
+    glibc 2.27 added a wrapper for memfd_create(). This causes build
+    failure:
+    
+    fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
+     static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+                ^~~~~~~~~~~~
+    
+    Don't use the local definition when the libc provides one.
+    
+    Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+diff --git a/configure b/configure
+index dc0a87d8c1ad..c0166af33048 100755
+--- a/configure
++++ b/configure
+@@ -289,6 +289,29 @@ else
+ fi
+ 
+ #############################################################################################
++# Does glibc provide memfd_create() syscall wrapper
++#
++echo -n "[*] Checking if glibc provides memfd_create.. "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <sys/mman.h>
++
++void main()
++{
++	memfd_create();
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ 
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+diff --git a/fds/memfd.c b/fds/memfd.c
+index 210678e4571c..aaaac2f78f54 100644
+--- a/fds/memfd.c
++++ b/fds/memfd.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/mman.h>
+ 
+ #include "fd.h"
+ #include "memfd.h"
+@@ -16,6 +17,7 @@
+ #include "trinity.h"
+ #include "udp.h"
+ 
++#ifndef USE_MEMFD_CREATE
+ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+ {
+ #ifdef SYS_memfd_create
+@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
+ 	return -ENOSYS;
+ #endif
+ }
++#endif
+ 
+ static void memfd_destructor(struct object *obj)
+ {

diff --git a/dev-util/trinity/files/trinity-net-protocols.patch b/dev-util/trinity/files/trinity-net-protocols.patch
new file mode 100644
index 00000000000..d2583b56ebd
--- /dev/null
+++ b/dev-util/trinity/files/trinity-net-protocols.patch
@@ -0,0 +1,11 @@
+--- a/syscalls/setsockopt.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/syscalls/setsockopt.c	2017-11-18 13:44:19.283946230 -0700
+@@ -90,7 +90,7 @@ static void do_random_sso(struct sockopt
+ retry:
+ 	switch (rnd() % 4) {
+ 	case 0:	/* do a random protocol, even if it doesn't match this socket. */
+-		i = rnd() % PF_MAX;
++		i = rnd() % TRINITY_PF_MAX;
+ 		proto = net_protocols[i].proto;
+ 		if (proto != NULL) {
+ 			if (proto->setsockopt != NULL) {

diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.8.ebuild
index 1072988366e..2cb2ae2a86e 100644
--- a/dev-util/trinity/trinity-1.8.ebuild
+++ b/dev-util/trinity/trinity-1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
@@ -14,9 +14,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 # We need newer headers to avoid compilation failures in the BPF stuff.
-DEPEND="app-arch/xz-utils
+DEPEND="
 	>=sys-kernel/linux-headers-4.8
 "
+RDEPEND=""
+
+PATCHES=(
+	# Fixes from Fedora and Debian
+	"${FILESDIR}"/${PN}-autofs.patch
+	"${FILESDIR}"/${PN}-irda.patch
+	"${FILESDIR}"/${PN}-memfd.patch
+	"${FILESDIR}"/${PN}-net-protocols.patch
+)
 
 src_configure() {
 	tc-export CC


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2019-04-14 15:19 Andrew Savchenko
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Savchenko @ 2019-04-14 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     67faddca92ab289d6fc18d30e9497ae42193b92d
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 15:16:45 2019 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 15:16:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67faddca

dev-util/trinity: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 dev-util/trinity/Manifest                          |  1 -
 dev-util/trinity/files/trinity-autofs.patch        | 53 ---------------
 dev-util/trinity/files/trinity-irda.patch          | 47 -------------
 dev-util/trinity/files/trinity-memfd.patch         | 79 ----------------------
 dev-util/trinity/files/trinity-net-protocols.patch | 11 ---
 dev-util/trinity/trinity-1.8.ebuild                | 50 --------------
 6 files changed, 241 deletions(-)

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index dec5c8d1afd..859d43bcd23 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,2 +1 @@
-DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
 DIST trinity-1.9.tar.xz 216364 BLAKE2B dbf5af03539fc7bac37fd49f495e3feb506c7a403f72d0ef0b85327a3714b8edef52260a03dce1082db05d520376d7b96b0f85d541d6dff67e1245b0e1b35fe8 SHA512 3a2ab84b61b450d50e46a5da5dffa803f92bf469fc3d04ff4cb39f26b4f486bede9790bb48fc6b3bbda0ee882f0acf5b610d39e86b16bea7f2207adef94be31a

diff --git a/dev-util/trinity/files/trinity-autofs.patch b/dev-util/trinity/files/trinity-autofs.patch
deleted file mode 100644
index b8a6c9fdbd5..00000000000
--- a/dev-util/trinity/files/trinity-autofs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/configure	2017-11-18 14:25:52.095495407 -0700
-@@ -47,6 +47,29 @@ check_header()
- echo "[*] Checking system headers."
- 
- #############################################################################################
-+# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
-+echo -n "[*] Checking autofs headers ... "
-+rm -f "$TMP" || exit 1
-+
-+cat >"$TMP.c" << EOF
-+#include <linux/auto_fs4.h>
-+
-+int main()
-+{
-+	return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
-+}
-+EOF
-+
-+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
-+if [ ! -x "$TMP" ]; then
-+	echo $RED "[NO]" $COL_RESET
-+	MISSING_DEFS=1
-+else
-+	echo $GREEN "[YES]" $COL_RESET
-+	echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
-+fi
-+
-+#############################################################################################
- # Are ipv6 headers usable ?
- [ -z "$IPV6" ] && IPV6=yes
- if [[ "$IPV6" == "yes" ]]; then
-@@ -290,6 +313,7 @@ fi
- 
- #############################################################################################
- 
-+check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
- check_header linux/if_alg.h USE_IF_ALG
---- a/ioctls/autofs.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/ioctls/autofs.c	2017-11-18 14:21:14.487774564 -0700
-@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
- 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
- 	IOCTL(AUTOFS_IOC_EXPIRE),
- 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
-+#ifdef PRE_4_14_KERNEL
- 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
- 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
-+#endif
- 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
- 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
- 

diff --git a/dev-util/trinity/files/trinity-irda.patch b/dev-util/trinity/files/trinity-irda.patch
deleted file mode 100644
index eb298fd99d8..00000000000
--- a/dev-util/trinity/files/trinity-irda.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.orig	2017-11-18 14:25:52.095495407 -0700
-+++ b/configure	2018-07-21 11:44:59.235072132 -0600
-@@ -317,6 +317,7 @@ check_header linux/auto_fs4.h USE_AUTOFS
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
- check_header linux/if_alg.h USE_IF_ALG
-+check_header linux/irda.h USE_IRDA
- check_header linux/rds.h USE_RDS
- check_header linux/vfio.h USE_VFIO
- check_header drm/drm.h USE_DRM
---- a/net/protocols.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/net/protocols.c	2018-07-21 11:48:09.065940013 -0600
-@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRIN
- #ifdef USE_RDS
- 	[PF_RDS] = { .proto = &proto_rds },
- #endif
-+#ifdef USE_IRDA
- 	[PF_IRDA] = { .proto = &proto_irda },
-+#endif
- 	[PF_LLC] = { .proto = &proto_llc },
- 	[PF_CAN] = { .proto = &proto_can },
- 	[PF_TIPC] = { .proto = &proto_tipc },
---- a/net/proto-irda.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/net/proto-irda.c	2018-07-21 11:45:34.330047712 -0600
-@@ -4,13 +4,15 @@
- #include <sys/un.h>
- /* old irda.h does not include something which defines sa_family_t */
- #include <netinet/in.h>
--#include <linux/irda.h>
- #include <stdlib.h>
- #include "net.h"
- #include "random.h"
- #include "utils.h"	// RAND_ARRAY
- #include "compat.h"
- 
-+#ifdef USE_IRDA
-+#include <linux/irda.h>
-+
- static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
- {
- 	struct sockaddr_irda *irda;
-@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
- 	.valid_triplets = irda_triplets,
- 	.nr_triplets = ARRAY_SIZE(irda_triplets),
- };
-+
-+#endif

diff --git a/dev-util/trinity/files/trinity-memfd.patch b/dev-util/trinity/files/trinity-memfd.patch
deleted file mode 100644
index d333aac2941..00000000000
--- a/dev-util/trinity/files/trinity-memfd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit c93bb184ce996c4d77eefbae2ab0bf74f396ec45
-Author: Baruch Siach <baruch@tkos.co.il>
-Date:   Tue Mar 13 06:53:06 2018 +0200
-
-    memfd: fix build with glibc 2.27
-    
-    glibc 2.27 added a wrapper for memfd_create(). This causes build
-    failure:
-    
-    fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
-     static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
-                ^~~~~~~~~~~~
-    
-    Don't use the local definition when the libc provides one.
-    
-    Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-
-diff --git a/configure b/configure
-index dc0a87d8c1ad..c0166af33048 100755
---- a/configure
-+++ b/configure
-@@ -289,6 +289,29 @@ else
- fi
- 
- #############################################################################################
-+# Does glibc provide memfd_create() syscall wrapper
-+#
-+echo -n "[*] Checking if glibc provides memfd_create.. "
-+rm -f "$TMP" || exit 1
-+
-+cat >"$TMP.c" << EOF
-+#include <sys/mman.h>
-+
-+void main()
-+{
-+	memfd_create();
-+}
-+EOF
-+
-+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
-+if [ ! -x "$TMP" ]; then
-+	echo $RED "[NO]" $COL_RESET
-+else
-+	echo $GREEN "[YES]" $COL_RESET
-+	echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
-+fi
-+
-+#############################################################################################
- 
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
-diff --git a/fds/memfd.c b/fds/memfd.c
-index 210678e4571c..aaaac2f78f54 100644
---- a/fds/memfd.c
-+++ b/fds/memfd.c
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/mman.h>
- 
- #include "fd.h"
- #include "memfd.h"
-@@ -16,6 +17,7 @@
- #include "trinity.h"
- #include "udp.h"
- 
-+#ifndef USE_MEMFD_CREATE
- static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
- {
- #ifdef SYS_memfd_create
-@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
- 	return -ENOSYS;
- #endif
- }
-+#endif
- 
- static void memfd_destructor(struct object *obj)
- {

diff --git a/dev-util/trinity/files/trinity-net-protocols.patch b/dev-util/trinity/files/trinity-net-protocols.patch
deleted file mode 100644
index d2583b56ebd..00000000000
--- a/dev-util/trinity/files/trinity-net-protocols.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/syscalls/setsockopt.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/syscalls/setsockopt.c	2017-11-18 13:44:19.283946230 -0700
-@@ -90,7 +90,7 @@ static void do_random_sso(struct sockopt
- retry:
- 	switch (rnd() % 4) {
- 	case 0:	/* do a random protocol, even if it doesn't match this socket. */
--		i = rnd() % PF_MAX;
-+		i = rnd() % TRINITY_PF_MAX;
- 		proto = net_protocols[i].proto;
- 		if (proto != NULL) {
- 			if (proto->setsockopt != NULL) {

diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.8.ebuild
deleted file mode 100644
index 2cb2ae2a86e..00000000000
--- a/dev-util/trinity/trinity-1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 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="http://codemonkey.org.uk/projects/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
-"
-RDEPEND=""
-
-PATCHES=(
-	# Fixes from Fedora and Debian
-	"${FILESDIR}"/${PN}-autofs.patch
-	"${FILESDIR}"/${PN}-irda.patch
-	"${FILESDIR}"/${PN}-memfd.patch
-	"${FILESDIR}"/${PN}-net-protocols.patch
-)
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_compile() {
-	# Enable a verbose (i.e. not quiet) build.
-	emake V=1
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc Documentation/*
-	einstalldocs
-
-	if use examples ; then
-		exeinto "/usr/share/doc/${PF}/scripts"
-		doexe scripts/*
-		docompress -x "/usr/share/doc/${PF}/scripts"
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/
@ 2020-06-04 16:52 Aaron Bauman
  0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-06-04 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     60c15141b67ade8a68f93d322e884dc5bd5677c3
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri May 29 18:52:19 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 16:51:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c15141

dev-util/trinity: upstream patches

Added upstream patches that fixes compilation of package.
Closes: https://bugs.gentoo.org/691890
Closes: https://bugs.gentoo.org/713640
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16007
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-util/trinity/files/trinity-1.9-gcc10_fix.patch | 34 ++++++++++++++++++++++
 .../files/trinity-1.9-include_types_h.patch        | 33 +++++++++++++++++++++
 dev-util/trinity/trinity-1.9.ebuild                |  7 ++++-
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch b/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch
new file mode 100644
index 00000000000..9a17adaebcf
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 00000000000..0b8318ba2fb
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.9-include_types_h.patch
@@ -0,0 +1,33 @@
+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/trinity-1.9.ebuild b/dev-util/trinity/trinity-1.9.ebuild
index 583104b92a5..06d08790fac 100644
--- a/dev-util/trinity/trinity-1.9.ebuild
+++ b/dev-util/trinity/trinity-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,11 @@ 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//' \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-04 16:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-06  1:45 [gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2020-06-04 16:52 Aaron Bauman
2019-04-14 15:19 Andrew Savchenko
2018-10-20 12:17 Pacho Ramos
2016-03-06 21:00 Tim Harder
2016-01-23 20:07 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox