Module Name: src
Committed By: martin
Date: Fri Aug 11 15:07:06 UTC 2023
Modified Files:
src/crypto/external/cpl/trousers/bin/tcsd [netbsd-10]: Makefile
src/crypto/external/cpl/trousers/dist/src/include [netbsd-10]: tcsd.h
trousers_types.h
src/crypto/external/cpl/trousers/lib/libtcs [netbsd-10]: Makefile
src/crypto/external/cpl/trousers/lib/libtspi [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #323):
crypto/external/cpl/trousers/dist/src/include/tcsd.h: revision 1.4
crypto/external/cpl/trousers/lib/libtcs/Makefile: revision 1.2
crypto/external/cpl/trousers/dist/src/include/trousers_types.h:
revision 1.4
crypto/external/cpl/trousers/bin/tcsd/Makefile: revision 1.3
crypto/external/cpl/trousers/lib/libtspi/Makefile: revision 1.4
(all via patch)
trousers: Make this build again.
- Downgrade address-of-packed-member errors to warnings. Not sure if
this is safe, but there's too many to audit.
- Silence deprecation warnings for openssl3.
- Address removal of const qualifier in iconv.
- Nix unused definitions in a .h file, which cause trouble now that
-fno-common is the default.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 \
src/crypto/external/cpl/trousers/bin/tcsd/Makefile
cvs rdiff -u -r1.3 -r1.3.10.1 \
src/crypto/external/cpl/trousers/dist/src/include/tcsd.h \
src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
cvs rdiff -u -r1.1 -r1.1.54.1 \
src/crypto/external/cpl/trousers/lib/libtcs/Makefile
cvs rdiff -u -r1.3 -r1.3.10.1 \
src/crypto/external/cpl/trousers/lib/libtspi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/bin/tcsd/Makefile
diff -u src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2 src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2.10.1
--- src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/bin/tcsd/Makefile Fri Aug 11 15:07:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/01/07 15:18:03 christos Exp $
+# $NetBSD: Makefile,v 1.2.10.1 2023/08/11 15:07:06 martin Exp $
.include "../Makefile.inc"
.PATH.c: ${DIST}/src/tcsd
@@ -6,6 +6,8 @@
CPPFLAGS+=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
CPPFLAGS+=-DTSS_BUILD_PS -DTSS_BUILD_PCR_EVENTS
+COPTS.tcsd_threads.c+= ${NO_ADDR_OF_PACKED_MEMBER}
+
BINDIR=/usr/sbin
PROG=tcsd
SRCS=\
Index: src/crypto/external/cpl/trousers/dist/src/include/tcsd.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3 src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3.10.1
--- src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/dist/src/include/tcsd.h Fri Aug 11 15:07:06 2023
@@ -170,7 +170,7 @@ void *tcsd_thread_run(void *);
void thread_signal_init();
/* signal handling */
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__NetBSD__)
struct sigaction tcsd_sa_int;
struct sigaction tcsd_sa_chld;
#endif
Index: src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.3 src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.3.10.1
--- src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h:1.3 Mon Jan 7 15:18:03 2019
+++ src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h Fri Aug 11 15:07:06 2023
@@ -118,9 +118,9 @@ typedef struct tdTSS_KEY {
BYTE *encData;
} TSS_KEY;
-#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
+#if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__) || defined (__NetBSD__))
#define BSD_CONST
-#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__APPLE__)
+#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__APPLE__)
#define BSD_CONST const
#endif
Index: src/crypto/external/cpl/trousers/lib/libtcs/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.1 src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.1.54.1
--- src/crypto/external/cpl/trousers/lib/libtcs/Makefile:1.1 Sat Jan 28 02:15:26 2012
+++ src/crypto/external/cpl/trousers/lib/libtcs/Makefile Fri Aug 11 15:07:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $
+# $NetBSD: Makefile,v 1.1.54.1 2023/08/11 15:07:06 martin Exp $
LIBISPRIVATE=yes
.include "../Makefile.inc"
@@ -18,6 +18,8 @@ CPPFLAGS+=-DTSS_BUILD_PCR_EXTEND -DTSS_B
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_TSS12
CPPFLAGS+=-DTSS_BUILD_DELEGATION -DTSS_BUILD_QUOTE2 -DTSS_BUILD_CMK
+COPTS.tcs_key.c+= ${NO_ADDR_OF_PACKED_MEMBER}
+
LIB=tcs
SRCS=\
crypto.c \
Index: src/crypto/external/cpl/trousers/lib/libtspi/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3 src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3.10.1
--- src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3 Mon Jan 7 15:43:17 2019
+++ src/crypto/external/cpl/trousers/lib/libtspi/Makefile Fri Aug 11 15:07:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $
+# $NetBSD: Makefile,v 1.3.10.1 2023/08/11 15:07:06 martin Exp $
.include "../Makefile.inc"
CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
@@ -16,6 +16,10 @@ CPPFLAGS+=-DTSS_BUILD_ENCDATA_LIST -DTSS
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_QUOTE2
CPPFLAGS+=-DTSS_BUILD_NV -DTSS_BUILD_DELEGATION -DTSS_BUILD_CMK
+COPTS.rpc.c+= ${NO_ADDR_OF_PACKED_MEMBER}
+COPTS.hash.c+= -Wno-error=deprecated-declarations # openssl3 PKCS1_MGF
+COPTS.rsa.c+= -Wno-error=deprecated-declarations # openssl3 RSA_*
+
TSPI=${DIST}/src/tspi
TRSPI=${DIST}/src/trspi
.PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/${EXTERNAL_OPENSSL_SUBDIR}
