svn commit: r282775 - head/lib/liblzma

[Xin LI]

Author: delphij
Date: Mon May 11 17:49:07 2015
New Revision: 282775
URL: https://svnweb.freebsd.org/changeset/base/282775

Log:
  Revert r281372, it's no longer needed after r282726 (fix for PR 199119) as the
  symbol conflict between libmd and libcrypto have been solved.

Modified:
  head/lib/liblzma/Makefile
  head/lib/liblzma/Symbol.map
  head/lib/liblzma/config.h

Modified: head/lib/liblzma/Makefile
==============================================================================
--- head/lib/liblzma/Makefile	Mon May 11 16:45:33 2015	(r282774)
+++ head/lib/liblzma/Makefile	Mon May 11 17:49:07 2015	(r282775)
@@ -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

Modified: head/lib/liblzma/Symbol.map
==============================================================================
--- head/lib/liblzma/Symbol.map	Mon May 11 16:45:33 2015	(r282774)
+++ head/lib/liblzma/Symbol.map	Mon May 11 17:49:07 2015	(r282775)
@@ -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;

Modified: head/lib/liblzma/config.h
==============================================================================
--- head/lib/liblzma/config.h	Mon May 11 16:45:33 2015	(r282774)
+++ head/lib/liblzma/config.h	Mon May 11 17:49:07 2015	(r282775)
@@ -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 <sha256.h> 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 */