CVS commit: pkgsrc/sysutils/swtpm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/swtpm
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Tue, 5 May 2026 10:21:46 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May  5 10:21:46 UTC 2026

Modified Files:
        pkgsrc/sysutils/swtpm: Makefile distinfo
        pkgsrc/sysutils/swtpm/patches: patch-tests_sed-inplace
Added Files:
        pkgsrc/sysutils/swtpm/patches: patch-include_swtpm_tpm__ioctl.h
            patch-include_sys__dependencies.h
            patch-src_swtpm__ioctl_tpm__ioctl.c patch-src_swtpm_check__algos.c
            patch-src_swtpm_common.c

Log Message:
swtpm: Portability, sysconfdir, and pkglint fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/swtpm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/swtpm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/swtpm/patches/patch-include_swtpm_tpm__ioctl.h \
    pkgsrc/sysutils/swtpm/patches/patch-include_sys__dependencies.h \
    pkgsrc/sysutils/swtpm/patches/patch-src_swtpm__ioctl_tpm__ioctl.c \
    pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_check__algos.c \
    pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_common.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace

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

Modified files:

Index: pkgsrc/sysutils/swtpm/Makefile
diff -u pkgsrc/sysutils/swtpm/Makefile:1.16 pkgsrc/sysutils/swtpm/Makefile:1.17
--- pkgsrc/sysutils/swtpm/Makefile:1.16 Fri Feb  6 10:05:58 2026
+++ pkgsrc/sysutils/swtpm/Makefile      Tue May  5 10:21:45 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2026/02/06 10:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2026/05/05 10:21:45 jperkin Exp $
 
-GITHUB_PROJECT=        swtpm
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      swtpm-0.10.0
 PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=stefanberger/}
+GITHUB_PROJECT=        swtpm
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/stefanberger/swtpm/
@@ -28,10 +28,14 @@ USE_LANGUAGES+=             c
 # Avoid `error: 'saved_stack.30' may be used uninitialized in this function [-Werror=maybe-uninitialized]` or similar errors
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
+LDFLAGS.SunOS+=                -lsocket -lnsl
+
 USE_LIBTOOL=           yes
 USE_TOOLS=             automake bash gawk gmake gsed pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      autogen.sh
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --without-cuse
 CONFIGURE_ARGS+=       --with-tss-user=${REAL_ROOT_USER}
 CONFIGURE_ARGS+=       --with-tss-group=${REAL_ROOT_GROUP}

Index: pkgsrc/sysutils/swtpm/distinfo
diff -u pkgsrc/sysutils/swtpm/distinfo:1.2 pkgsrc/sysutils/swtpm/distinfo:1.3
--- pkgsrc/sysutils/swtpm/distinfo:1.2  Mon Dec  9 13:48:40 2024
+++ pkgsrc/sysutils/swtpm/distinfo      Tue May  5 10:21:45 2026
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.2 2024/12/09 13:48:40 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2026/05/05 10:21:45 jperkin Exp $
 
 BLAKE2s (swtpm-0.10.0.tar.gz) = 4e78603298ccfdd77ca821c3c4d81100f771b1f15f93f82d6727c9e9d58720ac
 SHA512 (swtpm-0.10.0.tar.gz) = 6f1848b0514799417582c1a5bedf9b7110e3627ab14f02ea193ad76ce8a188eba596494f410405c5f7226e2daf7d9ee889983a2265285839e72de12e6368180d
 Size (swtpm-0.10.0.tar.gz) = 414698 bytes
 SHA1 (patch-configure.ac) = 00a5e52528150a356926a07b816268304456047c
+SHA1 (patch-include_swtpm_tpm__ioctl.h) = a817b926caf57a45291414f7c55d9568cd0e2578
+SHA1 (patch-include_sys__dependencies.h) = 2e1695a66296b918428ceeeddcbb4a6a456d0c42
 SHA1 (patch-samples_Makefile.am) = 4c2559decb43286f431dfabcec703e65f1a3ace2
-SHA1 (patch-tests_sed-inplace) = 85242ad8cc799238888942cd6e0305d6c58f68c7
+SHA1 (patch-src_swtpm__ioctl_tpm__ioctl.c) = 766bed322284839e5b263d55d6b98c10905b4ea5
+SHA1 (patch-src_swtpm_check__algos.c) = 0cdfdcd7c22b39144d45006779e34b03563c8dd4
+SHA1 (patch-src_swtpm_common.c) = 3fcabfdccd2a83ea2b68cb13ae1d0e2e0aeb9eac
+SHA1 (patch-tests_sed-inplace) = 395cc1c75690ac07cf2c53ad0997f00453a0b124

Index: pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace
diff -u pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace:1.1 pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace:1.2
--- pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace:1.1   Mon Dec  9 13:48:40 2024
+++ pkgsrc/sysutils/swtpm/patches/patch-tests_sed-inplace       Tue May  5 10:21:46 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-tests_sed-inplace,v 1.1 2024/12/09 13:48:40 ryoon Exp $
+$NetBSD: patch-tests_sed-inplace,v 1.2 2026/05/05 10:21:46 jperkin Exp $
+
+Support sed -i on more OS.
 
 --- tests/sed-inplace.orig     2024-12-04 15:21:18.719762588 +0000
 +++ tests/sed-inplace
@@ -6,7 +8,7 @@ $NetBSD: patch-tests_sed-inplace,v 1.1 2
  #!/usr/bin/env bash
  
 -if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then
-+if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-|BSD) ]]; then
++if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-|BSD|SunOS) ]]; then
        sed -i "$1" "$2"
  else
        sed -i '' "$1" "$2"

Added files:

Index: pkgsrc/sysutils/swtpm/patches/patch-include_swtpm_tpm__ioctl.h
diff -u /dev/null pkgsrc/sysutils/swtpm/patches/patch-include_swtpm_tpm__ioctl.h:1.1
--- /dev/null   Tue May  5 10:21:46 2026
+++ pkgsrc/sysutils/swtpm/patches/patch-include_swtpm_tpm__ioctl.h      Tue May  5 10:21:46 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_swtpm_tpm__ioctl.h,v 1.1 2026/05/05 10:21:46 jperkin Exp $
+
+Support illumos.
+
+--- include/swtpm/tpm_ioctl.h.orig     2026-05-05 08:18:43.591961939 +0000
++++ include/swtpm/tpm_ioctl.h
+@@ -19,7 +19,7 @@
+ #include <sys/ioctl.h>
+ #endif
+ 
+-#ifdef HAVE_SYS_IOCCOM_H
++#if defined(HAVE_SYS_IOCCOM_H) || defined(__illumos__)
+ #include <sys/ioccom.h>
+ #endif
+ 
Index: pkgsrc/sysutils/swtpm/patches/patch-include_sys__dependencies.h
diff -u /dev/null pkgsrc/sysutils/swtpm/patches/patch-include_sys__dependencies.h:1.1
--- /dev/null   Tue May  5 10:21:46 2026
+++ pkgsrc/sysutils/swtpm/patches/patch-include_sys__dependencies.h     Tue May  5 10:21:46 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-include_sys__dependencies.h,v 1.1 2026/05/05 10:21:46 jperkin Exp $
+
+Support illumos.
+
+--- include/sys_dependencies.h.orig    2026-05-05 08:17:10.311811997 +0000
++++ include/sys_dependencies.h
+@@ -39,7 +39,7 @@
+ #define SWTPM_SYS_DEPENDENCIES_H
+ 
+ #if !defined __OpenBSD__ && !defined __FreeBSD__ && !defined __NetBSD__ \
+- && !defined __APPLE__ && !defined __DragonFly__
++ && !defined __APPLE__ && !defined __DragonFly__ && !defined __illumos__
+  #define _GNU_SOURCE
+  #include <features.h>
+ #endif
+@@ -70,4 +70,4 @@
+ # include <endian.h>
+ #endif
+ 
+-#endif /* SWTPM_SYS_DEPENDENCIES_H */
+\ No newline at end of file
++#endif /* SWTPM_SYS_DEPENDENCIES_H */
Index: pkgsrc/sysutils/swtpm/patches/patch-src_swtpm__ioctl_tpm__ioctl.c
diff -u /dev/null pkgsrc/sysutils/swtpm/patches/patch-src_swtpm__ioctl_tpm__ioctl.c:1.1
--- /dev/null   Tue May  5 10:21:46 2026
+++ pkgsrc/sysutils/swtpm/patches/patch-src_swtpm__ioctl_tpm__ioctl.c   Tue May  5 10:21:46 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_swtpm__ioctl_tpm__ioctl.c,v 1.1 2026/05/05 10:21:46 jperkin Exp $
+
+Portability fix.
+
+--- src/swtpm_ioctl/tpm_ioctl.c.orig   2026-05-05 08:39:39.470484913 +0000
++++ src/swtpm_ioctl/tpm_ioctl.c
+@@ -90,6 +90,10 @@
+ # define _IOC_NRMASK 255
+ #endif
+ 
++#ifndef MIN
++#define MIN(a, b)     ((a) < (b) ? (a) : (b))
++#endif
++
+ /* poll timeout that takes into account a busy swtpm creating a key */
+ #define DEFAULT_POLL_TIMEOUT 10000 /* ms */
+ 
Index: pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_check__algos.c
diff -u /dev/null pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_check__algos.c:1.1
--- /dev/null   Tue May  5 10:21:46 2026
+++ pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_check__algos.c        Tue May  5 10:21:46 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_swtpm_check__algos.c,v 1.1 2026/05/05 10:21:46 jperkin Exp $
+
+Include strings.h for index().
+
+--- src/swtpm/check_algos.c.orig       2026-05-05 08:19:35.380080466 +0000
++++ src/swtpm/check_algos.c
+@@ -41,6 +41,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ 
+ #include "check_algos.h"
+ #include "utils.h"
Index: pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_common.c
diff -u /dev/null pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_common.c:1.1
--- /dev/null   Tue May  5 10:21:46 2026
+++ pkgsrc/sysutils/swtpm/patches/patch-src_swtpm_common.c      Tue May  5 10:21:46 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_swtpm_common.c,v 1.1 2026/05/05 10:21:46 jperkin Exp $
+
+Include strings.h for index().
+
+--- src/swtpm/common.c.orig    2026-05-05 08:19:23.642111097 +0000
++++ src/swtpm/common.c
+@@ -40,6 +40,7 @@
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <sys/types.h>

Prev by Date: CVS commit: pkgsrc/sysutils/libtpms
Next by Date: CVS commit: pkgsrc/sysutils/ups-nut
Previous by Thread: CVS commit: pkgsrc/sysutils/libtpms
Next by Thread: CVS commit: pkgsrc/sysutils/ups-nut
Indexes:

Home | Main Index | Thread Index | Old Index