CVS commit: src/external/public-domain/xz
Module Name:src Committed By: dholland Date: Sun Jan 27 04:34:36 UTC 2019 Modified Files: src/external/public-domain/xz: Makefile.inc Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/xz/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/Makefile.inc diff -u src/external/public-domain/xz/Makefile.inc:1.5 src/external/public-domain/xz/Makefile.inc:1.6 --- src/external/public-domain/xz/Makefile.inc:1.5 Sun Jan 27 02:08:35 2019 +++ src/external/public-domain/xz/Makefile.inc Sun Jan 27 04:34:35 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2019/01/27 02:08:35 pgoyette Exp $ - -.include +# $NetBSD: Makefile.inc,v 1.6 2019/01/27 04:34:35 dholland Exp $ .include
CVS commit: src/external/public-domain/xz/bin/xz
Module Name:src Committed By: joerg Date: Tue Sep 25 12:34:42 UTC 2018 Modified Files: src/external/public-domain/xz/bin/xz: Makefile Log Message: Fix spelling of HOSTPROG to not enable NLS for tools build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/bin/xz/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/bin/xz/Makefile diff -u src/external/public-domain/xz/bin/xz/Makefile:1.4 src/external/public-domain/xz/bin/xz/Makefile:1.5 --- src/external/public-domain/xz/bin/xz/Makefile:1.4 Tue Sep 25 05:42:08 2018 +++ src/external/public-domain/xz/bin/xz/Makefile Tue Sep 25 12:34:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/09/25 05:42:08 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2018/09/25 12:34:42 joerg Exp $ PROG= xz BINDIR= /usr/bin @@ -13,7 +13,7 @@ USETBL= yes .include CPPFLAGS+= -DPACKAGE=\"xz\" -.if !defined(HOST_PROG) +.if !defined(HOSTPROG) CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\" .endif
CVS commit: src/external/public-domain/xz/dist/src/xz
Module Name:src Committed By: joerg Date: Tue Sep 25 05:41:20 UTC 2018 Modified Files: src/external/public-domain/xz/dist/src/xz: list.c Log Message: Revert last change, side effect of old config.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/src/xz/list.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/src/xz/list.c diff -u src/external/public-domain/xz/dist/src/xz/list.c:1.2 src/external/public-domain/xz/dist/src/xz/list.c:1.3 --- src/external/public-domain/xz/dist/src/xz/list.c:1.2 Tue Sep 25 03:50:58 2018 +++ src/external/public-domain/xz/dist/src/xz/list.c Tue Sep 25 05:41:20 2018 @@ -11,7 +11,6 @@ /// #include "private.h" -#include "list.h" #include "tuklib_integer.h"
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Sep 25 05:39:19 UTC 2018 Modified Files: src/external/public-domain/xz/dist: configure.ac src/external/public-domain/xz/dist/src/liblzma/check: check.h src/external/public-domain/xz/dist/src/xz: args.c Log Message: Revert to vendor state. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 \ src/external/public-domain/xz/dist/src/liblzma/check/check.h cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/src/xz/args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.4 src/external/public-domain/xz/dist/configure.ac:1.5 --- src/external/public-domain/xz/dist/configure.ac:1.4 Fri Apr 17 18:49:23 2015 +++ src/external/public-domain/xz/dist/configure.ac Tue Sep 25 05:39:19 2018 @@ -15,20 +15,27 @@ # of malloc(), stat(), or lstat(), since we don't use those functions in # a way that would cause the problems the autoconf macros check. -AC_PREREQ([2.52]) +AC_PREREQ([2.64]) -AC_INIT([XZ Utils], 5.0.0, [jo...@netbsd.org], [xz], [http://tukaani.org/xz/]) +AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]), + [lasse.col...@tukaani.org], [xz], [https://tukaani.org/xz/]) +AC_CONFIG_SRCDIR([src/liblzma/common/common.h]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([config.h]) -AC_CONFIG_AUX_DIR([../../gnu/dist/autoconf/config]) +echo +echo "$PACKAGE_STRING" + +echo +echo "System type:" +# This is needed to know if assembler optimizations can be used. AC_CANONICAL_HOST -AC_USE_SYSTEM_EXTENSIONS # We do some special things on Windows (32-bit or 64-bit) builds. case $host_os in - mingw* | cygwin*) is_w32=yes ;; - *)is_w32=no ;; + mingw* | cygwin | msys) is_w32=yes ;; + *) is_w32=no ;; esac AM_CONDITIONAL([COND_W32], [test "$is_w32" = yes]) @@ -36,9 +43,15 @@ AM_CONDITIONAL([COND_W32], [test "$is_w3 # executables. Cygwin is an exception to this, since it is recommended # that symlinks don't have the .exe suffix. To make this work, we # define LN_EXEEXT. +# +# MSYS2 is treated the same way as Cygwin. It uses plain "msys" like +# the original MSYS when building MSYS/MSYS2-binaries. Hopefully this +# doesn't break things for the original MSYS developers. Note that this +# doesn't affect normal MSYS/MSYS2 users building non-MSYS/MSYS2 binaries +# since in that case the $host_os is usually mingw32. case $host_os in - cygwin) LN_EXEEXT= ;; - *) LN_EXEEXT='$(EXEEXT)' ;; + cygwin | msys) LN_EXEEXT= ;; + *) LN_EXEEXT='$(EXEEXT)' ;; esac AC_SUBST([LN_EXEEXT]) @@ -84,6 +97,7 @@ AC_ARG_ENABLE([encoders], AS_HELP_STRING [], [enable_encoders=SUPPORTED_FILTERS]) enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'` if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then + enable_encoders=no AC_MSG_RESULT([(none)]) else for arg in $enable_encoders @@ -101,6 +115,8 @@ else ;; esac done + AC_DEFINE([HAVE_ENCODERS], [1], + [Define to 1 if any of HAVE_ENCODER_foo have been defined.]) AC_MSG_RESULT([$enable_encoders]) fi @@ -111,6 +127,7 @@ AC_ARG_ENABLE([decoders], AS_HELP_STRING [], [enable_decoders=SUPPORTED_FILTERS]) enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'` if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then + enable_decoders=no AC_MSG_RESULT([(none)]) else for arg in $enable_decoders @@ -128,11 +145,8 @@ else ;; esac done - - # LZMA2 requires that LZMA1 is enabled. - test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes - test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes - + AC_DEFINE([HAVE_DECODERS], [1], + [Define to 1 if any of HAVE_DECODER_foo have been defined.]) AC_MSG_RESULT([$enable_decoders]) fi @@ -141,8 +155,8 @@ if test "x$enable_encoder_lzma2$enable_e AC_MSG_ERROR([LZMA2 requires that LZMA1 is also enabled.]) fi -AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno && test "x$enable_encoders" != x) -AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno && test "x$enable_decoders" != x) +AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno) +AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno) m4_foreach([NAME], [SUPPORTED_FILTERS], [AM_CONDITIONAL(COND_FILTER_[]m4_toupper(NAME), test "x$enable_filter_[]NAME" = xyes) @@ -176,12 +190,6 @@ AM_CONDITIONAL(COND_FILTER_LZ, test "x$e AM_CONDITIONAL(COND_ENCODER_LZ, test "x$enable_encoder_lz" = xyes) AM_CONDITIONAL(COND_DECODER_LZ, test "x$enable_decoder_lz" = xyes) -m4_foreach([NAME], [SUPPORTED_FILTERS], [ - AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1], - [Define to 1 if] NAME [encoder is
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Sep 25 05:39:45 UTC 2018 Modified Files: src/external/public-domain/xz/dist: configure Log Message: Don't try to generate files we are not interested in. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/xz/dist/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure diff -u src/external/public-domain/xz/dist/configure:1.1.1.1 src/external/public-domain/xz/dist/configure:1.2 --- src/external/public-domain/xz/dist/configure:1.1.1.1 Mon Sep 24 22:36:01 2018 +++ src/external/public-domain/xz/dist/configure Tue Sep 25 05:39:45 2018 @@ -19545,15 +19545,10 @@ fi xz=`echo xz | sed "$program_transform_name"` -ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile src/Makefile src/liblzma/Makefile src/liblzma/api/Makefile src/xz/Makefile src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile tests/Makefile debug/Makefile" -ac_config_files="$ac_config_files src/scripts/xzdiff" -ac_config_files="$ac_config_files src/scripts/xzgrep" -ac_config_files="$ac_config_files src/scripts/xzmore" -ac_config_files="$ac_config_files src/scripts/xzless" cat >confcache <<\_ACEOF
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: joerg Date: Tue Sep 25 05:38:10 UTC 2018 Modified Files: src/external/public-domain/xz: prepare-import.sh Log Message: Update xz import script to reflect inclusion of configure. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/prepare-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.4 src/external/public-domain/xz/prepare-import.sh:1.5 --- src/external/public-domain/xz/prepare-import.sh:1.4 Fri Apr 17 18:49:23 2015 +++ src/external/public-domain/xz/prepare-import.sh Tue Sep 25 05:38:10 2018 @@ -1,25 +1,27 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.4 2015/04/17 18:49:23 christos Exp $ +# $NetBSD: prepare-import.sh,v 1.5 2018/09/25 05:38:10 joerg Exp $ set -e rm -rf dist tmp -tar xzf xz-5.2.1.tar.gz -mv xz-5.2.1 dist +tar xf xz-5.2.4.tar.xz +mv xz-5.2.4 dist cd dist # Binary files derived from distribution files rm -rf doc/man # Files under GPL -rm -rf build-aux extra lib m4/[a-s]* m4/[u-z]* src/scripts/xz* Doxyfile.in +rm -rf extra lib m4/[a-s]* m4/[u-z]* src/scripts/xz* Doxyfile.in # Files not of relevance -rm -rf ABOUT-NLS aclocal.m4 autogen.sh configure COPYING.*GPL* INSTALL.generic +rm -rf ABOUT-NLS aclocal.m4 autogen.sh COPYING.*GPL* INSTALL.generic mkdir po.tmp mv po/*.po po/*.gmo po.tmp/ rm -rf po mv po.tmp po rm -rf debug dos windows rm -rf Makefile* */Makefile* */*/Makefile* */*/*/Makefile* +# Files under GPL/LGPL kept: +# build-aux/* from autoconf # Binary files to be encoded for f in tests/compress_prepared_bcj_sparc tests/compress_prepared_bcj_x86 \ tests/files/*.xz; do @@ -27,16 +29,5 @@ for f in tests/compress_prepared_bcj_spa rm $f done -# Files under GPL/LGPL kept: -# build-aux/* from autoconf -# lib/* -# m4/* - -# Changes to config.h -echo Add build-time endian test to include/config.h: -cat << EOE -#include -#if BYTE_ORDER == BIG_ENDIAN -# define WORDS_BIGENDIAN 1 -#endif -EOE +grep -v '^ac_config_files=' configure > configure.new +mv configure.new ../configure
CVS commit: src/external/public-domain/xz/dist/src/xz
Module Name:src Committed By: kre Date: Tue Sep 25 03:50:58 UTC 2018 Modified Files: src/external/public-domain/xz/dist/src/xz: list.c Log Message: Include list.h so prototypes for funcs exist (appease gcc) To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/public-domain/xz/dist/src/xz/list.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/src/xz/list.c diff -u src/external/public-domain/xz/dist/src/xz/list.c:1.1.1.3 src/external/public-domain/xz/dist/src/xz/list.c:1.2 --- src/external/public-domain/xz/dist/src/xz/list.c:1.1.1.3 Mon Sep 24 22:36:02 2018 +++ src/external/public-domain/xz/dist/src/xz/list.c Tue Sep 25 03:50:58 2018 @@ -11,6 +11,7 @@ /// #include "private.h" +#include "list.h" #include "tuklib_integer.h"
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Sat Jun 2 01:40:52 UTC 2018
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
Don't warn about undefined symbols when we sanitize, since we are not linking
against the sanitizers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.8 src/external/public-domain/xz/lib/Makefile:1.9
--- src/external/public-domain/xz/lib/Makefile:1.8 Thu Jan 19 06:10:38 2017
+++ src/external/public-domain/xz/lib/Makefile Fri Jun 1 21:40:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/01/19 11:10:38 maya Exp $
+# $NetBSD: Makefile,v 1.9 2018/06/02 01:40:52 christos Exp $
.include
@@ -15,7 +15,9 @@ INCS+= base.h bcj.h block.h check.h cont
INCSDIR_lzma.h= /usr/include
INCSDIR= /usr/include/lzma
+.if ${MKSANITIZER} != "yes"
LDFLAGS+= -Wl,-z,defs
+.endif
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/common
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: maya
Date: Thu Jan 19 11:10:38 UTC 2017
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
restrict psabi warning hack to gcc, it doesn't exist in clang.
should help i386 llvm builds
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.7 src/external/public-domain/xz/lib/Makefile:1.8
--- src/external/public-domain/xz/lib/Makefile:1.7 Sat Jan 14 21:20:39 2017
+++ src/external/public-domain/xz/lib/Makefile Thu Jan 19 11:10:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/01/14 21:20:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 11:10:38 maya Exp $
.include
@@ -85,7 +85,7 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
mv -f ${.TARGET}.tmp ${.TARGET}
.if ${MACHINE_ARCH} == "i386"
-COPTS += -Wno-error=psabi
+COPTS += ${${ACTIVE_CC} == "gcc":? -Wno-error=psabi :}
.endif
CLEANFILES+= liblzma.pc
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Sat Jan 14 21:20:39 UTC 2017
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
Don't error out for psabi.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.6 src/external/public-domain/xz/lib/Makefile:1.7
--- src/external/public-domain/xz/lib/Makefile:1.6 Tue Jan 5 08:07:47 2016
+++ src/external/public-domain/xz/lib/Makefile Sat Jan 14 16:20:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/05 13:07:47 christos Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/14 21:20:39 christos Exp $
.include
@@ -84,6 +84,10 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
> ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}
+.if ${MACHINE_ARCH} == "i386"
+COPTS += -Wno-error=psabi
+.endif
+
CLEANFILES+= liblzma.pc
LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/public-domain/xz/include
Module Name:src Committed By: riastradh Date: Sat Feb 6 20:23:39 UTC 2016 Modified Files: src/external/public-domain/xz/include: config.h Log Message: No for pcc even on x86. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.7 src/external/public-domain/xz/include/config.h:1.8 --- src/external/public-domain/xz/include/config.h:1.7 Tue Jan 5 02:44:57 2016 +++ src/external/public-domain/xz/include/config.h Sat Feb 6 20:23:39 2016 @@ -146,7 +146,8 @@ #define HAVE_ICONV 1 /* Define to 1 if you have the header file. */ -#if (defined(__i386__) || defined(__x86_64__)) && !defined(__lint__) +#if (defined(__i386__) || defined(__x86_64__)) && !defined(__lint__) && \ + !defined(__PCC__) #define HAVE_IMMINTRIN_H 1 #endif
CVS commit: src/external/public-domain/xz/bin/lzmainfo
Module Name:src
Committed By: christos
Date: Thu Jan 28 19:40:29 UTC 2016
Modified Files:
src/external/public-domain/xz/bin/lzmainfo: Makefile
Log Message:
needs libpthread
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/bin/lzmainfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/bin/lzmainfo/Makefile
diff -u src/external/public-domain/xz/bin/lzmainfo/Makefile:1.1 src/external/public-domain/xz/bin/lzmainfo/Makefile:1.2
--- src/external/public-domain/xz/bin/lzmainfo/Makefile:1.1 Wed Aug 3 23:38:06 2011
+++ src/external/public-domain/xz/bin/lzmainfo/Makefile Thu Jan 28 14:40:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/28 19:40:29 christos Exp $
PROG= lzmainfo
BINDIR= /usr/bin
@@ -17,8 +17,8 @@ SRCS+= tuklib_exit.c tuklib_cpucores.c t
CPPFLAGS+= -DPACKAGE=\"xz\"
CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
-DPADD+= ${LIBLZMA} ${LIBINTL}
-LDADD+= -llzma -lintl
+DPADD+= ${LIBLZMA} ${LIBINTL} ${LIBPTHREAD}
+LDADD+= -llzma -lintl -lpthread
.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/lzmainfo
CVS commit: src/external/public-domain/xz/include
Module Name:src Committed By: christos Date: Tue Jan 5 02:44:57 UTC 2016 Modified Files: src/external/public-domain/xz/include: config.h Log Message: fix lint build To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.6 src/external/public-domain/xz/include/config.h:1.7 --- src/external/public-domain/xz/include/config.h:1.6 Sat Apr 18 13:00:09 2015 +++ src/external/public-domain/xz/include/config.h Mon Jan 4 21:44:57 2016 @@ -146,7 +146,7 @@ #define HAVE_ICONV 1 /* Define to 1 if you have the header file. */ -#if defined(__i386__) || defined(__x86_64__) +#if (defined(__i386__) || defined(__x86_64__)) && !defined(__lint__) #define HAVE_IMMINTRIN_H 1 #endif
CVS commit: src/external/public-domain/xz/dist/src/xz
Module Name:src Committed By: christos Date: Sat May 9 15:28:25 UTC 2015 Modified Files: src/external/public-domain/xz/dist/src/xz: args.c Log Message: CID 1268629: Don't deref NULL (can't happen unless count is incorrect; code safety). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/public-domain/xz/dist/src/xz/args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/src/xz/args.c diff -u src/external/public-domain/xz/dist/src/xz/args.c:1.1.1.2 src/external/public-domain/xz/dist/src/xz/args.c:1.2 --- src/external/public-domain/xz/dist/src/xz/args.c:1.1.1.2 Fri Apr 17 14:24:55 2015 +++ src/external/public-domain/xz/dist/src/xz/args.c Sat May 9 11:28:25 2015 @@ -107,6 +107,8 @@ parse_block_list(char *str) } } + if (p == NULL) + break; str = p + 1; }
CVS commit: src/external/public-domain/xz/bin/xz
Module Name:src
Committed By: christos
Date: Tue Apr 21 10:12:04 UTC 2015
Modified Files:
src/external/public-domain/xz/bin/xz: Makefile
Log Message:
help sun2
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/bin/xz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/bin/xz/Makefile
diff -u src/external/public-domain/xz/bin/xz/Makefile:1.2 src/external/public-domain/xz/bin/xz/Makefile:1.3
--- src/external/public-domain/xz/bin/xz/Makefile:1.2 Fri Apr 17 14:49:23 2015
+++ src/external/public-domain/xz/bin/xz/Makefile Tue Apr 21 06:12:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/17 18:49:23 christos Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/21 10:12:04 christos Exp $
PROG= xz
BINDIR= /usr/bin
@@ -40,4 +40,7 @@ FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz
.endfor
.endif
+LDADD+= -lpthread
+DPADD+= ${LIBPTHREAD}
+
.include bsd.prog.mk
CVS commit: src/external/public-domain/xz/include
Module Name:src Committed By: joerg Date: Sat Apr 18 16:59:05 UTC 2015 Modified Files: src/external/public-domain/xz/include: config.h Log Message: Use unaligned access if the platform supports it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.4 src/external/public-domain/xz/include/config.h:1.5 --- src/external/public-domain/xz/include/config.h:1.4 Fri Apr 17 21:56:14 2015 +++ src/external/public-domain/xz/include/config.h Sat Apr 18 16:59:05 2015 @@ -359,9 +359,9 @@ /* Define to 1 if the system supports fast unaligned access to 16-bit and 32-bit integers. */ -#ifndef __NetBSD__ -/* Not all archs support this */ -#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#include machine/types.h +#ifdef __NO_STRICT_ALIGNMENT +# define TUKLIB_FAST_UNALIGNED_ACCESS 1 #endif /* Define to 1 if the amount of physical memory can be detected with
CVS commit: src/external/public-domain/xz/include
Module Name:src Committed By: joerg Date: Sat Apr 18 17:00:09 UTC 2015 Modified Files: src/external/public-domain/xz/include: config.h Log Message: Drop condition around SIZEOF_SIZE_T to reduce diff against clean version. The macro is only used on platforms without SIZE_MAX. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.5 src/external/public-domain/xz/include/config.h:1.6 --- src/external/public-domain/xz/include/config.h:1.5 Sat Apr 18 16:59:05 2015 +++ src/external/public-domain/xz/include/config.h Sat Apr 18 17:00:09 2015 @@ -331,12 +331,8 @@ your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ -#ifdef _LP64 /* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 8 -#else -#define SIZEOF_SIZE_T 4 -#endif /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: christos Date: Fri Apr 17 18:49:23 UTC 2015 Modified Files: src/external/public-domain/xz: prepare-import.sh src/external/public-domain/xz/bin/xz: Makefile src/external/public-domain/xz/dist: configure.ac src/external/public-domain/xz/dist/src/liblzma/check: check.h src/external/public-domain/xz/include: config.h src/external/public-domain/xz/lib: Makefile shlib_version Removed Files: src/external/public-domain/xz/dist/doc/examples: xz_pipe_comp.c xz_pipe_decomp.c src/external/public-domain/xz/dist/src/liblzma/api/lzma: lzma.h src/external/public-domain/xz/dist/src/liblzma/common: stream_encoder.h Log Message: adjust for 5.2.1 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/prepare-import.sh cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/bin/xz/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/dist/configure.ac cvs rdiff -u -r1.1.1.1 -r0 \ src/external/public-domain/xz/dist/doc/examples/xz_pipe_comp.c \ src/external/public-domain/xz/dist/doc/examples/xz_pipe_decomp.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/public-domain/xz/dist/src/liblzma/api/lzma/lzma.h cvs rdiff -u -r1.2 -r1.3 \ src/external/public-domain/xz/dist/src/liblzma/check/check.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/public-domain/xz/dist/src/liblzma/common/stream_encoder.h cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/include/config.h cvs rdiff -u -r1.3 -r1.4 src/external/public-domain/xz/lib/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.3 src/external/public-domain/xz/prepare-import.sh:1.4 --- src/external/public-domain/xz/prepare-import.sh:1.3 Mon May 28 13:28:53 2012 +++ src/external/public-domain/xz/prepare-import.sh Fri Apr 17 14:49:23 2015 @@ -1,11 +1,11 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.3 2012/05/28 17:28:53 jdc Exp $ +# $NetBSD: prepare-import.sh,v 1.4 2015/04/17 18:49:23 christos Exp $ set -e rm -rf dist tmp -tar xzf xz-5.0.3.tar.gz -mv xz-5.0.3 dist +tar xzf xz-5.2.1.tar.gz +mv xz-5.2.1 dist cd dist # Binary files derived from distribution files Index: src/external/public-domain/xz/bin/xz/Makefile diff -u src/external/public-domain/xz/bin/xz/Makefile:1.1 src/external/public-domain/xz/bin/xz/Makefile:1.2 --- src/external/public-domain/xz/bin/xz/Makefile:1.1 Wed Aug 3 23:38:06 2011 +++ src/external/public-domain/xz/bin/xz/Makefile Fri Apr 17 14:49:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $ +# $NetBSD: Makefile,v 1.2 2015/04/17 18:49:23 christos Exp $ PROG= xz BINDIR= /usr/bin @@ -6,7 +6,7 @@ SRCS= args.c coder.c file_io.c hardware. message.c options.c signals.c suffix.c util.c \ tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \ tuklib_mbstr_fw.c tuklib_mbstr_width.c \ - tuklib_physmem.c tuklib_progname.c + tuklib_physmem.c tuklib_progname.c mytime.c USETBL= yes Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.3 src/external/public-domain/xz/dist/configure.ac:1.4 --- src/external/public-domain/xz/dist/configure.ac:1.3 Tue Feb 28 09:22:21 2012 +++ src/external/public-domain/xz/dist/configure.ac Fri Apr 17 14:49:23 2015 @@ -25,11 +25,156 @@ AC_CONFIG_AUX_DIR([../../gnu/dist/autoco AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS +# We do some special things on Windows (32-bit or 64-bit) builds. +case $host_os in + mingw* | cygwin*) is_w32=yes ;; + *)is_w32=no ;; +esac +AM_CONDITIONAL([COND_W32], [test $is_w32 = yes]) + +# We need to use $EXEEXT with $(LN_S) when creating symlinks to +# executables. Cygwin is an exception to this, since it is recommended +# that symlinks don't have the .exe suffix. To make this work, we +# define LN_EXEEXT. +case $host_os in + cygwin) LN_EXEEXT= ;; + *) LN_EXEEXT='$(EXEEXT)' ;; +esac +AC_SUBST([LN_EXEEXT]) + +echo +echo Configure options: +AM_CFLAGS= + + +# +# Debugging # +# + +AC_MSG_CHECKING([if debugging code should be compiled]) +AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable debugging code.]), + [], enable_debug=no) +if test x$enable_debug = xyes; then + AC_MSG_RESULT([yes]) +else + AC_DEFINE([NDEBUG], [1], [Define to 1 to disable debugging code.]) + AC_MSG_RESULT([no]) +fi + + ### # Filters # ### -m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc]) +m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])dnl +m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,sparc]) +m4_define([LZ_FILTERS],
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Fri Apr 17 20:12:45 UTC 2015
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
there is no more lzma/lzma.h; it has been renamed to lzma/lzma12.h
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.4 src/external/public-domain/xz/lib/Makefile:1.5
--- src/external/public-domain/xz/lib/Makefile:1.4 Fri Apr 17 14:49:23 2015
+++ src/external/public-domain/xz/lib/Makefile Fri Apr 17 16:12:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/17 18:49:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
LIB= lzma
USE_SHLIBDIR= yes
@@ -6,22 +6,12 @@ NOLINT= yes
.include bsd.init.mk
-# There are two different lzma.h files.
-# Copy public version to distinguish them.
-pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ${TOOL_CAT} ${XZSRCDIR}/src/liblzma/api/lzma.h ${.TARGET}
-CLEANFILES+= pub-lzma.h
-INCS= pub-lzma.h
-INCSDIR_pub-lzma.h= /usr/include
-INCSNAME_pub-lzma.h= lzma.h
-
-.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
+.PATH: ${XZSRCDIR}/src/liblzma/api ${XZSRCDIR}/src/liblzma/api/lzma
INCS+= base.h bcj.h block.h check.h container.h delta.h \
- filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
- version.h vli.h
+ filter.h hardware.h index.h index_hash.h lzma.h lzma12.h \
+ stream_flags.h version.h vli.h
+INCSDIR_lzma.h= /usr/include
INCSDIR= /usr/include/lzma
LDFLAGS+= -Wl,-z,defs
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: jdc Date: Mon May 28 17:28:54 UTC 2012 Modified Files: src/external/public-domain/xz: prepare-import.sh src/external/public-domain/xz/include: config.h Log Message: Determine WORDS_BIGENDIAN at build time, rather than hardcoding it to 0. Makes liblzma work on sparc64 (and probably other big endian hosts too). Add a note to the import script. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/prepare-import.sh cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.2 src/external/public-domain/xz/prepare-import.sh:1.3 --- src/external/public-domain/xz/prepare-import.sh:1.2 Tue Feb 28 14:22:21 2012 +++ src/external/public-domain/xz/prepare-import.sh Mon May 28 17:28:53 2012 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.2 2012/02/28 14:22:21 joerg Exp $ +# $NetBSD: prepare-import.sh,v 1.3 2012/05/28 17:28:53 jdc Exp $ set -e @@ -31,3 +31,12 @@ done # build-aux/* from autoconf # lib/* # m4/* + +# Changes to config.h +echo Add build-time endian test to include/config.h: +cat EOE +#include sys/endian.h +#if BYTE_ORDER == BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +EOE Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.1 src/external/public-domain/xz/include/config.h:1.2 --- src/external/public-domain/xz/include/config.h:1.1 Tue Nov 2 16:34:36 2010 +++ src/external/public-domain/xz/include/config.h Mon May 28 17:28:54 2012 @@ -286,14 +286,9 @@ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ +#include sys/endian.h +#if BYTE_ORDER == BIG_ENDIAN # define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif #endif /* Number of bits in a file offset, on hosts where this is settable. */
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Feb 28 13:47:14 UTC 2012 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6336 Log Message: Import XZ 5.0.3: - memory leak in liblzma fixed - better validation - correct behavior for suid/sgid/sticky bit and hard links with xz --force - cleanup and new translations Status: Vendor Tag: XZ Release Tags: xz-5-0-3 U src/external/public-domain/xz/dist/README U src/external/public-domain/xz/dist/COPYING U src/external/public-domain/xz/dist/INSTALL U src/external/public-domain/xz/dist/config.h.in U src/external/public-domain/xz/dist/THANKS C src/external/public-domain/xz/dist/configure.ac U src/external/public-domain/xz/dist/AUTHORS U src/external/public-domain/xz/dist/ChangeLog U src/external/public-domain/xz/dist/PACKAGERS U src/external/public-domain/xz/dist/TODO U src/external/public-domain/xz/dist/NEWS U src/external/public-domain/xz/dist/src/xzdec/xzdec.1 U src/external/public-domain/xz/dist/src/xzdec/xzdec_w32res.rc U src/external/public-domain/xz/dist/src/xzdec/xzdec.c U src/external/public-domain/xz/dist/src/xzdec/lzmadec_w32res.rc U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo_w32res.rc U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.1 U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.c U src/external/public-domain/xz/dist/src/xz/coder.c U src/external/public-domain/xz/dist/src/xz/util.c U src/external/public-domain/xz/dist/src/xz/xz.1 U src/external/public-domain/xz/dist/src/xz/options.h U src/external/public-domain/xz/dist/src/xz/suffix.h U src/external/public-domain/xz/dist/src/xz/args.h U src/external/public-domain/xz/dist/src/xz/file_io.c U src/external/public-domain/xz/dist/src/xz/file_io.h U src/external/public-domain/xz/dist/src/xz/main.h U src/external/public-domain/xz/dist/src/xz/list.h U src/external/public-domain/xz/dist/src/xz/xz_w32res.rc U src/external/public-domain/xz/dist/src/xz/hardware.h U src/external/public-domain/xz/dist/src/xz/list.c U src/external/public-domain/xz/dist/src/xz/args.c U src/external/public-domain/xz/dist/src/xz/private.h U src/external/public-domain/xz/dist/src/xz/suffix.c U src/external/public-domain/xz/dist/src/xz/message.h U src/external/public-domain/xz/dist/src/xz/util.h U src/external/public-domain/xz/dist/src/xz/signals.c U src/external/public-domain/xz/dist/src/xz/hardware.c U src/external/public-domain/xz/dist/src/xz/main.c U src/external/public-domain/xz/dist/src/xz/options.c U src/external/public-domain/xz/dist/src/xz/message.c U src/external/public-domain/xz/dist/src/xz/signals.h U src/external/public-domain/xz/dist/src/xz/coder.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.h U src/external/public-domain/xz/dist/src/common/tuklib_physmem.c U src/external/public-domain/xz/dist/src/common/tuklib_config.h U src/external/public-domain/xz/dist/src/common/tuklib_integer.h U src/external/public-domain/xz/dist/src/common/tuklib_common.h U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.h U src/external/public-domain/xz/dist/src/common/sysdefs.h U src/external/public-domain/xz/dist/src/common/common_w32res.rc U src/external/public-domain/xz/dist/src/common/tuklib_mbstr.h U src/external/public-domain/xz/dist/src/common/tuklib_progname.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.c U src/external/public-domain/xz/dist/src/common/tuklib_exit.c U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_fw.c U src/external/public-domain/xz/dist/src/common/tuklib_progname.c U src/external/public-domain/xz/dist/src/common/tuklib_gettext.h U src/external/public-domain/xz/dist/src/common/tuklib_exit.h U src/external/public-domain/xz/dist/src/common/mythread.h U src/external/public-domain/xz/dist/src/common/tuklib_physmem.h U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_width.c U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.c U src/external/public-domain/xz/dist/src/liblzma/liblzma.pc.in U src/external/public-domain/xz/dist/src/liblzma/liblzma_w32res.rc U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_decoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_presets.c U src/external/public-domain/xz/dist/src/liblzma/lzma/fastpos_tablegen.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_common.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_encoder.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_decoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_normal.c U src/external/public-domain/xz/dist/src/liblzma/lzma/fastpos.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_encoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_decoder.h U
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: joerg Date: Sun Oct 16 17:24:33 UTC 2011 Modified Files: src/external/public-domain/xz: Makefile.inc Log Message: -Wno-format-security is no longer needed with clang, now that libintl.h is fixed. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/Makefile.inc diff -u src/external/public-domain/xz/Makefile.inc:1.2 src/external/public-domain/xz/Makefile.inc:1.3 --- src/external/public-domain/xz/Makefile.inc:1.2 Thu May 26 12:56:27 2011 +++ src/external/public-domain/xz/Makefile.inc Sun Oct 16 17:24:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2011/05/26 12:56:27 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/10/16 17:24:32 joerg Exp $ XZHOMEPAGE= http://tukaani.org/xz/ XZVERSION= 5.0.0 @@ -13,5 +13,3 @@ CPPFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -std=c99 WARNS= 2 - -CWARNFLAGS.clang+= -Wno-format-security \ No newline at end of file
CVS commit: src/external/public-domain/xz/bin
Module Name:src
Committed By: matt
Date: Thu Aug 4 03:38:06 UTC 2011
Modified Files:
src/external/public-domain/xz/bin: Makefile
Added Files:
src/external/public-domain/xz/bin: Makefile.inc
src/external/public-domain/xz/bin/lzmainfo: Makefile
src/external/public-domain/xz/bin/xz: Makefile
Log Message:
Build lzmainfo
Add links to xz (lzma, unxz, etc) that are in the manpage.
Add manpage links as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/lzmainfo/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/xz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/bin/Makefile
diff -u src/external/public-domain/xz/bin/Makefile:1.2 src/external/public-domain/xz/bin/Makefile:1.3
--- src/external/public-domain/xz/bin/Makefile:1.2 Fri Mar 18 19:45:27 2011
+++ src/external/public-domain/xz/bin/Makefile Thu Aug 4 03:38:06 2011
@@ -1,34 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2011/03/18 19:45:27 dyoung Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/04 03:38:06 matt Exp $
-PROG= xz
-BINDIR= /usr/bin
-SRCS= args.c coder.c file_io.c hardware.c list.c main.c \
- message.c options.c signals.c suffix.c util.c \
- tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
- tuklib_mbstr_fw.c tuklib_mbstr_width.c \
- tuklib_physmem.c tuklib_progname.c
+SUBDIR+= xz lzmainfo
-USETBL= yes
-
-.include bsd.init.mk
-
-CPPFLAGS+= -DPACKAGE=\xz\
-CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\/usr/share/locale\
-
-DPADD+= ${LIBLZMA} ${LIBINTL}
-LDADD+= -llzma -lintl
-
-LINKS+= ${BINDIR}/xz ${BINDIR}/unxz \
- ${BINDIR}/xz ${BINDIR}/xzcat \
-
-.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz
-
-.if ${MKNLS} != no
-.for lang in cs de it
-FILES+= ${XZSRCDIR}/po/${lang}.gmo
-FILESDIR_${XZSRCDIR}/po/${lang}.gmo= /usr/share/locale/${lang}/LC_MESSAGES
-FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz.mo
-.endfor
-.endif
-
-.include bsd.prog.mk
+.include bsd.subdir.mk
Added files:
Index: src/external/public-domain/xz/bin/Makefile.inc
diff -u /dev/null src/external/public-domain/xz/bin/Makefile.inc:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/Makefile.inc Thu Aug 4 03:38:06 2011
@@ -0,0 +1 @@
+.include ../Makefile.inc
Index: src/external/public-domain/xz/bin/lzmainfo/Makefile
diff -u /dev/null src/external/public-domain/xz/bin/lzmainfo/Makefile:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/lzmainfo/Makefile Thu Aug 4 03:38:06 2011
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+
+PROG= lzmainfo
+BINDIR= /usr/bin
+SRCS= lzmainfo.c
+
+#args.c coder.c file_io.c hardware.c list.c main.c \
+# message.c options.c signals.c suffix.c util.c
+SRCS+= tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
+ tuklib_mbstr_fw.c tuklib_mbstr_width.c \
+ tuklib_physmem.c tuklib_progname.c
+
+#USETBL= yes
+
+.include bsd.init.mk
+
+CPPFLAGS+= -DPACKAGE=\xz\
+CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\/usr/share/locale\
+
+DPADD+= ${LIBLZMA} ${LIBINTL}
+LDADD+= -llzma -lintl
+
+.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/lzmainfo
+
+.include bsd.prog.mk
Index: src/external/public-domain/xz/bin/xz/Makefile
diff -u /dev/null src/external/public-domain/xz/bin/xz/Makefile:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/xz/Makefile Thu Aug 4 03:38:06 2011
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+
+PROG= xz
+BINDIR= /usr/bin
+SRCS= args.c coder.c file_io.c hardware.c list.c main.c \
+ message.c options.c signals.c suffix.c util.c \
+ tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
+ tuklib_mbstr_fw.c tuklib_mbstr_width.c \
+ tuklib_physmem.c tuklib_progname.c
+
+USETBL= yes
+
+.include bsd.init.mk
+
+CPPFLAGS+= -DPACKAGE=\xz\
+CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\/usr/share/locale\
+
+DPADD+= ${LIBLZMA} ${LIBINTL}
+LDADD+= -llzma -lintl
+
+LINKS+= ${BINDIR}/xz ${BINDIR}/lzcat
+LINKS+= ${BINDIR}/xz ${BINDIR}/lzma
+LINKS+= ${BINDIR}/xz ${BINDIR}/unlzma
+LINKS+= ${BINDIR}/xz ${BINDIR}/unxz
+LINKS+= ${BINDIR}/xz ${BINDIR}/xzcat
+
+MLINKS+= xz.1 lzcat.1
+MLINKS+= xz.1 lzma.1
+MLINKS+= xz.1 unlzma.1
+MLINKS+= xz.1 unxz.1
+MLINKS+= xz.1 xzcat.1
+
+.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz
+
+.if ${MKNLS} != no
+.for lang in cs de it
+FILES+= ${XZSRCDIR}/po/${lang}.gmo
+FILESDIR_${XZSRCDIR}/po/${lang}.gmo= /usr/share/locale/${lang}/LC_MESSAGES
+FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz.mo
+.endfor
+.endif
+
+.include bsd.prog.mk
CVS commit: src/external/public-domain/xz/bin
Module Name:src
Committed By: dyoung
Date: Fri Mar 18 19:45:27 UTC 2011
Modified Files:
src/external/public-domain/xz/bin: Makefile
Log Message:
Obey MKNLS=no.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/bin/Makefile
diff -u src/external/public-domain/xz/bin/Makefile:1.1 src/external/public-domain/xz/bin/Makefile:1.2
--- src/external/public-domain/xz/bin/Makefile:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/bin/Makefile Fri Mar 18 19:45:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/18 19:45:27 dyoung Exp $
PROG= xz
BINDIR= /usr/bin
@@ -23,10 +23,12 @@
.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz
+.if ${MKNLS} != no
.for lang in cs de it
FILES+= ${XZSRCDIR}/po/${lang}.gmo
FILESDIR_${XZSRCDIR}/po/${lang}.gmo= /usr/share/locale/${lang}/LC_MESSAGES
FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz.mo
.endfor
+.endif
.include bsd.prog.mk
CVS commit: src/external/public-domain/xz/lib
Module Name:src Committed By: joerg Date: Tue Nov 9 23:07:10 UTC 2010 Modified Files: src/external/public-domain/xz/lib: Makefile Log Message: Add back easy_encoder.c, lost during the final 5.0.0 update. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/lib/Makefile diff -u src/external/public-domain/xz/lib/Makefile:1.2 src/external/public-domain/xz/lib/Makefile:1.3 --- src/external/public-domain/xz/lib/Makefile:1.2 Tue Nov 2 19:12:48 2010 +++ src/external/public-domain/xz/lib/Makefile Tue Nov 9 23:07:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/02 19:12:48 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/11/09 23:07:09 joerg Exp $ LIB= lzma USE_SHLIBDIR= yes @@ -48,7 +48,7 @@ hardware_physmem.c index.c \ stream_flags_common.c vli_size.c \ alone_encoder.c block_buffer_encoder.c block_encoder.c \ - block_header_encoder.c easy_buffer_encoder.c \ + block_header_encoder.c easy_buffer_encoder.c easy_encoder.c \ easy_encoder_memusage.c filter_buffer_encoder.c \ filter_encoder.c filter_flags_encoder.c index_encoder.c \ stream_buffer_encoder.c stream_encoder.c stream_flags_encoder.c \
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Nov 2 15:20:55 UTC 2010 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29100 Log Message: Import stripped down version of xz-5.0.0. All non-public domain parts are removed to provide a prestine version. Status: Vendor Tag: XZ Release Tags: xz-5-0-0 N src/external/public-domain/xz/dist/PACKAGERS N src/external/public-domain/xz/dist/INSTALL N src/external/public-domain/xz/dist/ChangeLog N src/external/public-domain/xz/dist/config.h.in N src/external/public-domain/xz/dist/TODO N src/external/public-domain/xz/dist/THANKS N src/external/public-domain/xz/dist/NEWS N src/external/public-domain/xz/dist/COPYING N src/external/public-domain/xz/dist/AUTHORS N src/external/public-domain/xz/dist/configure.ac N src/external/public-domain/xz/dist/README N src/external/public-domain/xz/dist/tests/bcj_test.c N src/external/public-domain/xz/dist/tests/test_compress.sh N src/external/public-domain/xz/dist/tests/test_files.sh N src/external/public-domain/xz/dist/tests/tests.h N src/external/public-domain/xz/dist/tests/test_stream_flags.c N src/external/public-domain/xz/dist/tests/test_index.c N src/external/public-domain/xz/dist/tests/test_filter_flags.c N src/external/public-domain/xz/dist/tests/test_check.c N src/external/public-domain/xz/dist/tests/test_block_header.c N src/external/public-domain/xz/dist/tests/create_compress_files.c N src/external/public-domain/xz/dist/tests/compress_prepared_bcj_sparc.base64 N src/external/public-domain/xz/dist/tests/compress_prepared_bcj_x86.base64 N src/external/public-domain/xz/dist/tests/files/README N src/external/public-domain/xz/dist/tests/files/bad-0-footer_magic.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0-header_magic.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0-nonempty_index.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0cat-alone.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0catpad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0pad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-check-crc32.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-vli-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-check-sha256.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-4.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-6.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-7.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-vli-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-4.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0cat-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0pad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-3delta-lzma2.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-crc64.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-none.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-sha256.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-delta-lzma2.tiff.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-4.xz.base64 N
CVS commit: src/external/public-domain/xz/dist/src/liblzma/check
Module Name:src
Committed By: joerg
Date: Tue Nov 2 15:35:38 UTC 2010
Modified Files:
src/external/public-domain/xz/dist/src/liblzma/check: check.h
Log Message:
Use libc version of SHA256 on NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/public-domain/xz/dist/src/liblzma/check/check.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/dist/src/liblzma/check/check.h
diff -u src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.1.1.1 src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.2
--- src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.1.1.1 Tue Nov 2 15:20:52 2010
+++ src/external/public-domain/xz/dist/src/liblzma/check/check.h Tue Nov 2 15:35:38 2010
@@ -15,6 +15,9 @@
#include common.h
+#ifdef NETBSD_NATIVE_SHA256
+#include sha2.h
+#endif
// Index hashing needs the best possible hash function (preferably
// a cryptographic hash) for maximum reliability.
@@ -43,7 +46,9 @@
union {
uint32_t crc32;
uint64_t crc64;
-
+#ifdef NETBSD_NATIVE_SHA256
+ SHA256_CTX sha256;
+#else
struct {
/// Internal state
uint32_t state[8];
@@ -51,6 +56,7 @@
/// Size of the message excluding padding
uint64_t size;
} sha256;
+#endif
} state;
} lzma_check_state;
@@ -81,7 +87,14 @@
/// Finish the check calculation and store the result to check-buffer.u8.
extern void lzma_check_finish(lzma_check_state *check, lzma_check type);
-
+#ifdef NETBSD_NATIVE_SHA256
+#define lzma_sha256_init(check) \
+ SHA256_Init((check)-state.sha256)
+#define lzma_sha256_update(buf,size,check) \
+ SHA256_Update((check)-state.sha256, buf, size)
+#define lzma_sha256_finish(check) \
+ SHA256_Final((check)-buffer.u8, (check)-state.sha256)
+#else
/// Prepare SHA-256 state for new input.
extern void lzma_sha256_init(lzma_check_state *check);
@@ -91,5 +104,6 @@
/// Finish the SHA-256 calculation and store the result to check-buffer.u8.
extern void lzma_sha256_finish(lzma_check_state *check);
+#endif
#endif
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Nov 2 15:40:58 UTC 2010 Modified Files: src/external/public-domain/xz/dist: configure.ac Log Message: Replace configure.ac with a stripped down version for later use by src/tools. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/xz/dist/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.1.1.1 src/external/public-domain/xz/dist/configure.ac:1.2 --- src/external/public-domain/xz/dist/configure.ac:1.1.1.1 Tue Nov 2 15:20:27 2010 +++ src/external/public-domain/xz/dist/configure.ac Tue Nov 2 15:40:58 2010 @@ -15,174 +15,28 @@ # of malloc(), stat(), or lstat(), since we don't use those functions in # a way that would cause the problems the autoconf macros check. -AC_PREREQ([2.64]) +AC_PREREQ([2.52]) -AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]), - [lasse.col...@tukaani.org], [xz], [http://tukaani.org/xz/]) -AC_CONFIG_SRCDIR([src/liblzma/common/common.h]) -AC_CONFIG_AUX_DIR([build-aux]) +AC_INIT([XZ Utils], 5.0.0, [jo...@netbsd.org], [xz], [http://tukaani.org/xz/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR([../../gnu/dist/autoconf/config]) -echo -echo $PACKAGE_STRING - -echo -echo System type: -# This is needed to know if assembler optimizations can be used. AC_CANONICAL_HOST - -# We do some special things on Windows (32-bit or 64-bit) builds. -case $host_os in - mingw* | cygwin*) is_w32=yes ;; - *)is_w32=no ;; -esac -AM_CONDITIONAL([COND_W32], [test $is_w32 = yes]) - -# We need to use $EXEEXT with $(LN_S) when creating symlinks to -# executables. Cygwin is an exception to this, since it is recommended -# that symlinks don't have the .exe suffix. To make this work, we -# define LN_EXEEXT. -case $host_os in - cygwin) LN_EXEEXT= ;; - *) LN_EXEEXT='$(EXEEXT)' ;; -esac -AC_SUBST([LN_EXEEXT]) - -echo -echo Configure options: -AM_CFLAGS= - - -# -# Debugging # -# - -AC_MSG_CHECKING([if debugging code should be compiled]) -AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debugging code.]), - [], enable_debug=no) -if test x$enable_debug = xyes; then - AC_MSG_RESULT([yes]) -else - AC_DEFINE([NDEBUG], [1], [Define to 1 to disable debugging code.]) - AC_MSG_RESULT([no]) -fi - +AC_USE_SYSTEM_EXTENSIONS ### # Filters # ### -m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])dnl -m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,sparc]) -m4_define([LZ_FILTERS], [lzma1,lzma2]) - -m4_foreach([NAME], [SUPPORTED_FILTERS], -[enable_filter_[]NAME=no -enable_encoder_[]NAME=no -enable_decoder_[]NAME=no -])dnl - -AC_MSG_CHECKING([which encoders to build]) -AC_ARG_ENABLE([encoders], AC_HELP_STRING([--enable-encoders=LIST], - [Comma-separated list of encoders to build. Default=all. - Available encoders:] - m4_translit(m4_defn([SUPPORTED_FILTERS]), [,], [ ])), - [], [enable_encoders=SUPPORTED_FILTERS]) -enable_encoders=`echo $enable_encoders | sed 's/,/ /g'` -if test x$enable_encoders = xno || test x$enable_encoders = x; then - AC_MSG_RESULT([(none)]) -else - for arg in $enable_encoders - do - case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [ - NAME) -enable_filter_[]NAME=yes -enable_encoder_[]NAME=yes -AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1], -[Define to 1 if] NAME [encoder is enabled.]) -;;]) - *) -AC_MSG_RESULT([]) -AC_MSG_ERROR([unknown filter: $arg]) -;; - esac - done - AC_MSG_RESULT([$enable_encoders]) -fi - -AC_MSG_CHECKING([which decoders to build]) -AC_ARG_ENABLE([decoders], AC_HELP_STRING([--enable-decoders=LIST], - [Comma-separated list of decoders to build. Default=all. - Available decoders are the same as available encoders.]), - [], [enable_decoders=SUPPORTED_FILTERS]) -enable_decoders=`echo $enable_decoders | sed 's/,/ /g'` -if test x$enable_decoders = xno || test x$enable_decoders = x; then - AC_MSG_RESULT([(none)]) -else - for arg in $enable_decoders - do - case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [ - NAME) -enable_filter_[]NAME=yes -enable_decoder_[]NAME=yes -AC_DEFINE(HAVE_DECODER_[]m4_toupper(NAME), [1], -[Define to 1 if] NAME [decoder is enabled.]) -;;]) - *) -AC_MSG_RESULT([]) -AC_MSG_ERROR([unknown filter: $arg]) -;; - esac - done - - # LZMA2 requires that LZMA1 is enabled. - test x$enable_encoder_lzma2 = xyes enable_encoder_lzma1=yes - test x$enable_decoder_lzma2 = xyes enable_decoder_lzma1=yes - - AC_MSG_RESULT([$enable_decoders]) -fi - -if test x$enable_encoder_lzma2$enable_encoder_lzma1 = xyesno \ - || test x$enable_decoder_lzma2$enable_decoder_lzma1 = xyesno; then - AC_MSG_ERROR([LZMA2 requires that
