CVS commit: pkgsrc/graphics/pcl

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Oct 26 00:06:50 UTC 2024

Modified Files:
        pkgsrc/graphics/pcl: Makefile distinfo
Added Files:
        pkgsrc/graphics/pcl/patches:
            patch-visualization_src_pcl__visualizer.cpp

Log Message:
graphics/pcl: Fix latent type abuse bug

This bug was probably present before but not caught until newer boost.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/pcl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/pcl/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp

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

Modified files:

Index: pkgsrc/graphics/pcl/Makefile
diff -u pkgsrc/graphics/pcl/Makefile:1.37 pkgsrc/graphics/pcl/Makefile:1.38
--- pkgsrc/graphics/pcl/Makefile:1.37   Fri Oct 25 23:37:44 2024
+++ pkgsrc/graphics/pcl/Makefile        Sat Oct 26 00:06:49 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2024/10/25 23:37:44 gdt Exp $
+# $NetBSD: Makefile,v 1.38 2024/10/26 00:06:49 gdt Exp $
 
 DISTNAME=      pcl-1.14.1
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PointCloudLibrary/}
 GITHUB_TAG=    pcl-${PKGVERSION_NOREV}
@@ -13,9 +13,6 @@ LICENSE=      modified-bsd
 
 WRKSRC=                ${WRKDIR}/pcl-${DISTNAME}
 
-# fails with boost 1.86.0
-#   https://github.com/PointCloudLibrary/pcl/issues/6157
-
 USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++14
 

Index: pkgsrc/graphics/pcl/distinfo
diff -u pkgsrc/graphics/pcl/distinfo:1.6 pkgsrc/graphics/pcl/distinfo:1.7
--- pkgsrc/graphics/pcl/distinfo:1.6    Sun May  5 20:58:06 2024
+++ pkgsrc/graphics/pcl/distinfo        Sat Oct 26 00:06:49 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2024/05/05 20:58:06 adam Exp $
+$NetBSD: distinfo,v 1.7 2024/10/26 00:06:49 gdt Exp $
 
 BLAKE2s (pcl-1.14.1.tar.gz) = 2041205bbfd63f4f5211a6332c6dd0a3d0ba90974a51b67e19e614936f0a7b20
 SHA512 (pcl-1.14.1.tar.gz) = 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b
 Size (pcl-1.14.1.tar.gz) = 68672885 bytes
 SHA1 (patch-cmake_pcl__targets.cmake) = 8f3e85b48edabc6573d8741bbb330fbc531d9b3f
+SHA1 (patch-visualization_src_pcl__visualizer.cpp) = 00a54a61f3ef7344de185b23603b02dbae5d395a

Added files:

Index: pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp:1.3
--- /dev/null   Sat Oct 26 00:06:50 2024
+++ pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp     Sat Oct 26 00:06:50 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-visualization_src_pcl__visualizer.cpp,v 1.3 2024/10/26 00:06:50 gdt Exp $
+
+https://github.com/PointCloudLibrary/pcl/issues/6157
+
+--- visualization/src/pcl_visualizer.cpp.orig  2024-10-25 23:54:29.888728521 +0000
++++ visualization/src/pcl_visualizer.cpp
+@@ -4592,7 +4592,10 @@ pcl::visualization::PCLVisualizer::getUn
+     if (valid)
+     {
+       unsigned int digest[5];
+-      sha1.get_digest (digest);
++      unsigned char digestchar[20];
++      sha1.get_digest (digestchar);
++      /* \todo Don't assume int is 32 bits! */
++      memcpy(digest, digestchar, 20);
+       sstream << ".";
+       sstream << std::hex << digest[0] << digest[1] << digest[2] << digest[3] << digest[4];
+       sstream << ".cam";