Attachment 214505 Details for Bug 200142 – New patch against -HEAD

[patch] New patch against -HEAD

D24805.diff (text/plain), 2.60 KB, created by Xin LI on 2020-05-14 21:38:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2020-05-14 21:38:55 UTC

Size: 2.60 KB

patch

obsolete

>Index: lib/liblzma/Makefile
>===================================================================
>--- lib/liblzma/Makefile
>+++ lib/liblzma/Makefile
>@@ -78,8 +78,7 @@
> .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
>@@ -147,7 +146,7 @@
> 		-I${LZMADIR}/simple \
> 		-I${LZMADIR:H}/common
> 
>-LIBADD+=	pthread
>+LIBADD+=	md pthread
> 
> VERSION_DEF=	${.CURDIR}/Versions.def
> SYMBOL_MAPS=	${.CURDIR}/Symbol.map
>@@ -160,10 +159,11 @@
> 
> liblzma.pc: liblzma.pc.in
> 	sed -e 's,@prefix@,/usr,g ; \
>-		s,@exec_prefix@,/usr,g  ; \
>+		s,@exec_prefix@,/usr,g ; \
> 		s,@libdir@,/usr/lib,g ; \
> 		s,@includedir@,/usr/include,g ; \
>-		s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \
>+		s,@LIBS@,-pthread -lmd,g ; \
>+		s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
> 		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
> 		s,@PTHREAD_CFLAGS@,,g ; \
> 		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
>Index: lib/liblzma/Symbol.map
>===================================================================
>--- lib/liblzma/Symbol.map
>+++ lib/liblzma/Symbol.map
>@@ -180,9 +180,6 @@
> 	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;
>Index: lib/liblzma/config.h
>===================================================================
>--- lib/liblzma/config.h
>+++ lib/liblzma/config.h
>@@ -211,16 +211,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 */
>Index: share/mk/src.libnames.mk
>===================================================================
>--- share/mk/src.libnames.mk
>+++ share/mk/src.libnames.mk
>@@ -350,7 +350,7 @@
> _DP_kafs5=	asn1 krb5 roken
> _DP_krb5+=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
> _DP_gssapi_krb5+=	gssapi krb5 crypto roken asn1 com_err
>-_DP_lzma=	pthread
>+_DP_lzma=	md pthread
> _DP_ucl=	m
> _DP_vmmapi=	util
> _DP_opencsd=	cxxrt

Actions: View | Diff

Attachments on bug 200142: 156677 | 214505 | 214775 | 214776 | 215029