afl++: honor CFLAGS/LDFLAGS, fixes RELRO build.

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri Apr 17 19:49:46 2020 +0200
Changeset:	89005f0da26326c68341d361e85654f717512c80

Modified Files:
	afl++/Makefile
	afl++/distinfo
Added Files:
	afl++/patches/patch-examples_argv__fuzzing_Makefile
	afl++/patches/patch-examples_socket__fuzzing_Makefile

Log Message:
afl++: honor CFLAGS/LDFLAGS, fixes RELRO build.

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

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

diffstat:
 afl++/Makefile                                        |  1 +
 afl++/distinfo                                        |  2 ++
 afl++/patches/patch-examples_argv__fuzzing_Makefile   | 17 +++++++++++++++++
 afl++/patches/patch-examples_socket__fuzzing_Makefile | 17 +++++++++++++++++
 4 files changed, 37 insertions(+)

diffs:
diff --git a/afl++/Makefile b/afl++/Makefile
index d43e32e905..d11b942a2f 100644
--- a/afl++/Makefile
+++ b/afl++/Makefile
@@ -29,5 +29,6 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run gmake
 REPLACE_SH+=	afl-plot
 REPLACE_BASH+=	afl-cmin
+REPLACE_BASH+=	afl-cmin.bash
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/afl++/distinfo b/afl++/distinfo
index dc424afc3e..8cc710698b 100644
--- a/afl++/distinfo
+++ b/afl++/distinfo
@@ -4,3 +4,5 @@ SHA1 (AFLplusplus-2.62c.tar.gz) = 4442de6667fe780867a7bd0ddbbc0eaa897f95e5
 RMD160 (AFLplusplus-2.62c.tar.gz) = 0840d48520ee90d9263cdf040b6253efac3d7ea2
 SHA512 (AFLplusplus-2.62c.tar.gz) = 0214845af0acc889c5f80bbfc6f50b662cb608c4c0959061075db29ee60bdaca7b11499368b44597674e1a11c49e60725abe2f919a7ddf7850c410019902eb40
 Size (AFLplusplus-2.62c.tar.gz) = 1272000 bytes
+SHA1 (patch-examples_argv__fuzzing_Makefile) = 04032386558713ca4d142964f63cc6820ae010c8
+SHA1 (patch-examples_socket__fuzzing_Makefile) = 46b5474f61029d5ea4a4449cfad6de0d6f5c8d66
diff --git a/afl++/patches/patch-examples_argv__fuzzing_Makefile b/afl++/patches/patch-examples_argv__fuzzing_Makefile
new file mode 100644
index 0000000000..1541498a3f
--- /dev/null
+++ b/afl++/patches/patch-examples_argv__fuzzing_Makefile
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Honor CFLAGS and LDFLAGS.
+
+--- examples/argv_fuzzing/Makefile.orig	2020-02-28 00:13:28.000000000 +0000
++++ examples/argv_fuzzing/Makefile
+@@ -17,8 +17,8 @@ PREFIX     ?= /usr/local
+ BIN_PATH    = $(PREFIX)/bin
+ HELPER_PATH = $(PREFIX)/lib/afl
+ 
+-CFLAGS = -fPIC -Wall -Wextra
+-LDFLAGS = -shared
++CFLAGS += -fPIC -Wall -Wextra
++LDFLAGS += -shared
+ 
+ ifneq "$(filter Linux GNU%,$(shell uname))" ""
+   LDFLAGS  += -ldl
diff --git a/afl++/patches/patch-examples_socket__fuzzing_Makefile b/afl++/patches/patch-examples_socket__fuzzing_Makefile
new file mode 100644
index 0000000000..9f2fa3a117
--- /dev/null
+++ b/afl++/patches/patch-examples_socket__fuzzing_Makefile
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Honor CFLAGS and LDFLAGS.
+
+--- examples/socket_fuzzing/Makefile.orig	2020-02-28 00:13:28.000000000 +0000
++++ examples/socket_fuzzing/Makefile
+@@ -15,8 +15,8 @@ PREFIX     ?= /usr/local
+ BIN_PATH    = $(PREFIX)/bin
+ HELPER_PATH = $(PREFIX)/lib/afl
+ 
+-CFLAGS = -fPIC -Wall -Wextra
+-LDFLAGS = -shared
++CFLAGS += -fPIC -Wall -Wextra
++LDFLAGS += -shared
+ 
+ ifneq "$(filter Linux GNU%,$(shell uname))" ""
+   LDFLAGS  += -ldl