[gentoo-commits] repo/gentoo:master commit in: dev-util/trinity/files/, dev-util/trinity/

[Andrew Savchenko]

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@×××××××.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@×××××××.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
-}