Sun Sep 16 18:59:29 2012 UTC ()
*Sigh* provide, by default, the dumb "allocate 64K on the stack" variant
of the lzf_compress API by default. This is because there is evidently
code floating around out there in the world with broken autoconf scripts that
don't check for LZF_STATE_ARG in the lzf header files and just assume the
dumb version of the API.
We rename the sane API to lzf_compress_r and implement the dumb API in
terms of it. Consequently, bump liblzf major version number. This is
fine because nothing used our liblzf with the old API.
Add lzf(1) utility from LZF distribution. Add manual page for lzf(1).
(tls)
diff -r1.100 -r1.101 src/distrib/sets/lists/base/ad.mips64eb
diff -r1.99 -r1.100 src/distrib/sets/lists/base/ad.mips64el
diff -r1.176 -r1.177 src/distrib/sets/lists/base/md.amd64
diff -r1.165 -r1.166 src/distrib/sets/lists/base/md.sparc64
diff -r1.1007 -r1.1008 src/distrib/sets/lists/base/mi
diff -r1.636 -r1.637 src/distrib/sets/lists/base/shl.mi
diff -r1.89 -r1.90 src/distrib/sets/lists/comp/ad.mips64eb
diff -r1.91 -r1.92 src/distrib/sets/lists/comp/ad.mips64el
diff -r1.176 -r1.177 src/distrib/sets/lists/comp/md.amd64
diff -r1.156 -r1.157 src/distrib/sets/lists/comp/md.sparc64
diff -r1.234 -r1.235 src/distrib/sets/lists/comp/shl.mi
diff -r1.1402 -r1.1403 src/distrib/sets/lists/man/mi
diff -r1.1 -r1.2 src/external/bsd/liblzf/Makefile
diff -r1.1 -r1.2 src/external/bsd/liblzf/Makefile.inc
diff -r1.1.1.1 -r1.2 src/external/bsd/liblzf/dist/lzf.c
diff -r1.3 -r1.4 src/external/bsd/liblzf/dist/lzf.h
diff -r1.3 -r1.4 src/external/bsd/liblzf/dist/lzf_c.c
diff -r1.2 -r1.3 src/external/bsd/liblzf/dist/lzfP.h
diff -r1.1 -r1.2 src/external/bsd/liblzf/lib/Makefile
diff -r0 -r1.1 src/external/bsd/liblzf/usr.bin/Makefile
diff -r0 -r1.1 src/external/bsd/liblzf/usr.bin/Makefile.inc
diff -r0 -r1.1 src/external/bsd/liblzf/usr.bin/lzf/Makefile
diff -r0 -r1.1 src/external/bsd/liblzf/usr.bin/lzf/lzf.1
--- src/distrib/sets/lists/base/Attic/ad.mips64eb 2012/08/10 16:22:31 1.100
+++ src/distrib/sets/lists/base/Attic/ad.mips64eb 2012/09/16 18:59:24 1.101
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.100 2012/08/10 16:22:31 joerg Exp $
+# $NetBSD: ad.mips64eb,v 1.101 2012/09/16 18:59:24 tls 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
@@ -165,8 +165,8 @@
./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/64/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/64/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/liblzma.so.1 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
@@ -467,8 +467,8 @@
./usr/lib/o32/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/o32/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/o32/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzma.so.1 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
--- src/distrib/sets/lists/base/Attic/ad.mips64el 2012/08/10 16:22:31 1.99
+++ src/distrib/sets/lists/base/Attic/ad.mips64el 2012/09/16 18:59:24 1.100
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.99 2012/08/10 16:22:31 joerg Exp $
+# $NetBSD: ad.mips64el,v 1.100 2012/09/16 18:59:24 tls 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
@@ -163,8 +163,8 @@
./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/64/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/64/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/liblzma.so.1 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
@@ -467,8 +467,8 @@
./usr/lib/o32/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/o32/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/o32/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/o32/liblzma.so.1 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
--- src/distrib/sets/lists/base/md.amd64 2012/08/11 13:27:55 1.176
+++ src/distrib/sets/lists/base/md.amd64 2012/09/16 18:59:24 1.177
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.176 2012/08/11 13:27:55 joerg Exp $
+# $NetBSD: md.amd64,v 1.177 2012/09/16 18:59:24 tls Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -175,8 +175,8 @@
./usr/lib/i386/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/i386/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/i386/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/liblzma.so.1 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
--- src/distrib/sets/lists/base/md.sparc64 2012/08/10 16:22:31 1.165
+++ src/distrib/sets/lists/base/md.sparc64 2012/09/16 18:59:24 1.166
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.165 2012/08/10 16:22:31 joerg Exp $
+# $NetBSD: md.sparc64,v 1.166 2012/09/16 18:59:24 tls Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -165,8 +165,8 @@
./usr/lib/sparc/liblua.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/sparc/liblwres.so.5.7 base-compat-shlib compat,pic
-./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/liblzf.so.1 base-compat-shlib compat,pic
+./usr/lib/sparc/liblzf.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/liblzma.so.1 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
--- src/distrib/sets/lists/base/mi 2012/09/16 16:15:29 1.1007
+++ src/distrib/sets/lists/base/mi 2012/09/16 18:59:24 1.1008
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1007 2012/09/16 16:15:29 rmind Exp $
+# $NetBSD: mi,v 1.1008 2012/09/16 18:59:24 tls Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -548,6 +548,8 @@
./usr/bin/lsextattr base-util-bin
./usr/bin/lua base-util-bin
./usr/bin/lzcat base-util-bin
+./usr/bin/lzf base-util-bin
+./usr/bin/lzfcat base-util-bin
./usr/bin/lzma base-util-bin
./usr/bin/lzmainfo base-util-bin
./usr/bin/m4 base-util-bin
@@ -715,6 +717,7 @@
./usr/bin/unexpand base-util-bin
./usr/bin/uniq base-util-bin
./usr/bin/units base-util-bin
+./usr/bin/unlzf base-util-bin
./usr/bin/unlzma base-util-bin
./usr/bin/unvis base-util-bin
./usr/bin/unxz base-util-bin
--- src/distrib/sets/lists/base/shl.mi 2012/09/16 13:47:43 1.636
+++ src/distrib/sets/lists/base/shl.mi 2012/09/16 18:59:25 1.637
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.636 2012/09/16 13:47:43 rmind Exp $
+# $NetBSD: shl.mi,v 1.637 2012/09/16 18:59:25 tls Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -41,8 +41,8 @@
./lib/libkvm.so.6 base-sys-shlib dynamicroot
./lib/libkvm.so.6.0 base-sys-shlib dynamicroot
./lib/liblzf.so base-sys-shlib dynamicroot
-./lib/liblzf.so.0 base-sys-shlib dynamicroot
-./lib/liblzf.so.0.0 base-sys-shlib dynamicroot
+./lib/liblzf.so.1 base-sys-shlib dynamicroot
+./lib/liblzf.so.1.0 base-sys-shlib dynamicroot
./lib/liblzma.so base-sys-shlib dynamicroot
./lib/liblzma.so.1 base-sys-shlib dynamicroot
./lib/liblzma.so.1.1 base-sys-shlib dynamicroot
@@ -335,8 +335,8 @@
./usr/lib/liblzma.so.1 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
+./usr/lib/liblzf.so.1 base-sys-shlib
+./usr/lib/liblzf.so.1.0 base-sys-shlib
./usr/lib/libm.so base-sys-shlib
./usr/lib/libm.so.0 base-sys-shlib
./usr/lib/libm.so.0.10 base-sys-shlib
--- src/distrib/sets/lists/comp/Attic/ad.mips64eb 2012/08/15 04:22:45 1.89
+++ src/distrib/sets/lists/comp/Attic/ad.mips64eb 2012/09/16 18:59:25 1.90
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.89 2012/08/15 04:22:45 macallan Exp $
+# $NetBSD: ad.mips64eb,v 1.90 2012/09/16 18:59:25 tls 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
@@ -1354,7 +1354,7 @@
./usr/libdata/debug/usr/lib/64/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat
./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.7.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/liblzf.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
@@ -1510,7 +1510,7 @@
./usr/libdata/debug/usr/lib/o32/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat
./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.7.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/liblzf.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
--- src/distrib/sets/lists/comp/Attic/ad.mips64el 2012/08/15 05:55:43 1.91
+++ src/distrib/sets/lists/comp/Attic/ad.mips64el 2012/09/16 18:59:25 1.92
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.91 2012/08/15 05:55:43 macallan Exp $
+# $NetBSD: ad.mips64el,v 1.92 2012/09/16 18:59:25 tls 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
@@ -1354,7 +1354,7 @@
./usr/libdata/debug/usr/lib/64/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat
./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.7.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/liblzf.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
@@ -1510,7 +1510,7 @@
./usr/libdata/debug/usr/lib/o32/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug,compat
./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.7.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/liblzf.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
--- src/distrib/sets/lists/comp/md.amd64 2012/08/29 17:13:21 1.176
+++ src/distrib/sets/lists/comp/md.amd64 2012/09/16 18:59:25 1.177
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.176 2012/08/29 17:13:21 drochner Exp $
+# $NetBSD: md.amd64,v 1.177 2012/09/16 18:59:25 tls Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1148,7 +1148,7 @@
./usr/libdata/debug/usr/lib/i386/libldap_r.so.4.2.debug comp-compat-shlib compat,pic,ldap,debug
./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.7.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/liblzf.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
--- src/distrib/sets/lists/comp/md.sparc64 2012/08/10 16:22:33 1.156
+++ src/distrib/sets/lists/comp/md.sparc64 2012/09/16 18:59:25 1.157
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.156 2012/08/10 16:22:33 joerg Exp $
+# $NetBSD: md.sparc64,v 1.157 2012/09/16 18:59:25 tls 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
@@ -963,7 +963,7 @@
./usr/libdata/debug/usr/lib/sparc/libldap_r.so.4.2.debug comp-compat-shlib compat,pic,debug,ldap
./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.7.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/liblzf.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
--- src/distrib/sets/lists/comp/shl.mi 2012/08/16 04:52:55 1.234
+++ src/distrib/sets/lists/comp/shl.mi 2012/09/16 18:59:25 1.235
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.234 2012/08/16 04:52:55 matt Exp $
+# $NetBSD: shl.mi,v 1.235 2012/09/16 18:59:25 tls Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -315,7 +315,7 @@
./usr/libdata/debug/usr/lib/libldap_r.so.4.2.debug comp-ldap-debug ldap,debug
./usr/libdata/debug/usr/lib/liblua.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/liblwres.so.5.7.debug comp-bind-debug debug
-./usr/libdata/debug/usr/lib/liblzf.so.0.0.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/liblzf.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
--- src/distrib/sets/lists/man/mi 2012/08/08 14:08:04 1.1402
+++ src/distrib/sets/lists/man/mi 2012/09/16 18:59:26 1.1403
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1402 2012/08/08 14:08:04 christos Exp $
+# $NetBSD: mi,v 1.1403 2012/09/16 18:59:26 tls Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -273,6 +273,8 @@
./usr/share/man/cat1/lsextattr.0 man-util-catman .cat
./usr/share/man/cat1/lua.0 man-util-catman .cat
./usr/share/man/cat1/lzcat.0 man-util-catman .cat
+./usr/share/man/cat1/lzf.0 man-util-catman .cat
+./usr/share/man/cat1/lzfcat.0 man-util-catman .cat
./usr/share/man/cat1/lzma.0 man-util-catman .cat
./usr/share/man/cat1/lzmainfo.0 man-util-catman .cat
./usr/share/man/cat1/m4.0 man-util-catman .cat
@@ -539,6 +541,7 @@
./usr/share/man/cat1/unexpand.0 man-util-catman .cat
./usr/share/man/cat1/uniq.0 man-util-catman .cat
./usr/share/man/cat1/units.0 man-util-catman .cat
+./usr/share/man/cat1/unlzf.0 man-util-catman .cat
./usr/share/man/cat1/unlzma.0 man-util-catman .cat
./usr/share/man/cat1/unvis.0 man-util-catman .cat
./usr/share/man/cat1/unxz.0 man-util-catman .cat
@@ -3223,6 +3226,8 @@
./usr/share/man/html1/lsextattr.html man-util-htmlman html
./usr/share/man/html1/lua.html man-util-htmlman html
./usr/share/man/html1/lzcat.html man-util-htmlman html
+./usr/share/man/html1/lzf.html man-util-htmlman html
+./usr/share/man/html1/lzfcat.html man-util-htmlman html
./usr/share/man/html1/lzma.html man-util-htmlman html
./usr/share/man/html1/lzmainfo.html man-util-htmlman html
./usr/share/man/html1/m4.html man-util-htmlman html
@@ -3481,6 +3486,7 @@
./usr/share/man/html1/unexpand.html man-util-htmlman html
./usr/share/man/html1/uniq.html man-util-htmlman html
./usr/share/man/html1/units.html man-util-htmlman html
+./usr/share/man/html1/unlzf.html man-util-htmlman html
./usr/share/man/html1/unlzma.html man-util-htmlman html
./usr/share/man/html1/unvis.html man-util-htmlman html
./usr/share/man/html1/unxz.html man-util-htmlman html
@@ -5816,6 +5822,8 @@
./usr/share/man/man1/lsextattr.1 man-util-man .man
./usr/share/man/man1/lua.1 man-util-man .man
./usr/share/man/man1/lzcat.1 man-util-man .man
+./usr/share/man/man1/lzf.1 man-util-man .man
+./usr/share/man/man1/lzfcat.1 man-util-man .man
./usr/share/man/man1/lzma.1 man-util-man .man
./usr/share/man/man1/lzmainfo.1 man-util-man .man
./usr/share/man/man1/m4.1 man-util-man .man
@@ -6082,6 +6090,7 @@
./usr/share/man/man1/unexpand.1 man-util-man .man
./usr/share/man/man1/uniq.1 man-util-man .man
./usr/share/man/man1/units.1 man-util-man .man
+./usr/share/man/man1/unlzf.1 man-util-man .man
./usr/share/man/man1/unlzma.1 man-util-man .man
./usr/share/man/man1/unvis.1 man-util-man .man
./usr/share/man/man1/unxz.1 man-util-man .man
--- src/external/bsd/liblzf/Makefile 2010/02/03 06:25:55 1.1
+++ src/external/bsd/liblzf/Makefile 2012/09/16 18:59:27 1.2
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2010/02/03 06:25:55 tls Exp $
+# $NetBSD: Makefile,v 1.2 2012/09/16 18:59:27 tls Exp $
-SUBDIR= lib
+SUBDIR= lib usr.bin
.include <bsd.subdir.mk>
--- src/external/bsd/liblzf/Makefile.inc 2010/02/03 06:25:55 1.1
+++ src/external/bsd/liblzf/Makefile.inc 2012/09/16 18:59:27 1.2
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.1 2010/02/03 06:25:55 tls Exp $
+# $NetBSD: Makefile.inc,v 1.2 2012/09/16 18:59:27 tls Exp $
.include <bsd.own.mk>
+
+USE_FORT?= yes # data-driven bugs?
LIBLZFDIR= ${NETBSDSRCDIR}/external/bsd/liblzf
.PATH: ${LIBLZFDIR}/dist
--- src/external/bsd/liblzf/dist/lzf.c 2010/02/03 03:50:44 1.1.1.1
+++ src/external/bsd/liblzf/dist/lzf.c 2012/09/16 18:59:27 1.2
@@ -34,7 +34,6 @@
* either the BSD or the GPL.
*/
-#include "config.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -53,12 +52,10 @@
#define BLOCKSIZE (1024 * 64 - 1)
#define MAX_BLOCKSIZE BLOCKSIZE
-typedef unsigned char u8;
-
static off_t nr_read, nr_written;
static const char *imagename;
-static enum { compress, uncompress, lzcat } mode = compress;
+static enum { compress, uncompress, lzfcat } mode = compress;
static int verbose = 0;
static int force = 0;
static long blocksize = BLOCKSIZE;
@@ -105,7 +102,7 @@
"\n"
"usage: lzf [-dufhvb] [file ...]\n"
" unlzf [file ...]\n"
- " lzcat [file ...]\n"
+ " lzfcat [file ...]\n"
"\n%s",
opt);
@@ -373,7 +370,7 @@
struct stat mystat;
char oname[PATH_MAX + 1];
- if (mode != lzcat)
+ if (mode != lzfcat)
if (compose_name (fname, oname))
return -1;
@@ -400,7 +397,7 @@
return -1;
}
- if (mode == lzcat)
+ if (mode == lzfcat)
{
rc = uncompress_fd (fd, 1);
close (fd);
@@ -468,7 +465,7 @@
mode = uncompress;
if (strstr (imagename, "cat"))
- mode = lzcat;
+ mode = lzfcat;
#ifdef HAVE_GETOPT_LONG
while ((optc = getopt_long (argc, argv, "cdfhvb:", longopts, 0)) != -1)
@@ -509,7 +506,7 @@
{ // stdin stdout
if (!force)
{
- if ((mode == uncompress || mode == lzcat) && isatty (0))
+ if ((mode == uncompress || mode == lzfcat) && isatty (0))
{
fprintf (stderr, "%s: compressed data not read from a terminal. Use -f to force decompression.\n", imagename);
exit (1);
--- src/external/bsd/liblzf/dist/lzf.h 2011/04/04 20:37:49 1.3
+++ src/external/bsd/liblzf/dist/lzf.h 2012/09/16 18:59:27 1.4
@@ -70,19 +70,27 @@
*
* The buffers must not be overlapping.
*
- * If the option LZF_STATE_ARG is enabled, an extra argument must be
- * supplied which is not reflected in this header file. Refer to lzfP.h
- * and lzf_c.c.
+ * This function formerly had two API variants depending on a
+ * compile-time constant: one took a 64K state structure as an
+ * argument, the other allocated it internally on the stack (yuck).
*
+ * We define the stack-unfriendly version in terms of the stack-friendly
+ * one.
+ *
*/
unsigned int
-lzf_compress (const void *const, unsigned int,
- void *, unsigned int
-#if LZF_STATE_ARG
- , LZF_STATE
-#endif
- );
-
+lzf_compress_r (const void *const, unsigned int,
+ void *, unsigned int, LZF_STATE);
+
+static inline int
+lzf_compress (const void *const in, unsigned int in_len,
+ void *out, unsigned int out_len)
+{
+ LZF_STATE htab;
+
+ return lzf_compress_r(in, in_len, out, out_len, htab);
+}
+
/*
* Decompress data compressed with some version of the lzf_compress
* function and stored at location in_data and length in_len. The result
--- src/external/bsd/liblzf/dist/lzf_c.c 2011/04/05 06:24:42 1.3
+++ src/external/bsd/liblzf/dist/lzf_c.c 2012/09/16 18:59:27 1.4
@@ -96,16 +96,9 @@
*/
unsigned int
-lzf_compress (const void *const in_data, unsigned int in_len,
- void *out_data, unsigned int out_len
-#if LZF_STATE_ARG
- , LZF_STATE htab
-#endif
- )
+lzf_compress_r (const void *const in_data, unsigned int in_len,
+ void *out_data, unsigned int out_len, LZF_STATE htab)
{
-#if !LZF_STATE_ARG
- LZF_STATE htab;
-#endif
const u8 **hslot;
const u8 *ip = (const u8 *)in_data;
u8 *op = (u8 *)out_data;
@@ -295,4 +288,3 @@
return (unsigned)(op - (u8 *)out_data);
}
-
--- src/external/bsd/liblzf/dist/lzfP.h 2010/02/03 03:55:38 1.2
+++ src/external/bsd/liblzf/dist/lzfP.h 2012/09/16 18:59:27 1.3
@@ -106,7 +106,7 @@
* NOTE: this breaks the prototype in lzf.h.
*/
#ifndef LZF_STATE_ARG
-# define LZF_STATE_ARG 1
+# define LZF_STATE_ARG 0
#endif
/*
--- src/external/bsd/liblzf/lib/Makefile 2010/02/03 06:25:55 1.1
+++ src/external/bsd/liblzf/lib/Makefile 2012/09/16 18:59:28 1.2
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2010/02/03 06:25:55 tls Exp $
+# $NetBSD: Makefile,v 1.2 2012/09/16 18:59:28 tls Exp $
.include <bsd.init.mk>
-SHLIB_MAJOR= 0
+SHLIB_MAJOR= 1
SHLIB_MINOR= 0
USE_SHLIBDIR= yes
# $NetBSD: Makefile,v 1.1 2012/09/16 18:59:28 tls Exp $
.include <bsd.init.mk>
SUBDIR= lzf
.include "Makefile.inc"
.include <bsd.subdir.mk>
# $NetBSD: Makefile.inc,v 1.1 2012/09/16 18:59:28 tls Exp $
.include <bsd.own.mk>
BINDIR= /usr/bin
.include "${.PARSEDIR}/../Makefile.inc"
# $NetBSD: Makefile,v 1.1 2012/09/16 18:59:28 tls Exp $
.include <bsd.own.mk>
PROG= lzf
MAN= lzf.1
SRCS= lzf.c
LINKS+= ${BINDIR}/lzf ${BINDIR}/unlzf \
${BINDIR}/lzf ${BINDIR}/lzfcat
MLINKS+= lzf.1 unlzf.1 \
lzf.1 lzfcat.1
LDADD= -llzf
.include "${.CURDIR}/../Makefile.inc"
.include <bsd.prog.mk>
.\" $NetBSD: lzf.1,v 1.1 2012/09/16 18:59:29 tls Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to the NetBSD Foundation
.\" by Thor Lancelot Simon.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the NetBSD
.\" Foundation, Inc. and its contributors.
.\" 4. Neither the name of The NetBSD Foundation nor the names of its
.\" contributors may be used to endorse or promote products derived
.\" from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd September 16, 2012
.Dt LZF 1
.Os
.Sh NAME
.Nm lzf
.Nd compress and uncompress files using LZF algorithm
.Sh SYNOPSIS
.Nm
.Op Fl bcdfhv
.Ar file
.Oo
.Ar file Oo ...
.Oc
.Oc
.Nm unlzf
.Ar file
.Oo
.Ar file Oo ...
.Oc
.Oc
.Nm lzfcat
.Ar file
.Oo
.Ar file Oo ...
.Oc
.Oc
.Sh DESCRIPTION
.Nm
is a simple program to compress or uncompress files using LZF
(sometimes known as "Lempel-Ziv Fast") coding. LZF is extremely
fast, about 75% of the performance of
.Xr memcpy 3
for many inputs, while offering a moderate compression ratio,
usually between 1.5:1 and 2:1.
.Pp
When compressing, it removes each input file and replaces it with an
output file with the suffix ".lzf" appended. When uncompressing, it
removes each input file and replaces it with an output file with the
suffix ".lzf" removed. If no files are specified as arguments, standard
input and standard output are used as input and output respectively.
.Pp
If invoked as
.Nm lzf ,
the default mode of operation is to compress.
If invoked as
.Nm unlzf ,
the default mode of operation is to uncompress.
If invoked as
.Nm lzfcat ,
the default mode of operation is to uncompress to standard output.
.Sh OPTIONS
The following options are available:
.Bl -tag -width width
.It Fl c
This option selects compression.
.It Fl d
This option selects decompression.
.It Fl f
This option forces overwrite of preexisting output files, if any.
option, allowing non-compressed data to pass through unchanged.
.It Fl h
This option prints command usage.
.It Fl b
This option selects a compression blocksize. Small compression block
sizes give poor compression and slow operation; the default of 64KiB is
strongly recommended. Block sizes larger than 64KiB are silently reduced
to 64KiB in order to not produce output incompatible with other versions
of
.Nm .
.It Fl v
This option prints compression statistics for each file processed.
.El
.Sh SEE ALSO
.Xr gzip 1 ,
.Xr bzip2 1 ,
.Xr compress 1 ,
.Xr xz 1 ,
.Sh HISTORY
The
.Nm
program was first included with version 0.1 of Marc Lehmann's LZF library.
It was rewritten for version 2.0 of the library to offer the current
syntax, which is mostly compatible with other compression utilities such
as
.Xr gzip 1 .
The
.Nm
program first appeared in
.Nx 7.0 .
.Sh AUTHORS
The
.Nm
program was written by
.An Stefan Traby Aq stefan@hello-penguin.com .
.Sh BUGS
Some versions of
.Nm
install a program named "lzcat"
instead of
.Nm lzfcat .
Because the "lzcat" name is also used by
.Xr xz 1 ,
in
.Nx
the name
.Nm lzfcat
is used instead.