triforce-afl: Resolve conflicts with devel/afl

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: triforce-afl: Resolve conflicts with devel/afl
From: akulpillai <vishnu%akulpillai.com@localhost>
Date: Sun, 02 Jun 2019 08:37:27 +0000
Module Name:	pkgsrc-wip
Committed By:	akulpillai <vishnu%akulpillai.com@localhost>
Pushed By:	akulpillai
Date:		Sun Jun 2 08:37:27 2019 +0000
Changeset:	29d7d96766d8ac62c252508cac5ca5491079fb82

Modified Files:
	triforce-afl/Makefile
	triforce-afl/PLIST
	triforce-afl/distinfo
	triforce-afl/patches/patch-qemu__mode_build__qemu__support.sh
Added Files:
	triforce-afl/patches/patch-Makefile
Removed Files:
	triforce-afl/TODO

Log Message:
triforce-afl: Resolve conflicts with devel/afl

Install into a subdirectory

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=29d7d96766d8ac62c252508cac5ca5491079fb82

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 triforce-afl/Makefile                              |   5 +-
 triforce-afl/PLIST                                 | 152 ++++++++++-----------
 triforce-afl/TODO                                  |   1 -
 triforce-afl/distinfo                              |  11 +-
 triforce-afl/patches/patch-Makefile                |  21 +++
 .../patch-qemu__mode_build__qemu__support.sh       |   4 +-
 6 files changed, 107 insertions(+), 87 deletions(-)

diffs:
diff --git a/triforce-afl/Makefile b/triforce-afl/Makefile
index 5bec4904b0..508be37c35 100644
--- a/triforce-afl/Makefile
+++ b/triforce-afl/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	TriforceAFL
-PKGNAME=	TriforceAFL-0.0
+DISTNAME=	TriforceAFL-0.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nccgroup/}
 GITHUB_TAG=	2a8ed329233a921044c903222fc3aa029ef68c69
@@ -9,7 +8,7 @@ GITHUB_TAG=	2a8ed329233a921044c903222fc3aa029ef68c69
 MAINTAINER=	vishnu%akulpillai.com@localhost
 HOMEPAGE=	https://github.com/nccgroup/TriforceAFL/
 COMMENT=	AFL/QEMU fuzzing with full-system emulation
-LICENSE=	apache-2.0
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd AND apache-2.0
 
 USE_TOOLS=	bash:run bison gmake perl:build pkg-config makeinfo
 REPLACE_SH+=	afl-plot
diff --git a/triforce-afl/PLIST b/triforce-afl/PLIST
index a702c51d41..cab350c9d9 100644
--- a/triforce-afl/PLIST
+++ b/triforce-afl/PLIST
@@ -1,77 +1,77 @@
 @comment $NetBSD$
-bin/afl-analyze
-bin/afl-clang
-bin/afl-clang++
-bin/afl-cmin
-bin/afl-fuzz
-bin/afl-g++
-bin/afl-gcc
-bin/afl-gotcpu
-bin/afl-plot
-bin/afl-showmap
-bin/afl-tmin
-bin/afl-whatsup
-lib/afl/afl-as
-lib/afl/as
-share/afl/testcases/README.testcases
-share/afl/testcases/_extras/gif.dict
-share/afl/testcases/_extras/html_tags.dict
-share/afl/testcases/_extras/jpeg.dict
-share/afl/testcases/_extras/js.dict
-share/afl/testcases/_extras/pdf.dict
-share/afl/testcases/_extras/png.dict
-share/afl/testcases/_extras/sql.dict
-share/afl/testcases/_extras/tiff.dict
-share/afl/testcases/_extras/webp.dict
-share/afl/testcases/_extras/xml.dict
-share/afl/testcases/archives/common/ar/small_archive.a
-share/afl/testcases/archives/common/bzip2/small_archive.bz2
-share/afl/testcases/archives/common/cab/small_archive.cab
-share/afl/testcases/archives/common/compress/small_archive.Z
-share/afl/testcases/archives/common/cpio/small_archive.cpio
-share/afl/testcases/archives/common/gzip/small_archive.gz
-share/afl/testcases/archives/common/lzo/small_archive.lzo
-share/afl/testcases/archives/common/rar/small_archive.rar
-share/afl/testcases/archives/common/tar/small_archive.tar
-share/afl/testcases/archives/common/xz/small_archive.xz
-share/afl/testcases/archives/common/zip/small_archive.zip
-share/afl/testcases/archives/exotic/arj/small_archive.arj
-share/afl/testcases/archives/exotic/lha/small_archive.lha
-share/afl/testcases/archives/exotic/lrzip/small_archive.lrz
-share/afl/testcases/archives/exotic/lzip/small_archive.lz
-share/afl/testcases/archives/exotic/lzma/small_archive.lzma
-share/afl/testcases/archives/exotic/rzip/small_archive.rz
-share/afl/testcases/archives/exotic/zoo/small_archive.zoo
-share/afl/testcases/images/bmp/not_kitty.bmp
-share/afl/testcases/images/gif/not_kitty.gif
-share/afl/testcases/images/ico/not_kitty.ico
-share/afl/testcases/images/jp2/not_kitty.jp2
-share/afl/testcases/images/jpeg/not_kitty.jpg
-share/afl/testcases/images/jxr/not_kitty.jxr
-share/afl/testcases/images/png/not_kitty.png
-share/afl/testcases/images/png/not_kitty_alpha.png
-share/afl/testcases/images/png/not_kitty_gamma.png
-share/afl/testcases/images/png/not_kitty_icc.png
-share/afl/testcases/images/tiff/not_kitty.tiff
-share/afl/testcases/images/webp/not_kitty.webp
-share/afl/testcases/multimedia/h264/small_movie.mp4
-share/afl/testcases/others/elf/small_exec.elf
-share/afl/testcases/others/js/small_script.js
-share/afl/testcases/others/pcap/small_capture.pcap
-share/afl/testcases/others/pdf/small.pdf
-share/afl/testcases/others/rtf/small_document.rtf
-share/afl/testcases/others/sql/simple_queries.sql
-share/afl/testcases/others/text/hello_world.txt
-share/afl/testcases/others/xml/small_document.xml
-share/doc/afl/ChangeLog
-share/doc/afl/QuickStartGuide.txt
-share/doc/afl/README
-share/doc/afl/env_variables.txt
-share/doc/afl/historical_notes.txt
-share/doc/afl/notes_for_asan.txt
-share/doc/afl/parallel_fuzzing.txt
-share/doc/afl/perf_tips.txt
-share/doc/afl/sister_projects.txt
-share/doc/afl/status_screen.txt
-share/doc/afl/technical_details.txt
-share/doc/afl/triforce_internals.txt
+lib/triforce-afl/afl-as
+lib/triforce-afl/as
+share/doc/triforce-afl/ChangeLog
+share/doc/triforce-afl/QuickStartGuide.txt
+share/doc/triforce-afl/README
+share/doc/triforce-afl/env_variables.txt
+share/doc/triforce-afl/historical_notes.txt
+share/doc/triforce-afl/notes_for_asan.txt
+share/doc/triforce-afl/parallel_fuzzing.txt
+share/doc/triforce-afl/perf_tips.txt
+share/doc/triforce-afl/sister_projects.txt
+share/doc/triforce-afl/status_screen.txt
+share/doc/triforce-afl/technical_details.txt
+share/doc/triforce-afl/triforce_internals.txt
+share/triforce-afl/testcases/README.testcases
+share/triforce-afl/testcases/_extras/gif.dict
+share/triforce-afl/testcases/_extras/html_tags.dict
+share/triforce-afl/testcases/_extras/jpeg.dict
+share/triforce-afl/testcases/_extras/js.dict
+share/triforce-afl/testcases/_extras/pdf.dict
+share/triforce-afl/testcases/_extras/png.dict
+share/triforce-afl/testcases/_extras/sql.dict
+share/triforce-afl/testcases/_extras/tiff.dict
+share/triforce-afl/testcases/_extras/webp.dict
+share/triforce-afl/testcases/_extras/xml.dict
+share/triforce-afl/testcases/archives/common/ar/small_archive.a
+share/triforce-afl/testcases/archives/common/bzip2/small_archive.bz2
+share/triforce-afl/testcases/archives/common/cab/small_archive.cab
+share/triforce-afl/testcases/archives/common/compress/small_archive.Z
+share/triforce-afl/testcases/archives/common/cpio/small_archive.cpio
+share/triforce-afl/testcases/archives/common/gzip/small_archive.gz
+share/triforce-afl/testcases/archives/common/lzo/small_archive.lzo
+share/triforce-afl/testcases/archives/common/rar/small_archive.rar
+share/triforce-afl/testcases/archives/common/tar/small_archive.tar
+share/triforce-afl/testcases/archives/common/xz/small_archive.xz
+share/triforce-afl/testcases/archives/common/zip/small_archive.zip
+share/triforce-afl/testcases/archives/exotic/arj/small_archive.arj
+share/triforce-afl/testcases/archives/exotic/lha/small_archive.lha
+share/triforce-afl/testcases/archives/exotic/lrzip/small_archive.lrz
+share/triforce-afl/testcases/archives/exotic/lzip/small_archive.lz
+share/triforce-afl/testcases/archives/exotic/lzma/small_archive.lzma
+share/triforce-afl/testcases/archives/exotic/rzip/small_archive.rz
+share/triforce-afl/testcases/archives/exotic/zoo/small_archive.zoo
+share/triforce-afl/testcases/images/bmp/not_kitty.bmp
+share/triforce-afl/testcases/images/gif/not_kitty.gif
+share/triforce-afl/testcases/images/ico/not_kitty.ico
+share/triforce-afl/testcases/images/jp2/not_kitty.jp2
+share/triforce-afl/testcases/images/jpeg/not_kitty.jpg
+share/triforce-afl/testcases/images/jxr/not_kitty.jxr
+share/triforce-afl/testcases/images/png/not_kitty.png
+share/triforce-afl/testcases/images/png/not_kitty_alpha.png
+share/triforce-afl/testcases/images/png/not_kitty_gamma.png
+share/triforce-afl/testcases/images/png/not_kitty_icc.png
+share/triforce-afl/testcases/images/tiff/not_kitty.tiff
+share/triforce-afl/testcases/images/webp/not_kitty.webp
+share/triforce-afl/testcases/multimedia/h264/small_movie.mp4
+share/triforce-afl/testcases/others/elf/small_exec.elf
+share/triforce-afl/testcases/others/js/small_script.js
+share/triforce-afl/testcases/others/pcap/small_capture.pcap
+share/triforce-afl/testcases/others/pdf/small.pdf
+share/triforce-afl/testcases/others/rtf/small_document.rtf
+share/triforce-afl/testcases/others/sql/simple_queries.sql
+share/triforce-afl/testcases/others/text/hello_world.txt
+share/triforce-afl/testcases/others/xml/small_document.xml
+triforce-afl/afl-analyze
+triforce-afl/afl-clang
+triforce-afl/afl-clang++
+triforce-afl/afl-cmin
+triforce-afl/afl-fuzz
+triforce-afl/afl-g++
+triforce-afl/afl-gcc
+triforce-afl/afl-gotcpu
+triforce-afl/afl-plot
+triforce-afl/afl-showmap
+triforce-afl/afl-tmin
+triforce-afl/afl-whatsup
diff --git a/triforce-afl/TODO b/triforce-afl/TODO
deleted file mode 100644
index 42f4d4fe5f..0000000000
--- a/triforce-afl/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Usage
diff --git a/triforce-afl/distinfo b/triforce-afl/distinfo
index d57b55c5ca..ff56ae9d49 100644
--- a/triforce-afl/distinfo
+++ b/triforce-afl/distinfo
@@ -1,10 +1,11 @@
 $NetBSD$
 
-SHA1 (TriforceAFL-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 9ab1432700070345ee61b4a8719e90b9756de131
-RMD160 (TriforceAFL-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = e4c34a542de1e6a5f6cad204fcea17858e7b6a34
-SHA512 (TriforceAFL-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = aac1abb5e9d334923a4d6dab159e518bce1944573884e1012620aff139d4d0abcdbca41104c1c2eed9006fc277321f1f13212a698a7b7c49c6b0f1f98078d2e0
-Size (TriforceAFL-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 32045053 bytes
-SHA1 (patch-qemu__mode_build__qemu__support.sh) = 43030caa2f9ea1c737aa3e3701fbf473a10b1e0b
+SHA1 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 9ab1432700070345ee61b4a8719e90b9756de131
+RMD160 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = e4c34a542de1e6a5f6cad204fcea17858e7b6a34
+SHA512 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = aac1abb5e9d334923a4d6dab159e518bce1944573884e1012620aff139d4d0abcdbca41104c1c2eed9006fc277321f1f13212a698a7b7c49c6b0f1f98078d2e0
+Size (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 32045053 bytes
+SHA1 (patch-Makefile) = 091a1410a2cdf1ac32ae889c03c813a891131a62
+SHA1 (patch-qemu__mode_build__qemu__support.sh) = 76fdbbbb93971e0ce55579b90c183a90b9a80e8f
 SHA1 (patch-qemu__mode_qemu_Makefile) = 8d8baa55e4f93ba635f9399c8e0a29f6f59d2292
 SHA1 (patch-qemu__mode_qemu_audio_audio.c) = aaa82ac3208ef605cb6f5b0fabd38a0d223f21f2
 SHA1 (patch-qemu__mode_qemu_hw_display_omap__dss.c) = 48f38ead6aa5a14b13f87e44217bb551817280ad
diff --git a/triforce-afl/patches/patch-Makefile b/triforce-afl/patches/patch-Makefile
new file mode 100644
index 0000000000..cb1f9fd29b
--- /dev/null
+++ b/triforce-afl/patches/patch-Makefile
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Install into subdirectory
+
+--- Makefile.orig	2017-05-31 22:53:05.000000000 +0000
++++ Makefile
+@@ -17,10 +17,10 @@ PROGNAME    = afl
+ VERSION     = 2.06b
+ 
+ PREFIX     ?= /usr/local
+-BIN_PATH    = $(PREFIX)/bin
+-HELPER_PATH = $(PREFIX)/lib/afl
+-DOC_PATH    = $(PREFIX)/share/doc/afl
+-MISC_PATH   = $(PREFIX)/share/afl
++BIN_PATH    = $(PREFIX)/triforce-afl
++HELPER_PATH = $(PREFIX)/lib/triforce-afl
++DOC_PATH    = $(PREFIX)/share/doc/triforce-afl
++MISC_PATH   = $(PREFIX)/share/triforce-afl
+ 
+ # PROGS intentionally omit afl-as, which gets installed to its own dir.
+ 
diff --git a/triforce-afl/patches/patch-qemu__mode_build__qemu__support.sh b/triforce-afl/patches/patch-qemu__mode_build__qemu__support.sh
index d12d8f4c81..2531965edb 100644
--- a/triforce-afl/patches/patch-qemu__mode_build__qemu__support.sh
+++ b/triforce-afl/patches/patch-qemu__mode_build__qemu__support.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Don't build bsd-user
+Disable linux-user and bsd-user
 
 --- qemu_mode/build_qemu_support.sh.orig	2017-05-31 22:53:05.000000000 +0000
 +++ qemu_mode/build_qemu_support.sh
@@ -9,7 +9,7 @@ Don't build bsd-user
  
  CFLAGS="-O3" ./configure --disable-werror \
 -  --enable-system --enable-linux-user \
-+  --enable-system --disable-bsd-user \
++  --enable-system --disable-linux-user --disable-bsd-user \
    --enable-guest-base --disable-gtk --disable-sdl --disable-vnc \
 -  --target-list="x86_64-linux-user x86_64-softmmu arm-softmmu aarch64-softmmu"
 +  --target-list="x86_64-softmmu arm-softmmu aarch64-softmmu"
Prev by Date: wip/guile-gash: import as guile-gash-0.1
Next by Date: xnedit: Cleaning
Previous by Thread: wip/guile-gash: import as guile-gash-0.1
Next by Thread: xnedit: Cleaning
Indexes:
Home | Main Index | Thread Index | Old Index