pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
honggfuzz: Upgrade to 1.7
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Thu Aug 23 23:48:28 2018 +0200
Changeset: 58eb32f4da7781002c5eb5e536f05a73578e6a60
Modified Files:
honggfuzz/Makefile
honggfuzz/distinfo
Removed Files:
honggfuzz/patches/patch-Makefile
honggfuzz/patches/patch-hfuzz__cc_hfuzz-cc.c
honggfuzz/patches/patch-libhfcommon_util.c
honggfuzz/patches/patch-libhfuzz_memorycmp.c
Log Message:
honggfuzz: Upgrade to 1.7
Drop all local patches, merged upstream.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=58eb32f4da7781002c5eb5e536f05a73578e6a60
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
honggfuzz/Makefile | 3 +-
honggfuzz/distinfo | 12 ++--
honggfuzz/patches/patch-Makefile | 32 ---------
honggfuzz/patches/patch-hfuzz__cc_hfuzz-cc.c | 97 ----------------------------
honggfuzz/patches/patch-libhfcommon_util.c | 21 ------
honggfuzz/patches/patch-libhfuzz_memorycmp.c | 35 ----------
6 files changed, 6 insertions(+), 194 deletions(-)
diffs:
diff --git a/honggfuzz/Makefile b/honggfuzz/Makefile
index 493d522b04..4483c6eef0 100644
--- a/honggfuzz/Makefile
+++ b/honggfuzz/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= honggfuzz-1.6
+DISTNAME= honggfuzz-1.7
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
@@ -12,4 +12,5 @@ LICENSE= apache-2.0
USE_TOOLS+= bash:run gmake
.include "../../lang/libBlocksRuntime/buildlink3.mk"
+.include "../../devel/capstone/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/honggfuzz/distinfo b/honggfuzz/distinfo
index acb8a09395..b54cdd8c6b 100644
--- a/honggfuzz/distinfo
+++ b/honggfuzz/distinfo
@@ -1,10 +1,6 @@
$NetBSD$
-SHA1 (honggfuzz-1.6.tar.gz) = e6ab2a411fe8726e57815209d6fb1b6f4268538c
-RMD160 (honggfuzz-1.6.tar.gz) = 8ef15a0e38cd09a26f82a3683da6a363257ddce1
-SHA512 (honggfuzz-1.6.tar.gz) = db4f0f31d36080db983068435be82b3e1132145e0bad5c4e8e6504563f10ce66df4f977fbd0a9f1cbcd262e479f635a68ab7c1df70d23e8437164734ea562c90
-Size (honggfuzz-1.6.tar.gz) = 79322453 bytes
-SHA1 (patch-Makefile) = 3c0242922d4e457637072ef93cd1a7cb5cf8973f
-SHA1 (patch-hfuzz__cc_hfuzz-cc.c) = 1351c251a5aa58cfbe510de6f92362cc4c465e4e
-SHA1 (patch-libhfcommon_util.c) = 9f00448a2cfc3436c87a2b2a33dcd92de6afc49b
-SHA1 (patch-libhfuzz_memorycmp.c) = fed71b1e414f54788cabec18f4cd7fda40585123
+SHA1 (honggfuzz-1.7.tar.gz) = ab7163cb72178dee16c4593cc3478153c4247dc8
+RMD160 (honggfuzz-1.7.tar.gz) = 39fe9163d8635a5dc70444ad5dbe77fe47d17e00
+SHA512 (honggfuzz-1.7.tar.gz) = d7d9cdba67fc7cabb6991850d725f13377614785b397acbeae6c5d64414ae826ac1c8c7fc0fb2ce83d1e5d2df64875a39df0160367d2d8e244b996d8de0d08d2
+Size (honggfuzz-1.7.tar.gz) = 70077774 bytes
diff --git a/honggfuzz/patches/patch-Makefile b/honggfuzz/patches/patch-Makefile
deleted file mode 100644
index 30d753f765..0000000000
--- a/honggfuzz/patches/patch-Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-1. Replace -lpthread with -pthread
-2. Add install option
-
---- Makefile.orig 2018-04-19 13:37:38.000000000 +0000
-+++ Makefile
-@@ -145,7 +145,7 @@ else
- -Wextra -Wno-initializer-overrides -Wno-override-init \
- -Wno-unknown-warning-option -Wno-unknown-pragmas \
- -funroll-loops
-- ARCH_LDFLAGS := -lpthread -L/usr/local/lib
-+ ARCH_LDFLAGS := -pthread -L/usr/local/lib
- # OS Posix
- endif
-
-@@ -440,3 +440,15 @@ mac/arch.o: sancov.h subproc.h
- posix/arch.o: arch.h honggfuzz.h libhfcommon/util.h fuzz.h
- posix/arch.o: libhfcommon/common.h libhfcommon/files.h libhfcommon/common.h
- posix/arch.o: libhfcommon/log.h sancov.h subproc.h
-+
-+PREFIX ?= /usr/local
-+BIN_PATH =$(PREFIX)/bin
-+
-+install: all
-+ mkdir -p -m 755 $${DESTDIR}$(BIN_PATH)
-+ install -m 755 honggfuzz $${DESTDIR}$(BIN_PATH)
-+ install -m 755 hfuzz_cc/hfuzz-cc $${DESTDIR}$(BIN_PATH)
-+ install -m 755 hfuzz_cc/hfuzz-clang $${DESTDIR}$(BIN_PATH)
-+ install -m 755 hfuzz_cc/hfuzz-clang++ $${DESTDIR}$(BIN_PATH)
-+ install -m 755 hfuzz_cc/hfuzz-gcc $${DESTDIR}$(BIN_PATH)
-+ install -m 755 hfuzz_cc/hfuzz-g++ $${DESTDIR}$(BIN_PATH)
diff --git a/honggfuzz/patches/patch-hfuzz__cc_hfuzz-cc.c b/honggfuzz/patches/patch-hfuzz__cc_hfuzz-cc.c
deleted file mode 100644
index c616192d87..0000000000
--- a/honggfuzz/patches/patch-hfuzz__cc_hfuzz-cc.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
---- hfuzz_cc/hfuzz-cc.c.orig 2018-04-19 13:37:38.000000000 +0000
-+++ hfuzz_cc/hfuzz-cc.c
-@@ -102,6 +102,13 @@ static bool isLDMode(int argc, char** ar
- return true;
- }
-
-+static int
-+hf_execvp(const char *file, char *argv[])
-+{
-+ argv[0] = (char *)file;
-+ return execvp(file, argv);
-+}
-+
- static int execCC(int argc, char** argv) {
- if (useASAN()) {
- argv[argc++] = "-fsanitize=address";
-@@ -117,14 +124,14 @@ static int execCC(int argc, char** argv)
- if (isCXX) {
- const char* cxx_path = getenv("HFUZZ_CXX_PATH");
- if (cxx_path != NULL) {
-- execvp(cxx_path, argv);
-+ hf_execvp(cxx_path, argv);
- PLOG_E("execvp('%s')", cxx_path);
- return EXIT_FAILURE;
- }
- } else {
- const char* cc_path = getenv("HFUZZ_CC_PATH");
- if (cc_path != NULL) {
-- execvp(cc_path, argv);
-+ hf_execvp(cc_path, argv);
- PLOG_E("execvp('%s')", cc_path);
- return EXIT_FAILURE;
- }
-@@ -132,37 +139,37 @@ static int execCC(int argc, char** argv)
-
- if (isGCC) {
- if (isCXX) {
-- execvp("g++", argv);
-- execvp("gcc", argv);
-+ hf_execvp("g++", argv);
-+ hf_execvp("gcc", argv);
- } else {
-- execvp("gcc", argv);
-+ hf_execvp("gcc", argv);
- }
- } else {
- if (isCXX) {
- /* Try the default one, then newest ones (hopefully) first */
-- execvp("clang++", argv);
-- execvp("clang++-devel", argv);
-- execvp("clang++-10.0", argv);
-- execvp("clang++-9.0", argv);
-- execvp("clang++-8.0", argv);
-- execvp("clang++-7.0", argv);
-- execvp("clang++-7", argv);
-- execvp("clang++-6.0", argv);
-- execvp("clang++-5.0", argv);
-- execvp("clang++-4.0", argv);
-- execvp("clang", argv);
-+ hf_execvp("clang++", argv);
-+ hf_execvp("clang++-devel", argv);
-+ hf_execvp("clang++-10.0", argv);
-+ hf_execvp("clang++-9.0", argv);
-+ hf_execvp("clang++-8.0", argv);
-+ hf_execvp("clang++-7.0", argv);
-+ hf_execvp("clang++-7", argv);
-+ hf_execvp("clang++-6.0", argv);
-+ hf_execvp("clang++-5.0", argv);
-+ hf_execvp("clang++-4.0", argv);
-+ hf_execvp("clang", argv);
- } else {
- /* Try the default one, then newest ones (hopefully) first */
-- execvp("clang", argv);
-- execvp("clang-devel", argv);
-- execvp("clang-10.0", argv);
-- execvp("clang-9.0", argv);
-- execvp("clang-8.0", argv);
-- execvp("clang-7.0", argv);
-- execvp("clang-7", argv);
-- execvp("clang-6.0", argv);
-- execvp("clang-5.0", argv);
-- execvp("clang-4.0", argv);
-+ hf_execvp("clang", argv);
-+ hf_execvp("clang-devel", argv);
-+ hf_execvp("clang-10.0", argv);
-+ hf_execvp("clang-9.0", argv);
-+ hf_execvp("clang-8.0", argv);
-+ hf_execvp("clang-7.0", argv);
-+ hf_execvp("clang-7", argv);
-+ hf_execvp("clang-6.0", argv);
-+ hf_execvp("clang-5.0", argv);
-+ hf_execvp("clang-4.0", argv);
- }
- }
-
diff --git a/honggfuzz/patches/patch-libhfcommon_util.c b/honggfuzz/patches/patch-libhfcommon_util.c
deleted file mode 100644
index 56b9073bf5..0000000000
--- a/honggfuzz/patches/patch-libhfcommon_util.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Convert char type to unsigned char type for isdigit(3) to avoid
-char-subscript error on NetBSD
-
---- libhfcommon/util.c.orig 2018-04-19 13:37:38.000000000 +0000
-+++ libhfcommon/util.c
-@@ -284,11 +284,11 @@ int64_t fastArray64Search(uint64_t* arra
- }
-
- bool util_isANumber(const char* s) {
-- if (!isdigit(s[0])) {
-+ if (!isdigit((unsigned char)s[0])) {
- return false;
- }
- for (int i = 0; s[i]; s++) {
-- if (!isdigit(s[i]) && s[i] != 'x') {
-+ if (!isdigit((unsigned char)s[i]) && s[i] != 'x') {
- return false;
- }
- }
diff --git a/honggfuzz/patches/patch-libhfuzz_memorycmp.c b/honggfuzz/patches/patch-libhfuzz_memorycmp.c
deleted file mode 100644
index 13cc9e5599..0000000000
--- a/honggfuzz/patches/patch-libhfuzz_memorycmp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Convert char type to unsigned char type for tolower(3) to avoid
-char-subscript error on NetBSD
-
---- libhfuzz/memorycmp.c.orig 2018-04-19 13:37:38.000000000 +0000
-+++ libhfuzz/memorycmp.c
-@@ -44,14 +44,14 @@ static inline int _strcasecmp(const char
- unsigned int v = 0;
-
- size_t i;
-- for (i = 0; tolower(s1[i]) == tolower(s2[i]); i++) {
-+ for (i = 0; tolower((unsigned char)s1[i]) == tolower((unsigned char)s2[i]); i++) {
- if (s1[i] == '\0' || s2[i] == '\0') {
- break;
- }
- v++;
- }
- instrumentUpdateCmpMap(addr, v);
-- return (tolower(s1[i]) - tolower(s2[i]));
-+ return (tolower((unsigned char)s1[i]) - tolower((unsigned char)s2[i]));
- }
-
- static inline int _strncmp(const char* s1, const char* s2, size_t n, uintptr_t addr) {
-@@ -86,8 +86,8 @@ static inline int _strncasecmp(const cha
- int ret = 0;
-
- for (size_t i = 0; i < n; i++) {
-- if (tolower(s1[i]) != tolower(s2[i])) {
-- ret = ret ? ret : (tolower(s1[i]) - tolower(s2[i]));
-+ if (tolower((unsigned char)s1[i]) != tolower((unsigned char)s2[i])) {
-+ ret = ret ? ret : (tolower((unsigned char)s1[i]) - tolower((unsigned char)s2[i]));
- } else {
- v++;
- }
Home |
Main Index |
Thread Index |
Old Index