From f2626e0e62c4afc09734b65a22eefa800f77a2f5 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Mon, 11 May 2015 17:49:07 +0000 Subject: [PATCH] Revert r281372, it's no longer needed after r282726 (fix for PR 199119) as the symbol conflict between libmd and libcrypto have been solved. --- lib/liblzma/Makefile | 5 ++--- lib/liblzma/Symbol.map | 3 --- lib/liblzma/config.h | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index 39b929fd1f80..9c4b1d8abcc5 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -77,8 +77,7 @@ SRCS+= common.c \ .PATH: ${LZMADIR}/check SRCS+= check.c \ crc32_table.c \ - crc64_table.c \ - sha256.c + crc64_table.c .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" SRCS+= crc32_x86.S \ crc64_x86.S @@ -146,7 +145,7 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMADIR}/simple \ -I${LZMADIR}/../common -LIBADD+= pthread +LIBADD+= md pthread VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map index c2976253b979..f49f29f24987 100644 --- a/lib/liblzma/Symbol.map +++ b/lib/liblzma/Symbol.map @@ -180,9 +180,6 @@ XZprivate_1.0 { lzma_raw_coder_memusage; lzma_raw_decoder_init; lzma_raw_encoder_init; - lzma_sha256_finish; - lzma_sha256_init; - lzma_sha256_update; lzma_simple_arm_decoder_init; lzma_simple_arm_encoder_init; lzma_simple_armthumb_decoder_init; diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h index 1d0f0bc7a692..44bc02c45b24 100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@ -203,16 +203,13 @@ /* #undef HAVE_SHA256INIT */ /* Define to 1 if the system has the type `SHA256_CTX'. */ -/* FreeBSD - disabled libmd SHA256 for now */ -/* #undef HAVE_SHA256_CTX */ +#define HAVE_SHA256_CTX 1 /* Define to 1 if you have the header file. */ -/* FreeBSD - disabled libmd SHA256 for now */ -/* #undef HAVE_SHA256_H */ +#define HAVE_SHA256_H 1 /* Define to 1 if you have the `SHA256_Init' function. */ -/* FreeBSD - disabled libmd SHA256 for now */ -/* #undef HAVE_SHA256_INIT */ +#define HAVE_SHA256_INIT 1 /* Define to 1 if the system has the type `SHA2_CTX'. */ /* #undef HAVE_SHA2_CTX */