summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/trinity/Makefile8
-rw-r--r--package/trinity/patches/patch-Makefile6
-rw-r--r--package/trinity/patches/patch-ioctls_vt_c20
-rw-r--r--package/trinity/patches/patch-syscalls_prctl_c11
4 files changed, 18 insertions, 27 deletions
diff --git a/package/trinity/Makefile b/package/trinity/Makefile
index 11d9d16a7..cf12729eb 100644
--- a/package/trinity/Makefile
+++ b/package/trinity/Makefile
@@ -4,11 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= trinity
-PKG_VERSION:= 1.5
-PKG_RELEASE:= 2
-PKG_HASH:= e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655
+PKG_VERSION:= 1.6
+PKG_RELEASE:= 1
+PKG_HASH:= e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9
PKG_DESCR:= linux system call fuzz tester
-PKG_SECTION:= sys/misc
+PKG_SECTION:= base/tests
PKG_URL:= http://codemonkey.org.uk/projects/trinity/
PKG_SITES:= http://codemonkey.org.uk/projects/trinity/
diff --git a/package/trinity/patches/patch-Makefile b/package/trinity/patches/patch-Makefile
index d6b7ac036..aa85e30f1 100644
--- a/package/trinity/patches/patch-Makefile
+++ b/package/trinity/patches/patch-Makefile
@@ -1,7 +1,7 @@
---- trinity-1.5.orig/Makefile 2015-03-02 17:08:20.000000000 +0100
-+++ trinity-1.5/Makefile 2015-03-19 17:23:36.000000000 +0100
+--- trinity-1.6.orig/Makefile 2015-11-03 18:05:50.000000000 +0100
++++ trinity-1.6/Makefile 2016-02-25 00:24:11.000000000 +0100
@@ -1,6 +1,6 @@
- VERSION="1.5"
+ VERSION="1.6"
-INSTALL_PREFIX ?= $(DESTDIR)
+INSTALL_PREFIX ?= $(DESTDIR)/usr
diff --git a/package/trinity/patches/patch-ioctls_vt_c b/package/trinity/patches/patch-ioctls_vt_c
deleted file mode 100644
index e989b9eea..000000000
--- a/package/trinity/patches/patch-ioctls_vt_c
+++ /dev/null
@@ -1,20 +0,0 @@
-vt.c: add missing include to fix building with uClibc
-
-Backporting an upstream patch to fix a building issue with uClibc.
-
-Upstream commit:
-
- https://github.com/kernelslacker/trinity/commit/fb4a1adc4540f0702b84aa900f2b8ebed004885d
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
---- trinity-1.5.orig/ioctls/vt.c 2015-03-02 17:08:20.000000000 +0100
-+++ trinity-1.5/ioctls/vt.c 2015-03-20 18:57:15.000000000 +0100
-@@ -1,6 +1,7 @@
- #include <sys/vt.h>
- #include <sys/ioctl.h>
- #include <linux/kd.h>
-+#include <linux/serial.h>
-
- #include "utils.h"
- #include "ioctls.h"
diff --git a/package/trinity/patches/patch-syscalls_prctl_c b/package/trinity/patches/patch-syscalls_prctl_c
new file mode 100644
index 000000000..9adbe22f8
--- /dev/null
+++ b/package/trinity/patches/patch-syscalls_prctl_c
@@ -0,0 +1,11 @@
+--- trinity-1.6.orig/syscalls/prctl.c 2015-11-03 18:05:50.000000000 +0100
++++ trinity-1.6/syscalls/prctl.c 2016-02-25 00:26:56.000000000 +0100
+@@ -34,7 +34,7 @@ static int prctl_opts[] = {
+ PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE,
+ PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT,
+ #ifdef __mips__
+- GET_FP_MODE, SET_FP_MODE,
++ PR_GET_FP_MODE, PR_SET_FP_MODE,
+ #endif
+ PR_CAP_AMBIENT,
+ };