From a310eb9be04d900b0e9514e84c07b9654e28ecba Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Wed, 3 Aug 2016 12:11:29 -0700 Subject: [PATCH] libcrypto(3): Remove some cruft from when we supported 32-bit. --- crypto/openssl/README.DRAGONFLY | 6 +----- secure/lib/libcrypto/Makefile | 5 +---- .../lib/libcrypto/{opensslconf-x86_64.h => opensslconf.h} | 0 3 files changed, 2 insertions(+), 9 deletions(-) rename secure/lib/libcrypto/{opensslconf-x86_64.h => opensslconf.h} (100%) diff --git a/crypto/openssl/README.DRAGONFLY b/crypto/openssl/README.DRAGONFLY index 12a18d5074..e41ed14e57 100644 --- a/crypto/openssl/README.DRAGONFLY +++ b/crypto/openssl/README.DRAGONFLY @@ -3,7 +3,7 @@ Original source can be downloaded from OpenSSL at Here's some hints to upgrading: ./Configure shared --prefix=/usr --openssldir=/etc/ssl BSD-x86_64 -cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-x86_64.h +cp crypto/opensslconf.h ../../secure/lib/libcrypto/ cd ../../secure/lib/libcrypto # Update the version and date in Makefile.inc make man-makefile-update && make man-update @@ -11,7 +11,3 @@ cd ../libssl make man-makefile-update && make man-update cd ../../usr.bin/openssl make man-makefile-update && make man-update -cd ../.. -cvs add lib/libcrypto/man/*.3 lib/libssl/man/*.3 usr.bin/openssl/man/*.1 -cd ../crypto/openssl-0.9 -xargs rm -rf < README.DELETED diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index f211c17932..6b5233bc62 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -24,7 +24,7 @@ INCS+= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h ossl_typ.h SRCS+= buildinf.h INCSDIR= ${INCLUDEDIR}/openssl -CLEANFILES+= buildinf.h opensslconf.h +CLEANFILES+= buildinf.h buildinf.h: ( echo "#ifndef MK1MF_BUILD"; \ @@ -34,9 +34,6 @@ buildinf.h: echo " #define DATE \"`LC_ALL=C date`\""; \ echo "#endif" ) > ${.TARGET} -opensslconf.h: opensslconf-${MACHINE_ARCH}.h - cp ${.ALLSRC} ${.TARGET} - # aes SRCS+= aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c diff --git a/secure/lib/libcrypto/opensslconf-x86_64.h b/secure/lib/libcrypto/opensslconf.h similarity index 100% rename from secure/lib/libcrypto/opensslconf-x86_64.h rename to secure/lib/libcrypto/opensslconf.h -- 2.41.0