CVS commit: pkgsrc/print/hplip

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 27 14:00:53 UTC 2025

Modified Files:
        pkgsrc/print/hplip: distinfo
Added Files:
        pkgsrc/print/hplip/patches: patch-prnt_hpijs_ljzjscolor.cpp
Removed Files:
        pkgsrc/print/hplip/patches: patch-prnt_hpijs_hjzjscolor.cpp

Log Message:
hplip: rename patch per pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/print/hplip/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/hplip/patches/patch-prnt_hpijs_hjzjscolor.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/hplip/patches/patch-prnt_hpijs_ljzjscolor.cpp

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

Modified files:

Index: pkgsrc/print/hplip/distinfo
diff -u pkgsrc/print/hplip/distinfo:1.44 pkgsrc/print/hplip/distinfo:1.45
--- pkgsrc/print/hplip/distinfo:1.44    Sat Nov  4 14:22:16 2023
+++ pkgsrc/print/hplip/distinfo Mon Jan 27 14:00:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2023/11/04 14:22:16 wiz Exp $
+$NetBSD: distinfo,v 1.45 2025/01/27 14:00:53 wiz Exp $
 
 BLAKE2s (hplip-3.19.12.tar.gz) = 24ea25e3ac4ab3c521ae65acb27a88a65a164f3d93b088e33f13f97ee8ad6eae
 SHA512 (hplip-3.19.12.tar.gz) = 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
@@ -12,7 +12,7 @@ SHA1 (patch-io_hpmud_musb.h) = ad634f5a1
 SHA1 (patch-prnt_hpcups_HPCupsFilter.cpp) = 19a26044ce24433b0188c243925b4028bc388f1a
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = cfec38607572af9536e7c21cfe2e491d07d3838d
-SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
+SHA1 (patch-prnt_hpijs_ljzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
 SHA1 (patch-prnt_hpps_hppsfilter.c) = 5a3e7f3f5504fb88d58cf2b79fa138066859aa00
 SHA1 (patch-protocol_discovery_mdns.c) = 41427f6a381f6cdaa2f1d8f5c050d6b51eeb412e
 SHA1 (patch-scan.py) = 3ca05c3569ec78b5752af364e4d0728900076c3c

Added files:

Index: pkgsrc/print/hplip/patches/patch-prnt_hpijs_ljzjscolor.cpp
diff -u /dev/null pkgsrc/print/hplip/patches/patch-prnt_hpijs_ljzjscolor.cpp:1.1
--- /dev/null   Mon Jan 27 14:00:54 2025
+++ pkgsrc/print/hplip/patches/patch-prnt_hpijs_ljzjscolor.cpp  Mon Jan 27 14:00:53 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-prnt_hpijs_ljzjscolor.cpp,v 1.1 2025/01/27 14:00:53 wiz Exp $
+
+use strlen(3) instead of strnlen(3), for use on NetBSD 4.0 and earlier
+as well as other systems that don't have strnlen.
+
+Ideally, the configure script would check for strnlen, and include a
+replacement  implementation if required.
+
+--- prnt/hpijs/ljzjscolor.cpp.orig     2012-06-05 09:34:13.000000000 +0000
++++ prnt/hpijs/ljzjscolor.cpp
+@@ -522,11 +522,13 @@ bool LJZjsColor::IsLJZjsColor2Printer(Sy
+       DRIVER_ERROR err;
+       bool bLJZjsColor2Printer = FALSE;
+       err = pSS->GetDeviceID(strDeviceID,DevIDBuffSize,FALSE);
++      /* make sure there is a NULL terminator on the string */
++      strDeviceID[(DevIDBuffSize - 1)] = 0;
+ 
+       for(int i=0; i< LJZJSCOLOR2DEVICESCOUNT; i++)
+       {
+               if( NO_ERROR == err &&
+-                      (strnlen((const char*)strDeviceID, DevIDBuffSize)< DevIDBuffSize) && 
++                      (strlen((const char*)strDeviceID) < DevIDBuffSize) && 
+                       (strstr((const char*)strDeviceID, (const char*)szLJZjsColor2ModelNames[i])))
+               {
+                       bLJZjsColor2Printer = TRUE;