Fri Sep 1 07:52:02 2017 UTC ()
Replace patch with correct upstream fix.

Bump PKGREVISION.


(wiz)
diff -r1.1 -r1.2 pkgsrc/devel/tlsh/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/tlsh/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp
cvs diff -r1.1 -r1.2 pkgsrc/devel/tlsh/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/tlsh/Makefile 2015/12/02 17:22:18 1.1
+++ pkgsrc/devel/tlsh/Makefile 2017/09/01 07:52:02 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.1 2015/12/02 17:22:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2017/09/01 07:52:02 wiz Exp $
2 2
 3PKGREVISION= 1
3USE_CMAKE= yes 4USE_CMAKE= yes
4CONFIGURE_DIRS= build/release 5CONFIGURE_DIRS= build/release
5CMAKE_ARG_PATH= ../.. 6CMAKE_ARG_PATH= ../..
6USE_LANGUAGES= c c++ 7USE_LANGUAGES= c c++
7# all tests fail 8# all tests fail
8#TEST_TARGET= test 9#TEST_TARGET= test
9 10
10INSTALLATION_DIRS= bin include lib 11INSTALLATION_DIRS= bin include lib
11 12
12post-extract: 13post-extract:
13 mkdir ${WRKSRC}/build/release 14 mkdir ${WRKSRC}/build/release
14 15
15do-install: 16do-install:
cvs diff -r1.4 -r1.5 pkgsrc/devel/tlsh/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tlsh/distinfo 2016/12/17 14:18:32 1.4
+++ pkgsrc/devel/tlsh/distinfo 2017/09/01 07:52:02 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2016/12/17 14:18:32 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2017/09/01 07:52:02 wiz Exp $
2 2
3SHA1 (tlsh-3.4.5.tar.gz) = 2d50b1e66ffbfd215f36648258d28be4171015c0 3SHA1 (tlsh-3.4.5.tar.gz) = 2d50b1e66ffbfd215f36648258d28be4171015c0
4RMD160 (tlsh-3.4.5.tar.gz) = a7f5f94d8113a6d6e24a84fe86b3d9dc93609757 4RMD160 (tlsh-3.4.5.tar.gz) = a7f5f94d8113a6d6e24a84fe86b3d9dc93609757
5SHA512 (tlsh-3.4.5.tar.gz) = 039f9fb9fb467a9b22f85a621c46069bac1745da039657840e1ff1a53901392fcf29d3c953b0f47d831d022a5e2594925c726d4ff921614418a3bb023a4ebbdc 5SHA512 (tlsh-3.4.5.tar.gz) = 039f9fb9fb467a9b22f85a621c46069bac1745da039657840e1ff1a53901392fcf29d3c953b0f47d831d022a5e2594925c726d4ff921614418a3bb023a4ebbdc
6Size (tlsh-3.4.5.tar.gz) = 1914815 bytes 6Size (tlsh-3.4.5.tar.gz) = 1914815 bytes
7SHA1 (patch-utils_rand__tags.cpp) = 084f910f41e04aa214e62c3b2e430e27d0e14920 7SHA1 (patch-utils_rand__tags.cpp) = 024d61efd590d5e16b20100eac729276fc996ee6
cvs diff -r1.1 -r1.2 pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp (expand / switch to unified diff)

--- pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp 2016/12/17 14:18:32 1.1
+++ pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp 2017/09/01 07:52:02 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-utils_rand__tags.cpp,v 1.1 2016/12/17 14:18:32 joerg Exp $ 1$NetBSD: patch-utils_rand__tags.cpp,v 1.2 2017/09/01 07:52:02 wiz Exp $
2 2
3Checking for negative pointers doesn't make sense. 3https://github.com/trendmicro/tlsh/commit/fb076b0f62b620e0de4cf95a5ccb81f21d4abc24#diff-02ad04ab1753a2119772311c29f24d23
4 4
5--- utils/rand_tags.cpp.orig 2016-12-16 17:30:02.495417195 +0000 5--- utils/rand_tags.cpp.orig 2016-12-16 17:30:02.495417195 +0000
6+++ utils/rand_tags.cpp 6+++ utils/rand_tags.cpp
7@@ -366,7 +366,7 @@ struct tagdef oneoff_def[] = { 7@@ -366,7 +366,7 @@ struct tagdef oneoff_def[] = {
8  8
9 static void rhtml_contents(std::string &htmls, int *ntags, int *ndistinct_tags) 9 static void rhtml_contents(std::string &htmls, int *ntags, int *ndistinct_tags)
10 { 10 {
11- if ((*ntags <= 0) && (ndistinct_tags <= 0)) 11- if ((*ntags <= 0) && (ndistinct_tags <= 0))
12+ if ((*ntags <= 0) && (ndistinct_tags == 0)) 12+ if ((*ntags <= 0) && (*ndistinct_tags <= 0))
13 return;  13 return;
14 if (random() % 10 == 1) { 14 if (random() % 10 == 1) {
15 anchor(htmls); 15 anchor(htmls);