[pkgsrc/trunk]: pkgsrc/security/steghide steghide: avoid ambiguous math funct...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/121bd9add1bd
branches:  trunk
changeset: 377941:121bd9add1bd
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Apr 25 15:01:53 2022 +0000

description:
steghide: avoid ambiguous math functions

diffstat:

 security/steghide/distinfo                     |   5 +++--
 security/steghide/patches/patch-src_AUtils.h   |  15 +++++++++++++++
 security/steghide/patches/patch-src_BmpFile.cc |  17 ++++++++++++++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 7a6613ae4b24 -r 121bd9add1bd security/steghide/distinfo
--- a/security/steghide/distinfo        Mon Apr 25 14:40:13 2022 +0000
+++ b/security/steghide/distinfo        Mon Apr 25 15:01:53 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:18:03 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/04/25 15:01:53 tnn Exp $
 
 BLAKE2s (steghide-0.5.1.tar.gz) = 38a3ca6889fc8b460ee4922517e7f2ee9257a7fed7f8dc20ed7e5bdcdcbb4621
 SHA512 (steghide-0.5.1.tar.gz) = 6cda3e33e91123fbc5caa112efcacf09180505abd4f6f229878cd443817c60a04498aead02509c7532fd6924225c6b752820c51e452a83c520f228273d610a57
@@ -14,5 +14,6 @@
 SHA1 (patch-ai) = 9ae6443ee9a997a859456a712327cc7d17ede0f4
 SHA1 (patch-aj) = 36039401484d85cec20bc157b29f55e219a762b3
 SHA1 (patch-ak) = 404abb1935208b9eba9711677e1514154486543b
-SHA1 (patch-src_BmpFile.cc) = fb2c6ac488ddb50f993ac9179a557ccda393b7f5
+SHA1 (patch-src_AUtils.h) = 7a3c001943ce0802f15119b3d32b4fc6ad00b4af
+SHA1 (patch-src_BmpFile.cc) = 0a0ee8f65f4e808ec2514e4bfad9e09864c5ab3e
 SHA1 (patch-src_Graph.cc) = 211d2607ccb5b9c4de0a91497a14376d89e0fe63
diff -r 7a6613ae4b24 -r 121bd9add1bd security/steghide/patches/patch-src_AUtils.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/steghide/patches/patch-src_AUtils.h      Mon Apr 25 15:01:53 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_AUtils.h,v 1.1 2022/04/25 15:01:53 tnn Exp $
+
+avoid ambiguous math functions
+
+--- src/AUtils.h.orig  2003-10-05 10:17:50.000000000 +0000
++++ src/AUtils.h
+@@ -24,7 +24,7 @@
+ #include <cmath>
+ #ifndef log2
+       // this is in an #ifndef because some cmath implementations #define log2 and some not
+-#     define log2(x) (log(x) / log(2.0))
++#     define log2(x) (log((double)(x)) / log(2.0))
+ #endif
+ 
+ /**
diff -r 7a6613ae4b24 -r 121bd9add1bd security/steghide/patches/patch-src_BmpFile.cc
--- a/security/steghide/patches/patch-src_BmpFile.cc    Mon Apr 25 14:40:13 2022 +0000
+++ b/security/steghide/patches/patch-src_BmpFile.cc    Mon Apr 25 15:01:53 2022 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-src_BmpFile.cc,v 1.1 2013/03/02 17:57:08 joerg Exp $
+$NetBSD: patch-src_BmpFile.cc,v 1.2 2022/04/25 15:01:53 tnn Exp $
+
+avoid ambiguous math functions
 
---- src/BmpFile.cc.orig        2013-03-01 15:07:01.000000000 +0000
+--- src/BmpFile.cc.orig        2003-09-28 15:30:30.000000000 +0000
 +++ src/BmpFile.cc
-@@ -214,10 +214,10 @@ std::vector<SampleValueAdjacencyList*> B
+@@ -36,6 +36,8 @@
+ #include "common.h"
+ #include "error.h"
+ 
++using std:sqrt;
++
+ BmpFile::BmpFile (BinaryIO *io)
+       : CvrStgFile()
+ {
+@@ -214,10 +216,10 @@ std::vector<SampleValueAdjacencyList*> B
                // create reservoir - for every i reservoir[i] contains the sample values that are neighbourss of
                // the sample value with label i and have a lower label (and have already been found)
                // This is necessary to use collapsing trees together with bucket sort (without huge increase in memory usage)