Skip to content

Commit

Permalink
update lzma / xz to 5.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@laffer1
laffer1 committed Mar 31, 2024
1 parent 81ab397 commit 40929fd
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 4 deletions.
13 changes: 11 additions & 2 deletions lib/liblzma/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

PACKAGE=lib${LIB}
LIB= lzma
LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma
Expand Down Expand Up @@ -38,6 +39,7 @@ SRCS+= common.c \
hardware_cputhreads.c \
index.c \
stream_flags_common.c \
string_conversion.c \
vli_size.c \
alone_encoder.c \
block_buffer_encoder.c \
Expand All @@ -50,6 +52,9 @@ SRCS+= common.c \
filter_encoder.c \
filter_flags_encoder.c \
index_encoder.c \
lzip_decoder.c \
microlzma_encoder.c \
microlzma_decoder.c \
stream_buffer_encoder.c \
stream_encoder.c \
stream_flags_encoder.c \
Expand All @@ -60,13 +65,15 @@ SRCS+= common.c \
block_decoder.c \
block_header_decoder.c \
easy_decoder_memusage.c \
file_info.c \
filter_buffer_decoder.c \
filter_decoder.c \
filter_flags_decoder.c \
index_decoder.c \
index_hash.c \
stream_buffer_decoder.c \
stream_decoder.c \
stream_decoder_mt.c \
stream_flags_decoder.c \
stream_encoder_mt.c \
vli_decoder.c \
Expand Down Expand Up @@ -117,6 +124,7 @@ SRCS+= simple_coder.c \
powerpc.c \
ia64.c \
arm.c \
arm64.c \
armthumb.c \
sparc.c

Expand Down Expand Up @@ -158,8 +166,9 @@ FILESDIR= ${LIBDATADIR}/pkgconfig
liblzma.pc: liblzma.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,/usr,g ; \
s,@libdir@,/usr/lib,g ; \
s,@includedir@,/usr/include,g ; \
s,@libdir@,${LIBDIR},g ; \
s,@sharedlibdir@,${SHLIBDIR},g ; \
s,@includedir@,${INCLUDEDIR},g ; \
s,@LIBS@,-pthread -lmd,g ; \
s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
Expand Down
12 changes: 12 additions & 0 deletions lib/liblzma/Symbol.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ XZ_5.2 {
lzma_stream_encoder_mt_memusage;
};

XZ_5.4 {
lzma_file_info_decoder;
lzma_filters_free;
lzma_lzip_decoder;
lzma_microlzma_decoder;
lzma_microlzma_encoder;
lzma_stream_decoder_mt;
lzma_str_from_filters;
lzma_str_list_filters;
lzma_str_to_filters;
};

XZprivate_1.0 {
lzma_alloc;
lzma_alloc_zero;
Expand Down
5 changes: 4 additions & 1 deletion lib/liblzma/Versions.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ XZ_5.0 {
XZ_5.2 {
} XZ_5.0;

XZprivate_1.0 {
XZ_5.4 {
} XZ_5.2;

XZprivate_1.0 {
} XZ_5.4;

2 changes: 1 addition & 1 deletion lib/liblzma/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@


/* Version number of package */
#define VERSION "5.2.9"
#define VERSION "5.4.5"

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
Expand Down
5 changes: 5 additions & 0 deletions usr.bin/xz/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.include <src.opts.mk>

PROG= xz

Expand Down Expand Up @@ -42,6 +43,10 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common

.if ${MK_CAPSICUM} == "no"
CFLAGS+= -DWITHOUT_CAPSICUM
.endif

LIBADD= lzma

.include <bsd.prog.mk>

0 comments on commit 40929fd

Please sign in to comment.