CVS commit: pkgsrc/security/uacme

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Thu Oct 29 08:42:23 UTC 2026

Modified Files:
        pkgsrc/security/uacme: Makefile distinfo
Added Files:
        pkgsrc/security/uacme/patches: patch-crypto.c patch-uacme.1.txt

Log Message:
fix some minor issues

1. the DISTFILE is stored as v1.8.1.tar.gz which is prone to conflict, use
the github framework to ensure it is stored as uacme-1.8.1.tar.gz

2. the manpage uacme.1 claims a default CONFDIR which is wrong, fix that

3. a ctype error in crypto.c


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/uacme/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/uacme/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/uacme/patches/patch-crypto.c \
    pkgsrc/security/uacme/patches/patch-uacme.1.txt

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

Modified files:

Index: pkgsrc/security/uacme/Makefile
diff -u pkgsrc/security/uacme/Makefile:1.16 pkgsrc/security/uacme/Makefile:1.17
--- pkgsrc/security/uacme/Makefile:1.16 Thu May 14 16:42:03 2026
+++ pkgsrc/security/uacme/Makefile      Thu Oct 29 08:42:23 2026
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2026/05/14 16:42:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2026/10/29 08:42:23 plunky Exp $
 
-DISTNAME=      v${PKGVER}
-PKGNAME=       uacme-${PKGVER}
-PKGREVISION=   1
-PKGVER=                1.8.1
+DISTNAME=      uacme-1.8.1
+PKGREVISION=   2
 CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ndilieto/uacme/archive/refs/tags/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ndilieto/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    hauke%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/ndilieto/uacme
@@ -20,7 +19,6 @@ USE_LANGUAGES=                c
 USE_CC_FEATURES=       c11
 
 GNU_CONFIGURE=         yes
-WRKSRC=                        ${WRKDIR}/uacme-${PKGVER}
 
 HOOKDIR=               libexec
 DOCDIR=                        share/doc/uacme
@@ -51,7 +49,7 @@ MESSAGE_SUBST+=                       UACME_CHALLENGE_PATH=$
 SUBST_CLASSES+=                        confdir
 SUBST_STAGE.confdir=           pre-configure
 SUBST_MESSAGE.confdir=         Set CONFDIR default
-SUBST_FILES.confdir=           uacme.c
+SUBST_FILES.confdir=           uacme.c uacme.1.txt
 SUBST_VARS.confdir=            UACME_CONFDIR
 
 SUBST_CLASSES+=                        challenge

Index: pkgsrc/security/uacme/distinfo
diff -u pkgsrc/security/uacme/distinfo:1.3 pkgsrc/security/uacme/distinfo:1.4
--- pkgsrc/security/uacme/distinfo:1.3  Fri May  1 21:27:35 2026
+++ pkgsrc/security/uacme/distinfo      Thu Oct 29 08:42:23 2026
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.3 2026/05/01 21:27:35 hauke Exp $
+$NetBSD: distinfo,v 1.4 2026/10/29 08:42:23 plunky Exp $
 
-BLAKE2s (v1.8.1.tar.gz) = 0d1520dea6599c1e70b112ddada33e79bc483d9e5923409a214fbe4f46882fbe
-SHA512 (v1.8.1.tar.gz) = 96c6f9f54b412d8aa6f339ffc6616e7b1ce372cf1d796ade088adbd18d0d0a9e046363925315458a5ba1ccce8bbf5795453b5185869ed80aed668338c8adbf7d
-Size (v1.8.1.tar.gz) = 252881 bytes
+BLAKE2s (uacme-1.8.1.tar.gz) = 0d1520dea6599c1e70b112ddada33e79bc483d9e5923409a214fbe4f46882fbe
+SHA512 (uacme-1.8.1.tar.gz) = 96c6f9f54b412d8aa6f339ffc6616e7b1ce372cf1d796ade088adbd18d0d0a9e046363925315458a5ba1ccce8bbf5795453b5185869ed80aed668338c8adbf7d
+Size (uacme-1.8.1.tar.gz) = 252881 bytes
 SHA1 (patch-Makefile.am) = 562ca9e346d95771798c8fab146f59aaefb57b52
 SHA1 (patch-configure.ac) = 6bc5ddca5c45b50d34fb8c32366e7f6d59cf9fdc
+SHA1 (patch-crypto.c) = fb3e09c96689efaf6c5c3bacf847fd9fe0a1e231
+SHA1 (patch-uacme.1.txt) = 467cc314ad650be7532391fa80bed87678379a0d
 SHA1 (patch-uacme.c) = 31a41a05cab1d053232ce182d3d63d3e9a70afd9
 SHA1 (patch-uacme.sh) = dab3857c5f866672a9c0f73d51513832f1cf853c

Added files:

Index: pkgsrc/security/uacme/patches/patch-crypto.c
diff -u /dev/null pkgsrc/security/uacme/patches/patch-crypto.c:1.1
--- /dev/null   Thu Oct 29 08:42:23 2026
+++ pkgsrc/security/uacme/patches/patch-crypto.c        Thu Oct 29 08:42:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-crypto.c,v 1.1 2026/10/29 08:42:23 plunky Exp $
+
+Fix ctype(3) abuse
+
+--- crypto.c.orig      2026-10-28 19:19:53.656102037 +0000
++++ crypto.c
+@@ -4593,7 +4593,7 @@ static time_t parse_rfc3339_timestamp(const char *str)
+         return (time_t)-1;
+     str += n;
+     str += strspn(str, ".0123456789");
+-    if (toupper(*str) != 'Z') {
++    if (toupper(*(unsigned char *)str) != 'Z') {
+         int tz, tzh, tzm;
+         if (strlen(str) < 6 ||
+             sscanf(str + 1, "%2d:%2d", &tzh, &tzm) != 2)
Index: pkgsrc/security/uacme/patches/patch-uacme.1.txt
diff -u /dev/null pkgsrc/security/uacme/patches/patch-uacme.1.txt:1.1
--- /dev/null   Thu Oct 29 08:42:23 2026
+++ pkgsrc/security/uacme/patches/patch-uacme.1.txt     Thu Oct 29 08:42:23 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-uacme.1.txt,v 1.1 2026/10/29 08:42:23 plunky Exp $
+
+show correct UACME_CONFDIR
+
+--- uacme.1.txt.orig   2026-10-28 18:39:57.856097542 +0000
++++ uacme.1.txt
+@@ -55,7 +55,7 @@ -------
+     (*NID_X9_62_prime256v1* curve) or 384 (*NID_secp384r1* curve).
+ 
+ *-c, --confdir* 'CONFDIR'::
+-    Use configuration directory 'CONFDIR' (default '{sysconfdir}/ssl/uacme').
++    Use configuration directory 'CONFDIR' (default '@UACME_CONFDIR@').
+     The structure is as follows (multiple 'IDENTIFIERs' allowed)
+         'CONFDIR/private/key.pem'::: ACME account private key
+         'CONFDIR/private/IDENTIFIER/key.pem'::: certificate key for