diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-07-15 04:46:32 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-07-15 22:43:39 +0000 |
| commit | e9ac41698b2f322d55ccf9da50a3596edb2c1800 (patch) | |
| tree | 557c8263fcf6f394c855ef4458f6fe531563199e /secure | |
| parent | b3877767883e9b26fbcce47c015ba3eab323bf1b (diff) | |
Diffstat (limited to 'secure')
46 files changed, 0 insertions, 46 deletions
diff --git a/secure/Makefile b/secure/Makefile index f23953bb71ad..268ece6847f4 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> SUBDIR= lib .WAIT \ diff --git a/secure/Makefile.inc b/secure/Makefile.inc index c951f3d3524f..a0f42faa062b 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,4 +1,3 @@ - .if exists(${.CURDIR:H:H}/lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj .else diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index 4390d4890b92..cd337a74a75a 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -1,4 +1,3 @@ - CLEANFILES+= certdata.txt SUBDIR+= trusted diff --git a/secure/caroot/Makefile.inc b/secure/caroot/Makefile.inc index 700e6ff3048c..88e287789688 100644 --- a/secure/caroot/Makefile.inc +++ b/secure/caroot/Makefile.inc @@ -1,2 +1 @@ - PACKAGE= caroot diff --git a/secure/caroot/trusted/Makefile b/secure/caroot/trusted/Makefile index 20d0ccfcbe23..b2fe43fcb802 100644 --- a/secure/caroot/trusted/Makefile +++ b/secure/caroot/trusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/trusted TRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/caroot/untrusted/Makefile b/secure/caroot/untrusted/Makefile index e5341c978008..19d7359ddcb9 100644 --- a/secure/caroot/untrusted/Makefile +++ b/secure/caroot/untrusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/untrusted UNTRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/lib/Makefile b/secure/lib/Makefile index b4b586fa6585..195fef28501c 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> SUBDIR= diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc index 9f5c8f243963..ac01b9fd6829 100644 --- a/secure/lib/Makefile.inc +++ b/secure/lib/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .if exists(${.CURDIR:H:H:H}/lib/Makefile.inc) .include "${.CURDIR:H:H:H}/lib/Makefile.inc" diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index dc701d90451e..a6ca46ecd372 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) SUBDIR= engines modules diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index b109fd7f7f4f..afcc2a48660c 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -1,4 +1,3 @@ - .include <bsd.endian.mk> .if ${TARGET_ENDIANNESS} == 1234 diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index d95f08e27256..16a2c15bc962 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,4 +1,3 @@ - .include <bsd.own.mk> # OpenSSL version used for manual page generation diff --git a/secure/lib/libcrypto/engines/Makefile b/secure/lib/libcrypto/engines/Makefile index 80587f47c48f..945d93599f06 100644 --- a/secure/lib/libcrypto/engines/Makefile +++ b/secure/lib/libcrypto/engines/Makefile @@ -1,4 +1,3 @@ - SUBDIR= capi devcrypto loader_attic .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= padlock diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc index 13d5f4849cbc..3da129023c7f 100644 --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/engines-3 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/engines/capi/Makefile b/secure/lib/libcrypto/engines/capi/Makefile index 184b6aaef2f2..2162dbf94b68 100644 --- a/secure/lib/libcrypto/engines/capi/Makefile +++ b/secure/lib/libcrypto/engines/capi/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= capi.so SRCS= e_capi.c diff --git a/secure/lib/libcrypto/engines/devcrypto/Makefile b/secure/lib/libcrypto/engines/devcrypto/Makefile index a8b6f84a70ba..a69e6074cc2e 100644 --- a/secure/lib/libcrypto/engines/devcrypto/Makefile +++ b/secure/lib/libcrypto/engines/devcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= devcrypto.so SRCS= e_devcrypto.c diff --git a/secure/lib/libcrypto/engines/loader_attic/Makefile b/secure/lib/libcrypto/engines/loader_attic/Makefile index bd837dbb5596..cee699eaccf6 100644 --- a/secure/lib/libcrypto/engines/loader_attic/Makefile +++ b/secure/lib/libcrypto/engines/loader_attic/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= loader_attic.so SRCS= e_loader_attic.c pvkfmt.c diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile index 9dc8cd4eafec..60dfa9c77c20 100644 --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= padlock.so SRCS= e_padlock.c diff --git a/secure/lib/libcrypto/modules/Makefile b/secure/lib/libcrypto/modules/Makefile index 2f9e5b40fe3e..0e01eb3b8ef2 100644 --- a/secure/lib/libcrypto/modules/Makefile +++ b/secure/lib/libcrypto/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fips legacy SUBDIR_PARALLEL= diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc index 0c7027bff89b..92bc102c06e9 100644 --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/ossl-modules LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index 8843cb9717c9..0f4889f3ff81 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= fips.so CFLAGS+= -DFIPS_MODULE diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index a285d0b1148b..f90c873072ea 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= legacy.so LIBADD= crypto diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index e6738be94f65..aca21d318812 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 21a57f6b368f..9d8a64ee0ab4 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> LIB= ssl diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile index b8996030aafc..29b1b564beca 100644 --- a/secure/lib/tests/Makefile +++ b/secure/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 6d0be7b50dfd..cf265c72bddd 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> SUBDIR= diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index e5beeed87cac..8998b613dda3 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/libexec PACKAGE= ssh diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 852055bfe625..40d86926d1bb 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index e5aa05f40f1d..6027b164a35f 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 2e04a0ed1fc2..4bc3a814ab8e 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index b8996030aafc..29b1b564beca 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/tests/Makefile b/secure/tests/Makefile index b8996030aafc..29b1b564beca 100644 --- a/secure/tests/Makefile +++ b/secure/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 55abbdb5c3e8..30f8767aa4e9 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> SUBDIR= diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc index 78a3af23f3cc..b87015c546ca 100644 --- a/secure/usr.bin/Makefile.inc +++ b/secure/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index 464189e79821..0653e6875188 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -1,4 +1,3 @@ - CONFS= openssl.cnf CONFSDIR= /etc/ssl PROG= openssl diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index bb2623062333..dbc896286dd3 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 72229d100c45..841c89b71c67 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 43ee63c567e7..ec709c721089 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 83813452e69a..bc5985a7325e 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 6595ad3db132..149dc6936659 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index b71c07a91b90..b842841f765f 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 1d1f5e5e8723..7c3eb68ea083 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile index b8996030aafc..29b1b564beca 100644 --- a/secure/usr.bin/tests/Makefile +++ b/secure/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index c0521b95cdb4..50b863096138 100644 --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> SUBDIR= diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc index 5c01baa093b7..b660f1cc6638 100644 --- a/secure/usr.sbin/Makefile.inc +++ b/secure/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin .include "../Makefile.inc" diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index c15bd773c77a..323fe4b8c99f 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile index b8996030aafc..29b1b564beca 100644 --- a/secure/usr.sbin/tests/Makefile +++ b/secure/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes |