Module Name: src
Committed By: joerg
Date: Tue Feb 28 14:22:23 UTC 2012
Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/external/public-domain/xz: prepare-import.sh
src/external/public-domain/xz/dist: configure.ac
src/external/public-domain/xz/lib: shlib_version
Log Message:
Merge XZ 5.0.3.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.617 -r1.618 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.139 -r1.140 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/prepare-import.sh
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/configure.ac
cvs rdiff -u -r1.1 -r1.2 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/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.83 src/distrib/sets/lists/base/ad.mips64eb:1.84
--- src/distrib/sets/lists/base/ad.mips64eb:1.83 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/base/ad.mips64eb Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.83 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: ad.mips64eb,v 1.84 2012/02/28 14:22:22 joerg Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -154,7 +154,7 @@
./usr/lib/64/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/64/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/64/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libm.so.0 base-compat-shlib compat,pic
./usr/lib/64/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic
@@ -450,7 +450,7 @@
./usr/lib/o32/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/o32/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/o32/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0 base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.82 src/distrib/sets/lists/base/ad.mips64el:1.83
--- src/distrib/sets/lists/base/ad.mips64el:1.82 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/base/ad.mips64el Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.82 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: ad.mips64el,v 1.83 2012/02/28 14:22:22 joerg Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -154,7 +154,7 @@
./usr/lib/64/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/64/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/64/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libm.so.0 base-compat-shlib compat,pic
./usr/lib/64/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic
@@ -450,7 +450,7 @@
./usr/lib/o32/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/o32/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/o32/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0 base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.157 src/distrib/sets/lists/base/md.amd64:1.158
--- src/distrib/sets/lists/base/md.amd64:1.157 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/base/md.amd64 Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.157 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: md.amd64,v 1.158 2012/02/28 14:22:22 joerg Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -164,7 +164,7 @@
./usr/lib/i386/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/i386/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/i386/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/i386/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libm.so.0 base-compat-shlib compat,pic
./usr/lib/i386/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/i386/libmagic.so.3 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.148 src/distrib/sets/lists/base/md.sparc64:1.149
--- src/distrib/sets/lists/base/md.sparc64:1.148 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/base/md.sparc64 Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.148 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: md.sparc64,v 1.149 2012/02/28 14:22:22 joerg Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -156,7 +156,7 @@
./usr/lib/sparc/liblzf.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/liblzf.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/liblzma.so.1 base-compat-shlib compat,pic
-./usr/lib/sparc/liblzma.so.1.0 base-compat-shlib compat,pic
+./usr/lib/sparc/liblzma.so.1.1 base-compat-shlib compat,pic
./usr/lib/sparc/libm.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/libm.so.0.10 base-compat-shlib compat,pic
./usr/lib/sparc/libmagic.so.3 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.617 src/distrib/sets/lists/base/shl.mi:1.618
--- src/distrib/sets/lists/base/shl.mi:1.617 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/base/shl.mi Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.617 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: shl.mi,v 1.618 2012/02/28 14:22:22 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -45,7 +45,7 @@
./lib/liblzf.so.0.0 base-sys-shlib dynamicroot
./lib/liblzma.so base-sys-shlib dynamicroot
./lib/liblzma.so.1 base-sys-shlib dynamicroot
-./lib/liblzma.so.1.0 base-sys-shlib dynamicroot
+./lib/liblzma.so.1.1 base-sys-shlib dynamicroot
./lib/libm.so base-sys-shlib dynamicroot
./lib/libm.so.0 base-sys-shlib dynamicroot
./lib/libm.so.0.10 base-sys-shlib dynamicroot
@@ -313,7 +313,7 @@
./usr/lib/liblwres.so.5.6 base-bind-shlib
./usr/lib/liblzma.so base-sys-shlib
./usr/lib/liblzma.so.1 base-sys-shlib
-./usr/lib/liblzma.so.1.0 base-sys-shlib
+./usr/lib/liblzma.so.1.1 base-sys-shlib
./usr/lib/liblzf.so base-sys-shlib
./usr/lib/liblzf.so.0 base-sys-shlib
./usr/lib/liblzf.so.0.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.70 src/distrib/sets/lists/comp/ad.mips64eb:1.71
--- src/distrib/sets/lists/comp/ad.mips64eb:1.70 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/comp/ad.mips64eb Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.70 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: ad.mips64eb,v 1.71 2012/02/28 14:22:22 joerg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1321,7 +1321,7 @@
./usr/libdata/debug/usr/lib/64/liblua.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/liblwres.so.5.6.debug comp-bind-debug debug,compat
./usr/libdata/debug/usr/lib/64/liblzf.so.0.0.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/liblzma.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/liblzma.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libm.so.0.10.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libmagic.so.3.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libmenu.so.6.0.debug comp-sys-debug debug,compat
@@ -1473,7 +1473,7 @@
./usr/libdata/debug/usr/lib/o32/liblua.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/liblwres.so.5.6.debug comp-bind-debug debug,compat
./usr/libdata/debug/usr/lib/o32/liblzf.so.0.0.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/liblzma.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/liblzma.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libm.so.0.10.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libmagic.so.3.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libmenu.so.6.0.debug comp-sys-debug debug,compat
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.70 src/distrib/sets/lists/comp/ad.mips64el:1.71
--- src/distrib/sets/lists/comp/ad.mips64el:1.70 Thu Feb 16 23:00:38 2012
+++ src/distrib/sets/lists/comp/ad.mips64el Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.70 2012/02/16 23:00:38 joerg Exp $
+# $NetBSD: ad.mips64el,v 1.71 2012/02/28 14:22:22 joerg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1321,7 +1321,7 @@
./usr/libdata/debug/usr/lib/64/liblua.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/liblwres.so.5.6.debug comp-bind-debug debug,compat
./usr/libdata/debug/usr/lib/64/liblzf.so.0.0.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/liblzma.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/liblzma.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libm.so.0.10.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libmagic.so.3.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libmenu.so.6.0.debug comp-sys-debug debug,compat
@@ -1473,7 +1473,7 @@
./usr/libdata/debug/usr/lib/o32/liblua.so.1.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/liblwres.so.5.6.debug comp-bind-debug debug,compat
./usr/libdata/debug/usr/lib/o32/liblzf.so.0.0.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/liblzma.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/liblzma.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libm.so.0.10.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libmagic.so.3.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libmenu.so.6.0.debug comp-sys-debug debug,compat
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.156 src/distrib/sets/lists/comp/md.amd64:1.157
--- src/distrib/sets/lists/comp/md.amd64:1.156 Thu Feb 16 23:00:39 2012
+++ src/distrib/sets/lists/comp/md.amd64 Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156 2012/02/16 23:00:39 joerg Exp $
+# $NetBSD: md.amd64,v 1.157 2012/02/28 14:22:22 joerg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1101,7 +1101,7 @@
./usr/libdata/debug/usr/lib/i386/liblua.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/liblwres.so.5.6.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/liblzf.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/liblzma.so.1.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/liblzma.so.1.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libm.so.0.10.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libmagic.so.3.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.139 src/distrib/sets/lists/comp/md.sparc64:1.140
--- src/distrib/sets/lists/comp/md.sparc64:1.139 Thu Feb 16 23:00:39 2012
+++ src/distrib/sets/lists/comp/md.sparc64 Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.139 2012/02/16 23:00:39 joerg Exp $
+# $NetBSD: md.sparc64,v 1.140 2012/02/28 14:22:22 joerg Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -942,7 +942,7 @@
./usr/libdata/debug/usr/lib/sparc/liblua.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/liblwres.so.5.6.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/liblzf.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/liblzma.so.1.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/liblzma.so.1.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libm.so.0.10.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libmagic.so.3.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libmenu.so.6.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.210 src/distrib/sets/lists/comp/shl.mi:1.211
--- src/distrib/sets/lists/comp/shl.mi:1.210 Thu Feb 16 23:00:39 2012
+++ src/distrib/sets/lists/comp/shl.mi Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.210 2012/02/16 23:00:39 joerg Exp $
+# $NetBSD: shl.mi,v 1.211 2012/02/28 14:22:22 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -295,7 +295,7 @@
./usr/libdata/debug/usr/lib/liblua.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/liblwres.so.5.6.debug comp-bind-debug debug
./usr/libdata/debug/usr/lib/liblzf.so.0.0.debug comp-sys-debug debug
-./usr/libdata/debug/usr/lib/liblzma.so.1.0.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/liblzma.so.1.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libm.so.0.10.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libmagic.so.3.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug comp-sys-debug debug
Index: src/external/public-domain/xz/prepare-import.sh
diff -u src/external/public-domain/xz/prepare-import.sh:1.1 src/external/public-domain/xz/prepare-import.sh:1.2
--- src/external/public-domain/xz/prepare-import.sh:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/prepare-import.sh Tue Feb 28 14:22:21 2012
@@ -1,11 +1,11 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.2 2012/02/28 14:22:21 joerg Exp $
set -e
rm -rf dist tmp
-tar xzf xz-5.0.0.tar.gz
-mv xz-5.0.0 dist
+tar xzf xz-5.0.3.tar.gz
+mv xz-5.0.3 dist
cd dist
# Binary files derived from distribution files
Index: src/external/public-domain/xz/dist/configure.ac
diff -u src/external/public-domain/xz/dist/configure.ac:1.2 src/external/public-domain/xz/dist/configure.ac:1.3
--- src/external/public-domain/xz/dist/configure.ac:1.2 Tue Nov 2 15:40:58 2010
+++ src/external/public-domain/xz/dist/configure.ac Tue Feb 28 14:22:21 2012
@@ -60,7 +60,20 @@ m4_foreach([NAME], [SUPPORTED_CHECKS], [
[Define to 1 if] NAME [integrity check is enabled.])
])
-if !:; then
+
+###########################
+# Assembler optimizations #
+###########################
+
+AM_CONDITIONAL(COND_ASM_X86, false)
+AM_CONDITIONAL(COND_ASM_X86_64, false)
+
+
+#####################
+# Size optimization #
+#####################
+
+if false; then
AC_DEFINE([HAVE_SMALL], [1], [Define to 1 if optimizing for size.])
fi
Index: src/external/public-domain/xz/lib/shlib_version
diff -u src/external/public-domain/xz/lib/shlib_version:1.1 src/external/public-domain/xz/lib/shlib_version:1.2
--- src/external/public-domain/xz/lib/shlib_version:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/lib/shlib_version Tue Feb 28 14:22:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: shlib_version,v 1.2 2012/02/28 14:22:22 joerg Exp $
#
major=1
-minor=0
+minor=1
