trinity: bump to version 1.8

new file mode 100644
index 000000000000..e3c6ee3b54e9
@@ -0,0 +1,61 @@
+From e4f31d5a1ce65974c2a6b2e6e1a2b16fffc51518 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <[email protected]>
+Date: Tue, 28 Nov 2017 10:15:22 +0100
+Subject: [PATCH] compat: handle removed autofs macros
+
+In file included from ioctls/autofs.c:4:0:
+ioctls/autofs.c:241:8: error: 'AUTOFS_IOC_EXPIRE_INDIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_CMD'?
+  IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+        ^
+include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
+  { .request = _request, .name = #_request, }
+               ^~~~~~~~
+ioctls/autofs.c:242:8: error: 'AUTOFS_IOC_EXPIRE_DIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_INDIRECT'?
+  IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
+        ^
+include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
+  { .request = _request, .name = #_request, }
+               ^~~~~~~~
+
+Define them as AUTOFS_IOC_EXPIRE_MULTI as they used to be.
+
+Signed-off-by: Jiri Slaby <[email protected]>
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Patch status: upstream commit e4f31d5a1ce
+
+ include/compat.h | 8 ++++++++
+ ioctls/autofs.c  | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/include/compat.h b/include/compat.h
+index 10065ceca5f6..fc9a1b95ac4c 100644
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -1209,3 +1209,11 @@ struct kvm_get_htab_fd {
+ #ifndef SO_IP_SET
+ #define SO_IP_SET 83
+ #endif
++
++/* linux/auto_fs4.h */
++#ifndef AUTOFS_IOC_EXPIRE_INDIRECT
++#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
++#endif
++#ifndef AUTOFS_IOC_EXPIRE_DIRECT
++#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI
++#endif
+diff --git a/ioctls/autofs.c b/ioctls/autofs.c
+index 04a3eb811326..a39ccccc056b 100644
+--- a/ioctls/autofs.c
++++ b/ioctls/autofs.c
+@@ -8,6 +8,7 @@
+ #include "shm.h"
+ #include "syscall.h"
+ #include "utils.h"
++#include "compat.h"
+ 
+ /* include/linux/auto_dev-ioctl.h */
+ /*
+-- 
+2.15.0
+

deleted file mode 100644
index e077bf43f2f3..000000000000
@@ -1,26 +0,0 @@
-From b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d Mon Sep 17 00:00:00 2001
-From: Dave Jones <[email protected]>
-Date: Mon, 5 Dec 2016 12:46:14 -0500
-Subject: [PATCH] use userspace headers for ax25 instead of kernel.
-
-This should solve https://bugzilla.redhat.com/show_bug.cgi?id=1400720
-
-[Upstream commit: https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- net/proto-rose.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/proto-rose.c b/net/proto-rose.c
-index ccbf294f..b277f839 100644
---- a/net/proto-rose.c
-+++ b/net/proto-rose.c
-@@ -6,7 +6,7 @@
- #include <sys/un.h>
- #include <netinet/in.h>
- #include <bits/sockaddr.h>
--#include <linux/ax25.h> /* for ax25_address in rose.h */
-+#include <netax25/ax25.h> /* for ax25_address in rose.h */
- #include <netrose/rose.h>
- #include <stdlib.h>
- #include "net.h"

72 lines not on this page · raw message

60 lines not on this page · raw message

44 lines not on this page · raw message

49 lines not on this page · raw message

deleted file mode 100644
index 27c7850a01b4..000000000000
@@ -1,40 +0,0 @@
-From dd7fc8b44cc8bb8a7e9dc03aa3aa57fbefbf433b Mon Sep 17 00:00:00 2001
-From: Vinson Lee <[email protected]>
-Date: Tue, 20 Jun 2017 22:43:01 +0000
-Subject: [PATCH] Include sys/io.h for UIO_MAXIOV symbol.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch fixes this build error.
-
-  CC	net/proto-ipv4.o
-net/proto-ipv4.c: In function ?ip_setsockopt?:
-net/proto-ipv4.c:231:49: error: ?UIO_MAXIOV? undeclared (first use in this function); did you mean ?_IO_MAGIC??
-   so->optlen = rnd() % sizeof(unsigned long)*(2*UIO_MAXIOV+512);
-                                                 ^~~~~~~~~~
-                                                 _IO_MAGIC
-
-Upstream: https://github.com/kernelslacker/trinity/commit/dd7fc8b44cc8bb8a7e9dc03aa3aa57fbefbf433b
-
-Signed-off-by: Vinson Lee <[email protected]>
-Signed-off-by: Matthew Weber <[email protected]>
----
- net/proto-ipv4.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/proto-ipv4.c b/net/proto-ipv4.c
-index b77364e..9ffaa5e 100644
---- a/net/proto-ipv4.c
-+++ b/net/proto-ipv4.c
-@@ -1,6 +1,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#include <sys/uio.h>
- #include <netinet/in.h>
- #include <netinet/udp.h>
- #include <stdlib.h>
--- 
-1.9.1
-

index 0fc737e28ff4..31a930570aad 100644
@@ -10,14 +10,12 @@ config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
 config BR2_PACKAGE_TRINITY
 	bool "trinity"
 	depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF
 	help
 	  A Linux System call fuzz tester
 
 	  http://codemonkey.org.uk/projects/trinity/
 
-comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4"
+comment "trinity needs a toolchain w/ headers >= 3.4"
 	depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_USES_MUSL || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4

index 7f48cfaba3db..2000653336f5 100644
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 4cb2bd4049ce523fdf47490c4c18b8eb713c720d4b3b13d6ec2ae246aac908ad  trinity-1.7.tar.xz
+sha256 8cadc4221660b7accc4728311ce1a130ac9b9d1f3b04e35508ba0cc80d9c3f94  trinity-1.8.tar.xz
+sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4  COPYING

index 1bada39cc52f..61565d073d1a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRINITY_VERSION = 1.7
+TRINITY_VERSION = 1.8
 TRINITY_SITE = http://codemonkey.org.uk/projects/trinity
 TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz
 TRINITY_LICENSE = GPL-2.0

index 61565d073d1a..b75c46943efe 100644
@@ -10,10 +10,6 @@ TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz
 TRINITY_LICENSE = GPL-2.0
 TRINITY_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_BTRFS_PROGS),y)
-TRINITY_DEPENDENCIES += btrfs-progs
-endif
-
 define TRINITY_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure)
 endef