CVS commit: pkgsrc/net/ucspi-tools

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 27 17:25:00 UTC 2025

Modified Files:
        pkgsrc/net/ucspi-tools: Makefile distinfo
        pkgsrc/net/ucspi-tools/patches: patch-Makefile
Removed Files:
        pkgsrc/net/ucspi-tools/patches: patch-tlsc.c

Log Message:
ucspi-tools: update a few commits to fix SmartOS. Bump PKGREVISION.

(Still packages on NetBSD and macOS.)

Changes:

- Change MAX_PATH to pathconf("/", _PC_PATH_MAX)
  for systems without MAX_PATH in their libc.
- remove useless environment code
- implementation of dprintf(3) for libc's that missing it
- move dprintf into an own file for httpc and httppc
- Makefile: Compile tcps and tcpc
- test.sh: Rewrite to be more clear on what it found
- test: Remove env.txt between tests
- test: Add test to make sure certs for tests are set up
- Fix number of expected tests.
- remove unused variable
- print program path on execvp error


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/ucspi-tools/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ucspi-tools/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/ucspi-tools/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/ucspi-tools/patches/patch-tlsc.c

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

Modified files:

Index: pkgsrc/net/ucspi-tools/Makefile
diff -u pkgsrc/net/ucspi-tools/Makefile:1.9 pkgsrc/net/ucspi-tools/Makefile:1.10
--- pkgsrc/net/ucspi-tools/Makefile:1.9 Tue Oct 24 22:10:36 2023
+++ pkgsrc/net/ucspi-tools/Makefile     Fri Jun 27 17:25:00 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2023/10/24 22:10:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/06/27 17:25:00 schmonz Exp $
 
 DISTNAME=              ucspi-tools-1.7
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net security
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=younix/}
 GITHUB_PROJECT=                ucspi
-GITHUB_TAG=            329110310c71a08a942b4a36613b6db090df65f4
+GITHUB_TAG=            9435993f47af23a98464beee872e412aec295e5c
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/younix/ucspi/
@@ -15,6 +15,10 @@ LICENSE=             isc
 # strlcpy
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
+# NI_MAXHOST
+CFLAGS.SunOS+=         -D__EXTENSIONS__
+LDFLAGS.SunOS+=                -lsocket
+
 USE_TOOLS+=            gmake pkg-config
 MAKE_FILE=             GNUmakefile
 

Index: pkgsrc/net/ucspi-tools/distinfo
diff -u pkgsrc/net/ucspi-tools/distinfo:1.7 pkgsrc/net/ucspi-tools/distinfo:1.8
--- pkgsrc/net/ucspi-tools/distinfo:1.7 Tue Oct 26 11:07:06 2021
+++ pkgsrc/net/ucspi-tools/distinfo     Fri Jun 27 17:25:00 2025
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:07:06 nia Exp $
+$NetBSD: distinfo,v 1.8 2025/06/27 17:25:00 schmonz Exp $
 
-BLAKE2s (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = e14ca81d920eb9ce22b176b64c65378182d43f92c067666d8cfa7d0a3e264c3b
-SHA512 (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = 
233464655db10580e61b094c619bb5d24ac325729c5a1f68773dfe1be862e760a1f8cd1b64171d9f419db56d56b9e2ac8597508f352ebc8cab928a2916f3fdce
-Size (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = 24083 bytes
-SHA1 (patch-Makefile) = 2ac060090aac2052a963f9726663b40aee369823
+BLAKE2s (ucspi-tools-1.7-9435993f47af23a98464beee872e412aec295e5c.tar.gz) = 43fa25061f02678a50ab3cfebbeb19f15dec2f53aa943fd4c5f6a0ce0758e02e
+SHA512 (ucspi-tools-1.7-9435993f47af23a98464beee872e412aec295e5c.tar.gz) = 
fab4dc9ac74bcb748434604c422a5245f4d859f45d8b9099764e931b61f06d02c08d424ca53b4dec8cde6ad8e2fc71df3aa3bceeae06c5fbec9005174484fc8b
+Size (ucspi-tools-1.7-9435993f47af23a98464beee872e412aec295e5c.tar.gz) = 24399 bytes
+SHA1 (patch-Makefile) = baa651f0509fc492a5954182724ab6501f9ce583
 SHA1 (patch-https.c) = 463319786e06e987262b0d3a3e6d7112ff115276
 SHA1 (patch-tests.mk) = 4d8444121da5c07527ed1939d86e2303cc99e49d
-SHA1 (patch-tlsc.c) = 3ae01739e614b2b8008e7bc4d5b01130edec2ff9

Index: pkgsrc/net/ucspi-tools/patches/patch-Makefile
diff -u pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.5 pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.6
--- pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.5   Mon Jul 12 21:32:49 2021
+++ pkgsrc/net/ucspi-tools/patches/patch-Makefile       Fri Jun 27 17:25:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.5 2021/07/12 21:32:49 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.6 2025/06/27 17:25:00 schmonz Exp $
 
 Make sure openssl headers get found.
 
---- Makefile.orig      2021-07-03 15:04:54.000000000 +0000
+--- Makefile.orig      2023-09-20 18:48:11.000000000 +0000
 +++ Makefile
 @@ -3,7 +3,7 @@ include config.mk
  DISTNAME := ucspi-tools-${VERSION}
@@ -13,3 +13,18 @@ Make sure openssl headers get found.
  
  .PHONY: all test clean install
  .SUFFIXES: .c .o
+@@ -50,10 +50,10 @@ clean:
+ install: all
+       mkdir -p ${BINDIR}
+       mkdir -p ${MAN1DIR}
+-      install -m 775 sockc ${BINDIR}
+-      install -m 775 tlsc ${BINDIR}
+-      install -m 775 tlss ${BINDIR}
+-      install -m 775 httppc ${BINDIR}
++      ${BSD_INSTALL_PROGRAM} sockc ${BINDIR}
++      ${BSD_INSTALL_PROGRAM} tlsc ${BINDIR}
++      ${BSD_INSTALL_PROGRAM} tlss ${BINDIR}
++      ${BSD_INSTALL_PROGRAM} httppc ${BINDIR}
+       install -m 444 sockc.1 ${MAN1DIR}
+       install -m 444 tlsc.1 ${MAN1DIR}
+       install -m 444 tlss.1 ${MAN1DIR}