Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
riastradh 2023-08-10 06:56:12 +00:00
parent f0dcd50e0e
commit eb1aff76b3
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/external/cpl/trousers/bin/tcsd/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2019/01/07 15:18:03 christos Exp $ # $NetBSD: Makefile,v 1.3 2023/08/10 06:56:12 riastradh Exp $
.include "../Makefile.inc" .include "../Makefile.inc"
.PATH.c: ${DIST}/src/tcsd .PATH.c: ${DIST}/src/tcsd
@ -6,6 +6,8 @@
CPPFLAGS+=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\" CPPFLAGS+=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
CPPFLAGS+=-DTSS_BUILD_PS -DTSS_BUILD_PCR_EVENTS CPPFLAGS+=-DTSS_BUILD_PS -DTSS_BUILD_PCR_EVENTS
COPTS.tcsd_threads.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
BINDIR=/usr/sbin BINDIR=/usr/sbin
PROG=tcsd PROG=tcsd
SRCS=\ SRCS=\

2
crypto/external/cpl/trousers/dist/src/include/tcsd.h vendored
View File

@ -170,7 +170,7 @@ void *tcsd_thread_run(void *);
void thread_signal_init(); void thread_signal_init();
/* signal handling */ /* signal handling */
#ifndef __APPLE__ #if !defined(__APPLE__) && !defined(__NetBSD__)
struct sigaction tcsd_sa_int; struct sigaction tcsd_sa_int;
struct sigaction tcsd_sa_chld; struct sigaction tcsd_sa_chld;
#endif #endif

4
crypto/external/cpl/trousers/dist/src/include/trousers_types.h vendored
View File

@ -118,9 +118,9 @@ typedef struct tdTSS_KEY {
BYTE *encData; BYTE *encData;
} TSS_KEY; } 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 #define BSD_CONST
#elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__APPLE__) #elif defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__APPLE__)
#define BSD_CONST const #define BSD_CONST const
#endif #endif

4
crypto/external/cpl/trousers/lib/libtcs/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $ # $NetBSD: Makefile,v 1.2 2023/08/10 06:56:12 riastradh Exp $
LIBISPRIVATE=yes LIBISPRIVATE=yes
.include "../Makefile.inc" .include "../Makefile.inc"
@ -18,6 +18,8 @@ CPPFLAGS+=-DTSS_BUILD_PCR_EXTEND -DTSS_BUILD_SELFTEST -DTSS_BUILD_NV
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_TSS12 CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_TSS12
CPPFLAGS+=-DTSS_BUILD_DELEGATION -DTSS_BUILD_QUOTE2 -DTSS_BUILD_CMK CPPFLAGS+=-DTSS_BUILD_DELEGATION -DTSS_BUILD_QUOTE2 -DTSS_BUILD_CMK
COPTS.tcs_key.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
LIB=tcs LIB=tcs
SRCS=\ SRCS=\
crypto.c \ crypto.c \

6
crypto/external/cpl/trousers/lib/libtspi/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $ # $NetBSD: Makefile,v 1.4 2023/08/10 06:56:12 riastradh Exp $
.include "../Makefile.inc" .include "../Makefile.inc"
CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\" CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
@ -16,6 +16,10 @@ CPPFLAGS+=-DTSS_BUILD_ENCDATA_LIST -DTSS_BUILD_RSAKEY_LIST -DTSS_BUILD_ASN1
CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_QUOTE2 CPPFLAGS+=-DTSS_BUILD_AUDIT -DTSS_BUILD_SEALX -DTSS_BUILD_QUOTE2
CPPFLAGS+=-DTSS_BUILD_NV -DTSS_BUILD_DELEGATION -DTSS_BUILD_CMK CPPFLAGS+=-DTSS_BUILD_NV -DTSS_BUILD_DELEGATION -DTSS_BUILD_CMK
COPTS.rpc.c+= ${CC_WNO_ADDRESS_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 TSPI=${DIST}/src/tspi
TRSPI=${DIST}/src/trspi TRSPI=${DIST}/src/trspi
.PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/${EXTERNAL_OPENSSL_SUBDIR} .PATH.c: ${TSPI} ${TSPI}/rpc ${TSPI}/rpc/tcstp ${TSPI}/ps ${TRSPI} ${TRSPI}/crypto/${EXTERNAL_OPENSSL_SUBDIR}