CVS commit: pkgsrc/devel/tlsh

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep  1 07:52:02 UTC 2017

Modified Files:
        pkgsrc/devel/tlsh: Makefile distinfo
        pkgsrc/devel/tlsh/patches: patch-utils_rand__tags.cpp

Log Message:
Replace patch with correct upstream fix.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/tlsh/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/tlsh/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp

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

Modified files:

Index: pkgsrc/devel/tlsh/Makefile
diff -u pkgsrc/devel/tlsh/Makefile:1.1 pkgsrc/devel/tlsh/Makefile:1.2
--- pkgsrc/devel/tlsh/Makefile:1.1      Wed Dec  2 17:22:18 2015
+++ pkgsrc/devel/tlsh/Makefile  Fri Sep  1 07:52:02 2017
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2015/12/02 17:22:18 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/01 07:52:02 wiz Exp $
 
+PKGREVISION=   1
 USE_CMAKE=     yes
 CONFIGURE_DIRS=        build/release
 CMAKE_ARG_PATH=        ../..

Index: pkgsrc/devel/tlsh/distinfo
diff -u pkgsrc/devel/tlsh/distinfo:1.4 pkgsrc/devel/tlsh/distinfo:1.5
--- pkgsrc/devel/tlsh/distinfo:1.4      Sat Dec 17 14:18:32 2016
+++ pkgsrc/devel/tlsh/distinfo  Fri Sep  1 07:52:02 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/12/17 14:18:32 joerg Exp $
+$NetBSD: distinfo,v 1.5 2017/09/01 07:52:02 wiz Exp $
 
 SHA1 (tlsh-3.4.5.tar.gz) = 2d50b1e66ffbfd215f36648258d28be4171015c0
 RMD160 (tlsh-3.4.5.tar.gz) = a7f5f94d8113a6d6e24a84fe86b3d9dc93609757
 SHA512 (tlsh-3.4.5.tar.gz) = 039f9fb9fb467a9b22f85a621c46069bac1745da039657840e1ff1a53901392fcf29d3c953b0f47d831d022a5e2594925c726d4ff921614418a3bb023a4ebbdc
 Size (tlsh-3.4.5.tar.gz) = 1914815 bytes
-SHA1 (patch-utils_rand__tags.cpp) = 084f910f41e04aa214e62c3b2e430e27d0e14920
+SHA1 (patch-utils_rand__tags.cpp) = 024d61efd590d5e16b20100eac729276fc996ee6

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