CVS commit: pkgsrc/security/signify

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 19 20:34:04 UTC 2025

Modified Files:
        pkgsrc/security/signify: DESCR Makefile distinfo

Log Message:
security/signify: rebase package on local standalone version.

This is meant as a light fork of the version found in Leah's outils,
including only the required bits, plus our fixes and a simpler BSD
Makefile. Versioning now follows the date of the CVS commit in
OpenBSD/src which we're synced with.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/signify/DESCR
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/signify/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/signify/distinfo

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

Modified files:

Index: pkgsrc/security/signify/DESCR
diff -u pkgsrc/security/signify/DESCR:1.1 pkgsrc/security/signify/DESCR:1.2
--- pkgsrc/security/signify/DESCR:1.1   Sat Oct  8 11:30:27 2022
+++ pkgsrc/security/signify/DESCR       Sun Oct 19 20:34:04 2025
@@ -1,5 +1,4 @@
+Standalone portable version of OpenBSD's signify(1), based on Leah
+Neukirchen's outils.
 The signify utility creates and verifies cryptographic signatures.
-A signature verifies the integrity of a message
-
-This version of signify is part of outils, a portable collection of
-non-standard OpenBSD tools.
+A signature verifies the integrity of a message.

Index: pkgsrc/security/signify/Makefile
diff -u pkgsrc/security/signify/Makefile:1.7 pkgsrc/security/signify/Makefile:1.8
--- pkgsrc/security/signify/Makefile:1.7        Mon Jul 14 18:24:21 2025
+++ pkgsrc/security/signify/Makefile    Sun Oct 19 20:34:04 2025
@@ -1,67 +1,48 @@
-# $NetBSD: Makefile,v 1.7 2025/07/14 18:24:21 vins Exp $
+# $NetBSD: Makefile,v 1.8 2025/10/19 20:34:04 vins Exp $
 
-DISTNAME=      outils-0.14
-PKGNAME=       ${DISTNAME:S,outils,signify,}
+DISTNAME=      signify-20250520
 CATEGORIES=    security
-MASTER_SITES=  https://git.vuxu.org/outils/snapshot/
+MASTER_SITES=  ftp://ftp.NetBSD.org/pub/NetBSD/misc/vins/dists/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://flak.tedunangst.com/post/signify
 COMMENT=       Cryptographically sign and verify files, from OpenBSD
 LICENSE=       original-bsd AND modified-bsd AND isc AND public-domain
 
-USE_TOOLS+=    gmake
+CFLAGS.Linux+= -D_GNU_SOURCE           # dl_iterate_phd()
+CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t
+CFLAGS.SunOS+= -Du_int32_t=uint32_t -Du_int64_t=uint64_t
 
 LIBS+=         -lm
 LIBS.SunOS+=   -lresolv -lrt
 
-MAKE_FLAGS+=   ALL=src/usr.bin/signify/signify
-MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+=   LIBS=${LIBS:Q}
+USE_BSD_MAKEFILE=      yes
 
-BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--as-needed
+MAKE_ENV+=             EXTRA_SRCS=${BUILD_SRCS:Q} LDADD=${LIBS:Q}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/signify
 
-OUTDIR:=       ${WRKSRC}/src/usr.bin/signify
-LIBSRCDIR:=    ${WRKSRC}/src/liboutils
-
-.include "../../mk/bsd.prefs.mk"
-
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_MESSAGE.paths=   Do not hardcode configuration directory
-SUBST_FILES.paths+=    ${OUTDIR}/signify.c
-SUBST_FILES.paths+=    ${OUTDIR}/signify.1
+SUBST_FILES.paths+=    signify.c signify.1
 SUBST_SED.paths=       -e 's|/etc/signify|${PKG_SYSCONFDIR}/signify|g'
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=                ints
-SUBST_MESSAGE.ints=    SunOS stdint(3) doesn't provide `u_int*' typedefs
-SUBST_STAGE.ints=      pre-configure
-SUBST_FILES.ints+=     ${LIBSRCDIR}/*.c
-SUBST_FILES.ints+=     ${LIBSRCDIR}/include/*.h
-SUBST_SED.ints=                -e 's|u_int|uint|g'
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
+BUILD_SRCS+=   explicit_bzero.c freezero.c
+.elif ${OPSYS} == "Linux"
+BUILD_SRCS+=   arc4random.c base64.c explicit_bzero.c \
+               freezero.c getentropy_linux.c strlcpy.c
 .endif
 
 post-patch:
 .if ${OPSYS} == "NetBSD"
-# The sys/* overrides are not needed on NetSD
-       ${RUN}${RM} ${WRKSRC}/src/liboutils/include/sys/*
-
-.elif ${OPSYS} == "SunOS"
-# Solaris lacks MIN/MAX macros in sys/param.h
-       cd ${LIBSRCDIR} &&                      \
-       ${RUN}${CAT:Q} outils.h >> minmax.h &&  \
-       ${RUN}${MV:Q} minmax.h outils.h
+# The sys/* overrides are not needed on NetBSD
+       ${RUN}${RM} ${WRKSRC}/incs/sys/*
 .endif
 
-do-install:
-       ${INSTALL_PROGRAM} ${OUTDIR}/signify    \
-               ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${OUTDIR}/signify.1      \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/signify/distinfo
diff -u pkgsrc/security/signify/distinfo:1.4 pkgsrc/security/signify/distinfo:1.5
--- pkgsrc/security/signify/distinfo:1.4        Mon Jul 14 18:24:21 2025
+++ pkgsrc/security/signify/distinfo    Sun Oct 19 20:34:04 2025
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.4 2025/07/14 18:24:21 vins Exp $
+$NetBSD: distinfo,v 1.5 2025/10/19 20:34:04 vins Exp $
 
-BLAKE2s (outils-0.14.tar.gz) = cb4ca5717787012432ffb487837e4bde72fa8d749e63937b9fc5e1ac20faac27
-SHA512 (outils-0.14.tar.gz) = 615fc7678492efed47bde73f5589f39e3ca9a3019a9bdee2b48074155af0e692728d0bc80607c3ceb93bc6d3fc5fbfa47c3427e652da0e1a1610c08639a5ee33
-Size (outils-0.14.tar.gz) = 281863 bytes
-SHA1 (patch-Makefile) = 1d4ed8ff1a8d728eecab09f1dfebba95d7c461ea
-SHA1 (patch-src_liboutils_minmax.h) = 123c67e825d38758e8d56139f75cb983c4115e08
-SHA1 (patch-src_liboutils_sha2.c) = 03182d6019efd9d60ff05eee9cef8de53632caa8
+BLAKE2s (signify-20250520.tar.xz) = e007a8d26b9b654ae9ffe0fecad2950fdf29a48fa9cfd98280b81a4f59c846a8
+SHA512 (signify-20250520.tar.xz) = daa5a7b1d223d6e2c39d9d46c112afb17997bb9cbb4b08458e7030ded6815cf7f401c9fa1edabb137d6a56d6d2aa8d10ab6b8b3627c071a197110ea1909ef0a1
+Size (signify-20250520.tar.xz) = 79832 bytes