CVS commit: pkgsrc/sysutils/minipro

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sun Apr 27 17:46:01 UTC 2025

Modified Files:
        pkgsrc/sysutils/minipro: Makefile PLIST distinfo
        pkgsrc/sysutils/minipro/patches: patch-Makefile
Added Files:
        pkgsrc/sysutils/minipro/patches: patch-src_jedec.c patch-src_main.c
Removed Files:
        pkgsrc/sysutils/minipro/patches: patch-jedec.c patch-main.c

Log Message:
Update to minipro-0.7.3.

Summary of changes between 0.7 and 0.7.3:

NEW FEATURES
* Added a script to download an official Xgecu package and distill the
  individual algorithm files to a single "algorithm.xml" file for use
  with the T56 programmer.
* Added firmware update capability for the T48 and T56 programmers.
* Added OVC test and check for T48.
* Much improved T48 and T56 support.

BUG FIXES
* Corrected wrong code_memory_size for some old PROMs.
* Check for hardware fault in TL866A/CS about pin 20 GND driver.
* Fixed AVR fuse parsing.
* Fixed bad invocation of curl.
* ...plus several other misc fixes.

NOTES
* Algorithms (FPGA bitstreams) for the T56 are not included with this
  package to avoid copyright complications.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/minipro/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/minipro/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/minipro/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/minipro/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/minipro/patches/patch-jedec.c \
    pkgsrc/sysutils/minipro/patches/patch-main.c
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/minipro/patches/patch-src_jedec.c \
    pkgsrc/sysutils/minipro/patches/patch-src_main.c

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

Modified files:

Index: pkgsrc/sysutils/minipro/Makefile
diff -u pkgsrc/sysutils/minipro/Makefile:1.6 pkgsrc/sysutils/minipro/Makefile:1.7
--- pkgsrc/sysutils/minipro/Makefile:1.6        Thu Oct 10 17:43:17 2024
+++ pkgsrc/sysutils/minipro/Makefile    Sun Apr 27 17:46:01 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2024/10/10 17:43:17 nia Exp $
+# $NetBSD: Makefile,v 1.7 2025/04/27 17:46:01 thorpej Exp $
 
-MINIPRO_VERS=  0.7
+MINIPRO_VERS=  0.7.3
 
 DISTNAME=      minipro-${MINIPRO_VERS}
-PKGREVISION=   1
+#PKGREVISION=  1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=DavidGriffith/}
 GITLAB_PROJECT=        minipro
@@ -21,4 +21,5 @@ MAKE_FLAGS+=  MANDIR=${PREFIX}/${PKGMANDI
 MAKE_FLAGS+=   MAN_INSTDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/minipro/PLIST
diff -u pkgsrc/sysutils/minipro/PLIST:1.2 pkgsrc/sysutils/minipro/PLIST:1.3
--- pkgsrc/sysutils/minipro/PLIST:1.2   Mon Feb 13 23:38:48 2023
+++ pkgsrc/sysutils/minipro/PLIST       Sun Apr 27 17:46:01 2025
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2023/02/13 23:38:48 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/04/27 17:46:01 thorpej Exp $
+bin/dump-alg-minipro.bash
 bin/minipro
 man/man1/minipro.1
 share/minipro/infoic.xml

Index: pkgsrc/sysutils/minipro/distinfo
diff -u pkgsrc/sysutils/minipro/distinfo:1.3 pkgsrc/sysutils/minipro/distinfo:1.4
--- pkgsrc/sysutils/minipro/distinfo:1.3        Sun Apr 21 20:37:52 2024
+++ pkgsrc/sysutils/minipro/distinfo    Sun Apr 27 17:46:01 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2024/04/21 20:37:52 thorpej Exp $
+$NetBSD: distinfo,v 1.4 2025/04/27 17:46:01 thorpej Exp $
 
-BLAKE2s (minipro-0.7.tar.bz2) = 9abb0013deca2ed11ffe04d267cc1509fcf311daec0dd51e3e35667ba15905f2
-SHA512 (minipro-0.7.tar.bz2) = bae4bbf004032f324e541b0bc821fd03e2a4d047612e79bb6fa1cdec2b6d724aa1edf2c88ddf2a424148d555500d86c5c5ad096f329dd02ad2cdb4d1af2ef23e
-Size (minipro-0.7.tar.bz2) = 286649 bytes
-SHA1 (patch-Makefile) = 9fea8b01839d07fbfc630394ea32813824f7900b
-SHA1 (patch-jedec.c) = ab004b3c9a55057675b6bbcc9087da3a27d07c12
-SHA1 (patch-main.c) = b221ca2f2522c6097ef03674554bd814ad8f0d22
+BLAKE2s (minipro-0.7.3.tar.bz2) = 518195f673a81e6e29e0d73cf70a71575b4f5a41f6fecfeb5f03ce97adfde7a3
+SHA512 (minipro-0.7.3.tar.bz2) = 14df5329f0cdfd3b0456db2d5b09079a841fe2c09e1410b4bb3e8ef58b8d566358eb9afc585bcb5de1e3929ed1819e259e7bb92894b35e6a8aa0aa7c259acde2
+Size (minipro-0.7.3.tar.bz2) = 345229 bytes
+SHA1 (patch-Makefile) = a38cf5ed8feae27b393715f44e7cdf2e3275455d
+SHA1 (patch-src_jedec.c) = b656bf798a99971dbc719412943ccbc495a03fec
+SHA1 (patch-src_main.c) = 9ea3cfcb4af9957bd3c5a8fcc6d51aaab17c0dc7

Index: pkgsrc/sysutils/minipro/patches/patch-Makefile
diff -u pkgsrc/sysutils/minipro/patches/patch-Makefile:1.3 pkgsrc/sysutils/minipro/patches/patch-Makefile:1.4
--- pkgsrc/sysutils/minipro/patches/patch-Makefile:1.3  Sun Apr 21 20:37:52 2024
+++ pkgsrc/sysutils/minipro/patches/patch-Makefile      Sun Apr 27 17:46:01 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile,v 1.3 2024/04/21 20:37:52 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.4 2025/04/27 17:46:01 thorpej Exp $
 
-- Install the man page into the correct location for pkgsrc.
+- Conditionally set MAN_INSTDIR as with MANDIR.
 
---- Makefile.orig      2024-04-21 20:21:34.514659003 +0000
-+++ Makefile   2024-04-21 20:24:52.459594771 +0000
-@@ -73,7 +73,7 @@ BIN_INSTDIR=$(DESTDIR)$(PREFIX)/bin
+--- Makefile.orig      2025-04-27 16:24:26
++++ Makefile   2025-04-27 16:25:30
+@@ -77,7 +77,7 @@ MAN_INSTDIR=$(DESTDIR)$(PREFIX)/share/man/man1
  LIB_INSTDIR=$(DESTDIR)$(PREFIX)/lib
  SHARE_INSTDIR=$(DESTDIR)$(PREFIX)/share/minipro
  INCLUDE_INSTDIR=$(DESTDIR)$(PREFIX)/include/libminipro
 -MAN_INSTDIR=$(DESTDIR)$(PREFIX)/share/man/man1
-+MAN_INSTDIR=$(DESTDIR)$(PREFIX)/man/man1
++MAN_INSTDIR ?= $(DESTDIR)$(PREFIX)/share/man/man1
  
  UDEV_DIR=$(shell $(PKG_CONFIG) --define-variable=prefix=$(PREFIX) --silence-errors --variable=udevdir udev)
  UDEV_RULES_INSTDIR=$(DESTDIR)$(UDEV_DIR)/rules.d

Added files:

Index: pkgsrc/sysutils/minipro/patches/patch-src_jedec.c
diff -u /dev/null pkgsrc/sysutils/minipro/patches/patch-src_jedec.c:1.1
--- /dev/null   Sun Apr 27 17:46:01 2025
+++ pkgsrc/sysutils/minipro/patches/patch-src_jedec.c   Sun Apr 27 17:46:01 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_jedec.c,v 1.1 2025/04/27 17:46:01 thorpej Exp $
+
+Use ctype(3) functions safely.
+
+--- src/jedec.c.orig   2025-04-27 16:29:38
++++ src/jedec.c        2025-04-27 16:30:03
+@@ -146,7 +146,7 @@ static int parse_tokens(char *buffer, size_t buffer_si
+                       continue;
+ 
+               /* Skip non printable characters but ETX */
+-              while (!isalpha((int)*p_token) && *p_token != ETX)
++              while (!isalpha((unsigned char)*p_token) && *p_token != ETX)
+                       p_token++;
+ 
+               /* Exit the loop if the ETX character is found */
+@@ -274,7 +274,7 @@ static int parse_tokens(char *buffer, size_t buffer_si
+                        * 120 bits row.
+                        */
+                       while (*p_next != DELIMITER) {
+-                              if (!iscntrl((int)*p_next) && *p_next != ' ' &&
++                              if (!iscntrl((unsigned char)*p_next) && *p_next != ' ' &&
+                                   *p_next != '0' && *p_next != '1')
+                                       return BAD_FORMAT;
+ 
Index: pkgsrc/sysutils/minipro/patches/patch-src_main.c
diff -u /dev/null pkgsrc/sysutils/minipro/patches/patch-src_main.c:1.1
--- /dev/null   Sun Apr 27 17:46:01 2025
+++ pkgsrc/sysutils/minipro/patches/patch-src_main.c    Sun Apr 27 17:46:01 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_main.c,v 1.1 2025/04/27 17:46:01 thorpej Exp $
+
+Use ctype(3) functions safely.
+
+--- src/main.c.orig    2025-04-27 16:30:35
++++ src/main.c 2025-04-27 16:30:47
+@@ -1071,7 +1071,7 @@ int get_config_value(const char *buffer, const char *n
+               val = num;
+               cur += 2; /* Advances the pointer to the first numeric character */
+               while (cur < eol) {
+-                      if (isxdigit((int)*cur++)) /* check for hex digit */
++                      if (isxdigit((unsigned char)*cur++)) /* check for hex digit */
+                       {
+                               *val++ = *(cur - 1); /* put it in the buffer */
+                       }