Merge commit '1276d1e1a1b128f7093a3021d3f6bc27afa80d23' into amd64
authorJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 14:47:52 +0000 (17:47 +0300)
committerJordan Gordeev <jgordeev@dir.bg>
Mon, 6 Jul 2009 14:47:52 +0000 (17:47 +0300)
1172 files changed:
Makefile_upgrade.inc
bin/cpdup/cpdup.c
bin/df/df.1
bin/sh/eval.c
contrib/cpio/COPYING [deleted file]
contrib/cpio/COPYING.LIB [deleted file]
contrib/cpio/ChangeLog [deleted file]
contrib/cpio/FREEBSD-upgrade [deleted file]
contrib/cpio/NEWS [deleted file]
contrib/cpio/README [deleted file]
contrib/cpio/alloca.c [deleted file]
contrib/cpio/copyin.c [deleted file]
contrib/cpio/copyout.c [deleted file]
contrib/cpio/copypass.c [deleted file]
contrib/cpio/cpio.1 [deleted file]
contrib/cpio/cpio.h [deleted file]
contrib/cpio/cpio.texi [deleted file]
contrib/cpio/cpiohdr.h [deleted file]
contrib/cpio/defer.c [deleted file]
contrib/cpio/defer.h [deleted file]
contrib/cpio/dirname.c [deleted file]
contrib/cpio/dstring.c [deleted file]
contrib/cpio/dstring.h [deleted file]
contrib/cpio/error.c [deleted file]
contrib/cpio/extern.h [deleted file]
contrib/cpio/filemode.c [deleted file]
contrib/cpio/filetypes.h [deleted file]
contrib/cpio/getopt.c [deleted file]
contrib/cpio/getopt.h [deleted file]
contrib/cpio/getopt1.c [deleted file]
contrib/cpio/global.c [deleted file]
contrib/cpio/idcache.c [deleted file]
contrib/cpio/main.c [deleted file]
contrib/cpio/makepath.c [deleted file]
contrib/cpio/rmt.h [deleted file]
contrib/cpio/rtapelib.c [deleted file]
contrib/cpio/safe-stat.h [deleted file]
contrib/cpio/stripslash.c [deleted file]
contrib/cpio/system.h [deleted file]
contrib/cpio/tar.c [deleted file]
contrib/cpio/tar.h [deleted file]
contrib/cpio/tarhdr.h [deleted file]
contrib/cpio/userspec.c [deleted file]
contrib/cpio/util.c [deleted file]
contrib/cpio/version.c [deleted file]
contrib/cpio/xmalloc.c [deleted file]
contrib/cpio/xstrdup.c [deleted file]
contrib/diffutils-2.8/src/diff.c
contrib/diffutils-2.8/src/diff.h
contrib/file-4/ChangeLog [deleted file]
contrib/file-4/LEGAL.NOTICE [deleted file]
contrib/file-4/MAINT [deleted file]
contrib/file-4/README [deleted file]
contrib/file-4/README.DELETED [deleted file]
contrib/file-4/README.DRAGONFLY [deleted file]
contrib/file-4/doc/file.man [deleted file]
contrib/file-4/doc/libmagic.man [deleted file]
contrib/file-4/doc/magic.man [deleted file]
contrib/file-4/magic/Magdir/adventure [deleted file]
contrib/file-4/magic/Magdir/animation [deleted file]
contrib/file-4/magic/Magdir/apple [deleted file]
contrib/file-4/magic/Magdir/archive [deleted file]
contrib/file-4/magic/Magdir/audio [deleted file]
contrib/file-4/magic/Magdir/c-lang [deleted file]
contrib/file-4/magic/Magdir/c64 [deleted file]
contrib/file-4/magic/Magdir/cafebabe [deleted file]
contrib/file-4/magic/Magdir/cddb [deleted file]
contrib/file-4/magic/Magdir/commands [deleted file]
contrib/file-4/magic/Magdir/compress [deleted file]
contrib/file-4/magic/Magdir/console [deleted file]
contrib/file-4/magic/Magdir/cracklib [deleted file]
contrib/file-4/magic/Magdir/ctags [deleted file]
contrib/file-4/magic/Magdir/database [deleted file]
contrib/file-4/magic/Magdir/diff [deleted file]
contrib/file-4/magic/Magdir/dump [deleted file]
contrib/file-4/magic/Magdir/elf [deleted file]
contrib/file-4/magic/Magdir/epoc [deleted file]
contrib/file-4/magic/Magdir/filesystems [deleted file]
contrib/file-4/magic/Magdir/flash [deleted file]
contrib/file-4/magic/Magdir/fonts [deleted file]
contrib/file-4/magic/Magdir/fortran [deleted file]
contrib/file-4/magic/Magdir/frame [deleted file]
contrib/file-4/magic/Magdir/freebsd [deleted file]
contrib/file-4/magic/Magdir/fsav [deleted file]
contrib/file-4/magic/Magdir/games [deleted file]
contrib/file-4/magic/Magdir/gimp [deleted file]
contrib/file-4/magic/Magdir/gnu [deleted file]
contrib/file-4/magic/Magdir/hp [deleted file]
contrib/file-4/magic/Magdir/iff [deleted file]
contrib/file-4/magic/Magdir/images [deleted file]
contrib/file-4/magic/Magdir/java [deleted file]
contrib/file-4/magic/Magdir/jpeg [deleted file]
contrib/file-4/magic/Magdir/lex [deleted file]
contrib/file-4/magic/Magdir/linux [deleted file]
contrib/file-4/magic/Magdir/lisp [deleted file]
contrib/file-4/magic/Magdir/mach [deleted file]
contrib/file-4/magic/Magdir/macintosh [deleted file]
contrib/file-4/magic/Magdir/mail.news [deleted file]
contrib/file-4/magic/Magdir/mathematica [deleted file]
contrib/file-4/magic/Magdir/misctools [deleted file]
contrib/file-4/magic/Magdir/msdos [deleted file]
contrib/file-4/magic/Magdir/mup [deleted file]
contrib/file-4/magic/Magdir/os2 [deleted file]
contrib/file-4/magic/Magdir/palm [deleted file]
contrib/file-4/magic/Magdir/pdf [deleted file]
contrib/file-4/magic/Magdir/perl [deleted file]
contrib/file-4/magic/Magdir/pgp [deleted file]
contrib/file-4/magic/Magdir/pkgadd [deleted file]
contrib/file-4/magic/Magdir/printer [deleted file]
contrib/file-4/magic/Magdir/psion [deleted file]
contrib/file-4/magic/Magdir/python [deleted file]
contrib/file-4/magic/Magdir/revision [deleted file]
contrib/file-4/magic/Magdir/riff [deleted file]
contrib/file-4/magic/Magdir/rpm [deleted file]
contrib/file-4/magic/Magdir/rtf [deleted file]
contrib/file-4/magic/Magdir/sc [deleted file]
contrib/file-4/magic/Magdir/scientific [deleted file]
contrib/file-4/magic/Magdir/sgi [deleted file]
contrib/file-4/magic/Magdir/sgml [deleted file]
contrib/file-4/magic/Magdir/sharc [deleted file]
contrib/file-4/magic/Magdir/sketch [deleted file]
contrib/file-4/magic/Magdir/softquad [deleted file]
contrib/file-4/magic/Magdir/spectrum [deleted file]
contrib/file-4/magic/Magdir/tex [deleted file]
contrib/file-4/magic/Magdir/timezone [deleted file]
contrib/file-4/magic/Magdir/troff [deleted file]
contrib/file-4/magic/Magdir/unicode [deleted file]
contrib/file-4/magic/Magdir/uuencode [deleted file]
contrib/file-4/magic/Magdir/varied.script [deleted file]
contrib/file-4/magic/Magdir/vorbis [deleted file]
contrib/file-4/magic/Magdir/wordprocessors [deleted file]
contrib/file-4/magic/Magdir/xwindows [deleted file]
contrib/file-4/magic/magic.mime [deleted file]
contrib/file-4/src/apprentice.c [deleted file]
contrib/file-4/src/apptype.c [deleted file]
contrib/file-4/src/ascmagic.c [deleted file]
contrib/file-4/src/compress.c [deleted file]
contrib/file-4/src/file.c [deleted file]
contrib/file-4/src/file.h [deleted file]
contrib/file-4/src/file_opts.h [deleted file]
contrib/file-4/src/fsmagic.c [deleted file]
contrib/file-4/src/funcs.c [deleted file]
contrib/file-4/src/is_tar.c [deleted file]
contrib/file-4/src/magic.c [deleted file]
contrib/file-4/src/magic.h [deleted file]
contrib/file-4/src/names.h [deleted file]
contrib/file-4/src/patchlevel.h [deleted file]
contrib/file-4/src/print.c [deleted file]
contrib/file-4/src/readelf.c [deleted file]
contrib/file-4/src/readelf.h [deleted file]
contrib/file-4/src/softmagic.c [deleted file]
contrib/file-4/src/tar.h [deleted file]
contrib/file-4/src/test.c [deleted file]
contrib/file/COPYING [new file with mode: 0644]
contrib/file/ChangeLog [new file with mode: 0644]
contrib/file/MAINT [new file with mode: 0644]
contrib/file/README [new file with mode: 0644]
contrib/file/README.DELETED [new file with mode: 0644]
contrib/file/README.DRAGONFLY [new file with mode: 0644]
contrib/file/doc/file.man [new file with mode: 0644]
contrib/file/doc/libmagic.man [new file with mode: 0644]
contrib/file/doc/magic.man [new file with mode: 0644]
contrib/file/magic/Header [moved from contrib/file-4/magic/Header with 100% similarity]
contrib/file/magic/Localstuff [moved from contrib/file-4/magic/Localstuff with 100% similarity]
contrib/file/magic/Magdir/acorn [moved from contrib/file-4/magic/Magdir/acorn with 100% similarity]
contrib/file/magic/Magdir/adi [moved from contrib/file-4/magic/Magdir/adi with 100% similarity]
contrib/file/magic/Magdir/adventure [new file with mode: 0644]
contrib/file/magic/Magdir/allegro [moved from contrib/file-4/magic/Magdir/allegro with 100% similarity]
contrib/file/magic/Magdir/alliant [moved from contrib/file-4/magic/Magdir/alliant with 100% similarity]
contrib/file/magic/Magdir/alpha [moved from contrib/file-4/magic/Magdir/alpha with 100% similarity]
contrib/file/magic/Magdir/amanda [moved from contrib/file-4/magic/Magdir/amanda with 100% similarity]
contrib/file/magic/Magdir/amigaos [moved from contrib/file-4/magic/Magdir/amigaos with 100% similarity]
contrib/file/magic/Magdir/animation [new file with mode: 0644]
contrib/file/magic/Magdir/apl [moved from contrib/file-4/magic/Magdir/apl with 100% similarity]
contrib/file/magic/Magdir/apple [new file with mode: 0644]
contrib/file/magic/Magdir/applix [moved from contrib/file-4/magic/Magdir/applix with 100% similarity]
contrib/file/magic/Magdir/archive [new file with mode: 0644]
contrib/file/magic/Magdir/asterix [moved from contrib/file-4/magic/Magdir/asterix with 100% similarity]
contrib/file/magic/Magdir/att3b [moved from contrib/file-4/magic/Magdir/att3b with 100% similarity]
contrib/file/magic/Magdir/audio [new file with mode: 0644]
contrib/file/magic/Magdir/basis [moved from contrib/file-4/magic/Magdir/basis with 100% similarity]
contrib/file/magic/Magdir/bflt [moved from contrib/file-4/magic/Magdir/bflt with 100% similarity]
contrib/file/magic/Magdir/blender [moved from contrib/file-4/magic/Magdir/blender with 100% similarity]
contrib/file/magic/Magdir/blit [moved from contrib/file-4/magic/Magdir/blit with 100% similarity]
contrib/file/magic/Magdir/bout [moved from contrib/file-4/magic/Magdir/bout with 100% similarity]
contrib/file/magic/Magdir/bsdi [moved from contrib/file-4/magic/Magdir/bsdi with 100% similarity]
contrib/file/magic/Magdir/btsnoop [moved from contrib/file-4/magic/Magdir/btsnoop with 100% similarity]
contrib/file/magic/Magdir/c-lang [new file with mode: 0644]
contrib/file/magic/Magdir/c64 [new file with mode: 0644]
contrib/file/magic/Magdir/cad [moved from contrib/file-4/magic/Magdir/cad with 100% similarity]
contrib/file/magic/Magdir/cafebabe [new file with mode: 0644]
contrib/file/magic/Magdir/cddb [new file with mode: 0644]
contrib/file/magic/Magdir/chord [moved from contrib/file-4/magic/Magdir/chord with 100% similarity]
contrib/file/magic/Magdir/cisco [moved from contrib/file-4/magic/Magdir/cisco with 100% similarity]
contrib/file/magic/Magdir/citrus [moved from contrib/file-4/magic/Magdir/citrus with 100% similarity]
contrib/file/magic/Magdir/clarion [new file with mode: 0644]
contrib/file/magic/Magdir/claris [moved from contrib/file-4/magic/Magdir/claris with 100% similarity]
contrib/file/magic/Magdir/clipper [moved from contrib/file-4/magic/Magdir/clipper with 100% similarity]
contrib/file/magic/Magdir/commands [new file with mode: 0644]
contrib/file/magic/Magdir/communications [moved from contrib/file-4/magic/Magdir/communications with 100% similarity]
contrib/file/magic/Magdir/compress [new file with mode: 0644]
contrib/file/magic/Magdir/console [new file with mode: 0644]
contrib/file/magic/Magdir/convex [moved from contrib/file-4/magic/Magdir/convex with 100% similarity]
contrib/file/magic/Magdir/cracklib [new file with mode: 0644]
contrib/file/magic/Magdir/ctags [new file with mode: 0644]
contrib/file/magic/Magdir/dact [moved from contrib/file-4/magic/Magdir/dact with 100% similarity]
contrib/file/magic/Magdir/database [new file with mode: 0644]
contrib/file/magic/Magdir/diamond [moved from contrib/file-4/magic/Magdir/diamond with 100% similarity]
contrib/file/magic/Magdir/diff [new file with mode: 0644]
contrib/file/magic/Magdir/digital [moved from contrib/file-4/magic/Magdir/digital with 100% similarity]
contrib/file/magic/Magdir/dolby [moved from contrib/file-4/magic/Magdir/dolby with 100% similarity]
contrib/file/magic/Magdir/dump [new file with mode: 0644]
contrib/file/magic/Magdir/dyadic [moved from contrib/file-4/magic/Magdir/dyadic with 100% similarity]
contrib/file/magic/Magdir/editors [moved from contrib/file-4/magic/Magdir/editors with 100% similarity]
contrib/file/magic/Magdir/efi [moved from contrib/file-4/magic/Magdir/efi with 100% similarity]
contrib/file/magic/Magdir/elf [new file with mode: 0644]
contrib/file/magic/Magdir/encore [moved from contrib/file-4/magic/Magdir/encore with 100% similarity]
contrib/file/magic/Magdir/epoc [new file with mode: 0644]
contrib/file/magic/Magdir/erlang [new file with mode: 0644]
contrib/file/magic/Magdir/esri [moved from contrib/file-4/magic/Magdir/esri with 100% similarity]
contrib/file/magic/Magdir/fcs [moved from contrib/file-4/magic/Magdir/fcs with 100% similarity]
contrib/file/magic/Magdir/filesystems [new file with mode: 0644]
contrib/file/magic/Magdir/flash [new file with mode: 0644]
contrib/file/magic/Magdir/fonts [new file with mode: 0644]
contrib/file/magic/Magdir/fortran [new file with mode: 0644]
contrib/file/magic/Magdir/frame [new file with mode: 0644]
contrib/file/magic/Magdir/freebsd [new file with mode: 0644]
contrib/file/magic/Magdir/fsav [new file with mode: 0644]
contrib/file/magic/Magdir/games [new file with mode: 0644]
contrib/file/magic/Magdir/gcc [moved from contrib/file-4/magic/Magdir/gcc with 100% similarity]
contrib/file/magic/Magdir/geos [moved from contrib/file-4/magic/Magdir/geos with 100% similarity]
contrib/file/magic/Magdir/gimp [new file with mode: 0644]
contrib/file/magic/Magdir/gnome-keyring [new file with mode: 0644]
contrib/file/magic/Magdir/gnu [new file with mode: 0644]
contrib/file/magic/Magdir/gnumeric [new file with mode: 0644]
contrib/file/magic/Magdir/grace [moved from contrib/file-4/magic/Magdir/grace with 100% similarity]
contrib/file/magic/Magdir/graphviz [new file with mode: 0644]
contrib/file/magic/Magdir/gringotts [moved from contrib/file-4/magic/Magdir/gringotts with 100% similarity]
contrib/file/magic/Magdir/hitachi-sh [moved from contrib/file-4/magic/Magdir/hitachi-sh with 100% similarity]
contrib/file/magic/Magdir/hp [new file with mode: 0644]
contrib/file/magic/Magdir/human68k [moved from contrib/file-4/magic/Magdir/human68k with 100% similarity]
contrib/file/magic/Magdir/ibm370 [moved from contrib/file-4/magic/Magdir/ibm370 with 100% similarity]
contrib/file/magic/Magdir/ibm6000 [moved from contrib/file-4/magic/Magdir/ibm6000 with 100% similarity]
contrib/file/magic/Magdir/iff [new file with mode: 0644]
contrib/file/magic/Magdir/images [new file with mode: 0644]
contrib/file/magic/Magdir/inform [new file with mode: 0644]
contrib/file/magic/Magdir/intel [moved from contrib/file-4/magic/Magdir/intel with 100% similarity]
contrib/file/magic/Magdir/interleaf [moved from contrib/file-4/magic/Magdir/interleaf with 100% similarity]
contrib/file/magic/Magdir/island [moved from contrib/file-4/magic/Magdir/island with 100% similarity]
contrib/file/magic/Magdir/ispell [moved from contrib/file-4/magic/Magdir/ispell with 100% similarity]
contrib/file/magic/Magdir/java [new file with mode: 0644]
contrib/file/magic/Magdir/jpeg [new file with mode: 0644]
contrib/file/magic/Magdir/karma [moved from contrib/file-4/magic/Magdir/karma with 100% similarity]
contrib/file/magic/Magdir/kde [new file with mode: 0644]
contrib/file/magic/Magdir/kml [new file with mode: 0644]
contrib/file/magic/Magdir/lecter [moved from contrib/file-4/magic/Magdir/lecter with 100% similarity]
contrib/file/magic/Magdir/lex [new file with mode: 0644]
contrib/file/magic/Magdir/lif [moved from contrib/file-4/magic/Magdir/lif with 100% similarity]
contrib/file/magic/Magdir/linux [new file with mode: 0644]
contrib/file/magic/Magdir/lisp [new file with mode: 0644]
contrib/file/magic/Magdir/llvm [new file with mode: 0644]
contrib/file/magic/Magdir/lua [new file with mode: 0644]
contrib/file/magic/Magdir/luks [new file with mode: 0644]
contrib/file/magic/Magdir/mach [new file with mode: 0644]
contrib/file/magic/Magdir/macintosh [new file with mode: 0644]
contrib/file/magic/Magdir/magic [moved from contrib/file-4/magic/Magdir/magic with 100% similarity]
contrib/file/magic/Magdir/mail.news [new file with mode: 0644]
contrib/file/magic/Magdir/maple [moved from contrib/file-4/magic/Magdir/maple with 100% similarity]
contrib/file/magic/Magdir/mathcad [new file with mode: 0644]
contrib/file/magic/Magdir/mathematica [new file with mode: 0644]
contrib/file/magic/Magdir/matroska [moved from contrib/file-4/magic/Magdir/matroska with 100% similarity]
contrib/file/magic/Magdir/mcrypt [moved from contrib/file-4/magic/Magdir/mcrypt with 100% similarity]
contrib/file/magic/Magdir/mercurial [new file with mode: 0644]
contrib/file/magic/Magdir/mime [moved from contrib/file-4/magic/Magdir/mime with 100% similarity]
contrib/file/magic/Magdir/mips [moved from contrib/file-4/magic/Magdir/mips with 100% similarity]
contrib/file/magic/Magdir/mirage [moved from contrib/file-4/magic/Magdir/mirage with 100% similarity]
contrib/file/magic/Magdir/misctools [new file with mode: 0644]
contrib/file/magic/Magdir/mkid [moved from contrib/file-4/magic/Magdir/mkid with 100% similarity]
contrib/file/magic/Magdir/mlssa [moved from contrib/file-4/magic/Magdir/mlssa with 100% similarity]
contrib/file/magic/Magdir/mmdf [moved from contrib/file-4/magic/Magdir/mmdf with 100% similarity]
contrib/file/magic/Magdir/modem [moved from contrib/file-4/magic/Magdir/modem with 100% similarity]
contrib/file/magic/Magdir/motorola [moved from contrib/file-4/magic/Magdir/motorola with 100% similarity]
contrib/file/magic/Magdir/mozilla [new file with mode: 0644]
contrib/file/magic/Magdir/msdos [new file with mode: 0644]
contrib/file/magic/Magdir/msvc [moved from contrib/file-4/magic/Magdir/msvc with 100% similarity]
contrib/file/magic/Magdir/mup [new file with mode: 0644]
contrib/file/magic/Magdir/natinst [moved from contrib/file-4/magic/Magdir/natinst with 100% similarity]
contrib/file/magic/Magdir/ncr [moved from contrib/file-4/magic/Magdir/ncr with 100% similarity]
contrib/file/magic/Magdir/netbsd [moved from contrib/file-4/magic/Magdir/netbsd with 100% similarity]
contrib/file/magic/Magdir/netscape [moved from contrib/file-4/magic/Magdir/netscape with 100% similarity]
contrib/file/magic/Magdir/netware [new file with mode: 0644]
contrib/file/magic/Magdir/news [moved from contrib/file-4/magic/Magdir/news with 100% similarity]
contrib/file/magic/Magdir/nitpicker [moved from contrib/file-4/magic/Magdir/nitpicker with 100% similarity]
contrib/file/magic/Magdir/ocaml [moved from contrib/file-4/magic/Magdir/ocaml with 100% similarity]
contrib/file/magic/Magdir/octave [moved from contrib/file-4/magic/Magdir/octave with 100% similarity]
contrib/file/magic/Magdir/ole2compounddocs [new file with mode: 0644]
contrib/file/magic/Magdir/olf [moved from contrib/file-4/magic/Magdir/olf with 100% similarity]
contrib/file/magic/Magdir/os2 [new file with mode: 0644]
contrib/file/magic/Magdir/os400 [moved from contrib/file-4/magic/Magdir/os400 with 100% similarity]
contrib/file/magic/Magdir/os9 [moved from contrib/file-4/magic/Magdir/os9 with 100% similarity]
contrib/file/magic/Magdir/osf1 [moved from contrib/file-4/magic/Magdir/osf1 with 100% similarity]
contrib/file/magic/Magdir/palm [new file with mode: 0644]
contrib/file/magic/Magdir/parix [moved from contrib/file-4/magic/Magdir/parix with 100% similarity]
contrib/file/magic/Magdir/pbm [moved from contrib/file-4/magic/Magdir/pbm with 100% similarity]
contrib/file/magic/Magdir/pdf [new file with mode: 0644]
contrib/file/magic/Magdir/pdp [moved from contrib/file-4/magic/Magdir/pdp with 100% similarity]
contrib/file/magic/Magdir/perl [new file with mode: 0644]
contrib/file/magic/Magdir/pgp [new file with mode: 0644]
contrib/file/magic/Magdir/pkgadd [new file with mode: 0644]
contrib/file/magic/Magdir/plan9 [moved from contrib/file-4/magic/Magdir/plan9 with 100% similarity]
contrib/file/magic/Magdir/plus5 [moved from contrib/file-4/magic/Magdir/plus5 with 100% similarity]
contrib/file/magic/Magdir/printer [new file with mode: 0644]
contrib/file/magic/Magdir/project [moved from contrib/file-4/magic/Magdir/project with 100% similarity]
contrib/file/magic/Magdir/psdbms [moved from contrib/file-4/magic/Magdir/psdbms with 100% similarity]
contrib/file/magic/Magdir/psion [new file with mode: 0644]
contrib/file/magic/Magdir/pulsar [moved from contrib/file-4/magic/Magdir/pulsar with 100% similarity]
contrib/file/magic/Magdir/pyramid [moved from contrib/file-4/magic/Magdir/pyramid with 100% similarity]
contrib/file/magic/Magdir/python [new file with mode: 0644]
contrib/file/magic/Magdir/revision [new file with mode: 0644]
contrib/file/magic/Magdir/riff [new file with mode: 0644]
contrib/file/magic/Magdir/rpm [new file with mode: 0644]
contrib/file/magic/Magdir/rtf [new file with mode: 0644]
contrib/file/magic/Magdir/ruby [new file with mode: 0644]
contrib/file/magic/Magdir/sc [new file with mode: 0644]
contrib/file/magic/Magdir/sccs [moved from contrib/file-4/magic/Magdir/sccs with 100% similarity]
contrib/file/magic/Magdir/scientific [new file with mode: 0644]
contrib/file/magic/Magdir/securitycerts [new file with mode: 0644]
contrib/file/magic/Magdir/sendmail [moved from contrib/file-4/magic/Magdir/sendmail with 100% similarity]
contrib/file/magic/Magdir/sequent [moved from contrib/file-4/magic/Magdir/sequent with 100% similarity]
contrib/file/magic/Magdir/sgi [new file with mode: 0644]
contrib/file/magic/Magdir/sgml [new file with mode: 0644]
contrib/file/magic/Magdir/sharc [new file with mode: 0644]
contrib/file/magic/Magdir/sinclair [moved from contrib/file-4/magic/Magdir/sinclair with 100% similarity]
contrib/file/magic/Magdir/sketch [new file with mode: 0644]
contrib/file/magic/Magdir/smalltalk [moved from contrib/file-4/magic/Magdir/smalltalk with 100% similarity]
contrib/file/magic/Magdir/sniffer [moved from contrib/file-4/magic/Magdir/sniffer with 100% similarity]
contrib/file/magic/Magdir/softquad [new file with mode: 0644]
contrib/file/magic/Magdir/spec [moved from contrib/file-4/magic/Magdir/spec with 100% similarity]
contrib/file/magic/Magdir/spectrum [new file with mode: 0644]
contrib/file/magic/Magdir/sql [moved from contrib/file-4/magic/Magdir/sql with 100% similarity]
contrib/file/magic/Magdir/sun [moved from contrib/file-4/magic/Magdir/sun with 100% similarity]
contrib/file/magic/Magdir/sysex [moved from contrib/file-4/magic/Magdir/sysex with 100% similarity]
contrib/file/magic/Magdir/teapot [moved from contrib/file-4/magic/Magdir/teapot with 100% similarity]
contrib/file/magic/Magdir/terminfo [moved from contrib/file-4/magic/Magdir/terminfo with 100% similarity]
contrib/file/magic/Magdir/tex [new file with mode: 0644]
contrib/file/magic/Magdir/tgif [moved from contrib/file-4/magic/Magdir/tgif with 100% similarity]
contrib/file/magic/Magdir/ti-8x [moved from contrib/file-4/magic/Magdir/ti-8x with 100% similarity]
contrib/file/magic/Magdir/timezone [new file with mode: 0644]
contrib/file/magic/Magdir/troff [new file with mode: 0644]
contrib/file/magic/Magdir/tuxedo [moved from contrib/file-4/magic/Magdir/tuxedo with 100% similarity]
contrib/file/magic/Magdir/typeset [moved from contrib/file-4/magic/Magdir/typeset with 100% similarity]
contrib/file/magic/Magdir/unicode [new file with mode: 0644]
contrib/file/magic/Magdir/unknown [moved from contrib/file-4/magic/Magdir/unknown with 100% similarity]
contrib/file/magic/Magdir/uuencode [new file with mode: 0644]
contrib/file/magic/Magdir/varied.out [moved from contrib/file-4/magic/Magdir/varied.out with 100% similarity]
contrib/file/magic/Magdir/varied.script [new file with mode: 0644]
contrib/file/magic/Magdir/vax [moved from contrib/file-4/magic/Magdir/vax with 100% similarity]
contrib/file/magic/Magdir/vicar [moved from contrib/file-4/magic/Magdir/vicar with 100% similarity]
contrib/file/magic/Magdir/virtutech [moved from contrib/file-4/magic/Magdir/virtutech with 100% similarity]
contrib/file/magic/Magdir/visx [moved from contrib/file-4/magic/Magdir/visx with 100% similarity]
contrib/file/magic/Magdir/vms [moved from contrib/file-4/magic/Magdir/vms with 100% similarity]
contrib/file/magic/Magdir/vmware [moved from contrib/file-4/magic/Magdir/vmware with 100% similarity]
contrib/file/magic/Magdir/vorbis [new file with mode: 0644]
contrib/file/magic/Magdir/vxl [moved from contrib/file-4/magic/Magdir/vxl with 100% similarity]
contrib/file/magic/Magdir/warc [new file with mode: 0644]
contrib/file/magic/Magdir/weak [new file with mode: 0644]
contrib/file/magic/Magdir/windows [new file with mode: 0644]
contrib/file/magic/Magdir/wireless [new file with mode: 0644]
contrib/file/magic/Magdir/wordprocessors [new file with mode: 0644]
contrib/file/magic/Magdir/xdelta [moved from contrib/file-4/magic/Magdir/xdelta with 100% similarity]
contrib/file/magic/Magdir/xenix [moved from contrib/file-4/magic/Magdir/xenix with 100% similarity]
contrib/file/magic/Magdir/xilinx [new file with mode: 0644]
contrib/file/magic/Magdir/xo65 [moved from contrib/file-4/magic/Magdir/xo65 with 100% similarity]
contrib/file/magic/Magdir/xwindows [new file with mode: 0644]
contrib/file/magic/Magdir/zilog [moved from contrib/file-4/magic/Magdir/zilog with 100% similarity]
contrib/file/magic/Magdir/zyxel [moved from contrib/file-4/magic/Magdir/zyxel with 100% similarity]
contrib/file/src/apprentice.c [new file with mode: 0644]
contrib/file/src/apptype.c [new file with mode: 0644]
contrib/file/src/ascmagic.c [new file with mode: 0644]
contrib/file/src/cdf.c [new file with mode: 0644]
contrib/file/src/cdf.h [new file with mode: 0644]
contrib/file/src/cdf_time.c [new file with mode: 0644]
contrib/file/src/compress.c [new file with mode: 0644]
contrib/file/src/elfclass.h [new file with mode: 0644]
contrib/file/src/encoding.c [new file with mode: 0644]
contrib/file/src/file.c [new file with mode: 0644]
contrib/file/src/file.h [new file with mode: 0644]
contrib/file/src/file_opts.h [new file with mode: 0644]
contrib/file/src/fsmagic.c [new file with mode: 0644]
contrib/file/src/funcs.c [new file with mode: 0644]
contrib/file/src/is_tar.c [new file with mode: 0644]
contrib/file/src/magic.c [new file with mode: 0644]
contrib/file/src/magic.h [new file with mode: 0644]
contrib/file/src/mygetopt.h [new file with mode: 0644]
contrib/file/src/names.h [new file with mode: 0644]
contrib/file/src/patchlevel.h [new file with mode: 0644]
contrib/file/src/print.c [new file with mode: 0644]
contrib/file/src/readcdf.c [new file with mode: 0644]
contrib/file/src/readelf.c [new file with mode: 0644]
contrib/file/src/readelf.h [new file with mode: 0644]
contrib/file/src/softmagic.c [new file with mode: 0644]
contrib/file/src/tar.h [new file with mode: 0644]
contrib/less-4/LICENSE [deleted file]
contrib/less-4/NEWS [deleted file]
contrib/less-4/brac.c [deleted file]
contrib/less-4/ch.c [deleted file]
contrib/less-4/charset.c [deleted file]
contrib/less-4/charset.h [deleted file]
contrib/less-4/cmd.h [deleted file]
contrib/less-4/cmdbuf.c [deleted file]
contrib/less-4/command.c [deleted file]
contrib/less-4/decode.c [deleted file]
contrib/less-4/edit.c [deleted file]
contrib/less-4/filename.c [deleted file]
contrib/less-4/forwback.c [deleted file]
contrib/less-4/funcs.h [deleted file]
contrib/less-4/help.c [deleted file]
contrib/less-4/ifile.c [deleted file]
contrib/less-4/input.c [deleted file]
contrib/less-4/jump.c [deleted file]
contrib/less-4/less.h [deleted file]
contrib/less-4/less.nro [deleted file]
contrib/less-4/lessecho.c [deleted file]
contrib/less-4/lessecho.nro [deleted file]
contrib/less-4/lesskey.c [deleted file]
contrib/less-4/lesskey.h [deleted file]
contrib/less-4/lesskey.nro [deleted file]
contrib/less-4/lglob.h [deleted file]
contrib/less-4/line.c [deleted file]
contrib/less-4/linenum.c [deleted file]
contrib/less-4/lsystem.c [deleted file]
contrib/less-4/main.c [deleted file]
contrib/less-4/mark.c [deleted file]
contrib/less-4/optfunc.c [deleted file]
contrib/less-4/option.c [deleted file]
contrib/less-4/option.h [deleted file]
contrib/less-4/opttbl.c [deleted file]
contrib/less-4/os.c [deleted file]
contrib/less-4/output.c [deleted file]
contrib/less-4/pckeys.h [deleted file]
contrib/less-4/position.c [deleted file]
contrib/less-4/position.h [deleted file]
contrib/less-4/prompt.c [deleted file]
contrib/less-4/screen.c [deleted file]
contrib/less-4/search.c [deleted file]
contrib/less-4/signal.c [deleted file]
contrib/less-4/tags.c [deleted file]
contrib/less-4/ttyin.c [deleted file]
contrib/less-4/version.c [deleted file]
contrib/less/COPYING [moved from contrib/less-4/COPYING with 100% similarity]
contrib/less/LICENSE [new file with mode: 0755]
contrib/less/NEWS [new file with mode: 0644]
contrib/less/README.DELETED [moved from contrib/less-4/README.DELETED with 100% similarity]
contrib/less/README.DRAGONFLY [moved from contrib/less-4/README.DRAGONFLY with 100% similarity]
contrib/less/brac.c [new file with mode: 0755]
contrib/less/ch.c [new file with mode: 0755]
contrib/less/charset.c [new file with mode: 0755]
contrib/less/charset.h [new file with mode: 0644]
contrib/less/cmd.h [new file with mode: 0755]
contrib/less/cmdbuf.c [new file with mode: 0755]
contrib/less/command.c [new file with mode: 0755]
contrib/less/decode.c [new file with mode: 0755]
contrib/less/edit.c [new file with mode: 0755]
contrib/less/filename.c [new file with mode: 0755]
contrib/less/forwback.c [new file with mode: 0755]
contrib/less/funcs.h [new file with mode: 0644]
contrib/less/help.c [new file with mode: 0644]
contrib/less/ifile.c [new file with mode: 0755]
contrib/less/input.c [new file with mode: 0755]
contrib/less/jump.c [new file with mode: 0755]
contrib/less/less.h [new file with mode: 0755]
contrib/less/less.nro [new file with mode: 0644]
contrib/less/lessecho.c [new file with mode: 0755]
contrib/less/lessecho.nro [new file with mode: 0644]
contrib/less/lesskey.c [new file with mode: 0755]
contrib/less/lesskey.h [new file with mode: 0755]
contrib/less/lesskey.nro [new file with mode: 0644]
contrib/less/lglob.h [new file with mode: 0755]
contrib/less/line.c [new file with mode: 0755]
contrib/less/linenum.c [new file with mode: 0755]
contrib/less/lsystem.c [new file with mode: 0755]
contrib/less/main.c [new file with mode: 0755]
contrib/less/mark.c [new file with mode: 0755]
contrib/less/optfunc.c [new file with mode: 0755]
contrib/less/option.c [new file with mode: 0755]
contrib/less/option.h [new file with mode: 0755]
contrib/less/opttbl.c [new file with mode: 0755]
contrib/less/os.c [new file with mode: 0755]
contrib/less/output.c [new file with mode: 0755]
contrib/less/pckeys.h [new file with mode: 0755]
contrib/less/position.c [new file with mode: 0755]
contrib/less/position.h [new file with mode: 0755]
contrib/less/prompt.c [new file with mode: 0755]
contrib/less/screen.c [new file with mode: 0755]
contrib/less/search.c [new file with mode: 0755]
contrib/less/signal.c [new file with mode: 0755]
contrib/less/tags.c [new file with mode: 0755]
contrib/less/ttyin.c [new file with mode: 0755]
contrib/less/version.c [new file with mode: 0755]
contrib/libarchive-2/README.DRAGONFLY [deleted file]
contrib/libarchive/COPYING [moved from contrib/libarchive-2/COPYING with 100% similarity]
contrib/libarchive/NEWS [moved from contrib/libarchive-2/NEWS with 100% similarity]
contrib/libarchive/README [moved from contrib/libarchive-2/README with 100% similarity]
contrib/libarchive/README.DELETED [moved from contrib/libarchive-2/README.DELETED with 100% similarity]
contrib/libarchive/README.DRAGONFLY [new file with mode: 0644]
contrib/libarchive/cpio/bsdcpio.1 [moved from contrib/libarchive-2/cpio/bsdcpio.1 with 100% similarity]
contrib/libarchive/cpio/cmdline.c [moved from contrib/libarchive-2/cpio/cmdline.c with 100% similarity]
contrib/libarchive/cpio/cpio.c [moved from contrib/libarchive-2/cpio/cpio.c with 100% similarity]
contrib/libarchive/cpio/cpio.h [moved from contrib/libarchive-2/cpio/cpio.h with 100% similarity]
contrib/libarchive/cpio/cpio_platform.h [moved from contrib/libarchive-2/cpio/cpio_platform.h with 100% similarity]
contrib/libarchive/cpio/err.c [moved from contrib/libarchive-2/cpio/err.c with 100% similarity]
contrib/libarchive/cpio/matching.c [moved from contrib/libarchive-2/cpio/matching.c with 100% similarity]
contrib/libarchive/cpio/matching.h [moved from contrib/libarchive-2/cpio/matching.h with 100% similarity]
contrib/libarchive/cpio/pathmatch.c [moved from contrib/libarchive-2/cpio/pathmatch.c with 100% similarity]
contrib/libarchive/cpio/pathmatch.h [moved from contrib/libarchive-2/cpio/pathmatch.h with 100% similarity]
contrib/libarchive/libarchive/archive.h [moved from contrib/libarchive-2/libarchive/archive.h with 100% similarity]
contrib/libarchive/libarchive/archive.h.in [new file with mode: 0644]
contrib/libarchive/libarchive/archive_check_magic.c [moved from contrib/libarchive-2/libarchive/archive_check_magic.c with 100% similarity]
contrib/libarchive/libarchive/archive_endian.h [moved from contrib/libarchive-2/libarchive/archive_endian.h with 100% similarity]
contrib/libarchive/libarchive/archive_entry.3 [moved from contrib/libarchive-2/libarchive/archive_entry.3 with 100% similarity]
contrib/libarchive/libarchive/archive_entry.c [moved from contrib/libarchive-2/libarchive/archive_entry.c with 100% similarity]
contrib/libarchive/libarchive/archive_entry.h [moved from contrib/libarchive-2/libarchive/archive_entry.h with 100% similarity]
contrib/libarchive/libarchive/archive_entry_copy_stat.c [moved from contrib/libarchive-2/libarchive/archive_entry_copy_stat.c with 100% similarity]
contrib/libarchive/libarchive/archive_entry_link_resolver.c [moved from contrib/libarchive-2/libarchive/archive_entry_link_resolver.c with 100% similarity]
contrib/libarchive/libarchive/archive_entry_private.h [moved from contrib/libarchive-2/libarchive/archive_entry_private.h with 100% similarity]
contrib/libarchive/libarchive/archive_entry_stat.c [moved from contrib/libarchive-2/libarchive/archive_entry_stat.c with 100% similarity]
contrib/libarchive/libarchive/archive_entry_strmode.c [moved from contrib/libarchive-2/libarchive/archive_entry_strmode.c with 100% similarity]
contrib/libarchive/libarchive/archive_platform.h [moved from contrib/libarchive-2/libarchive/archive_platform.h with 100% similarity]
contrib/libarchive/libarchive/archive_private.h [moved from contrib/libarchive-2/libarchive/archive_private.h with 100% similarity]
contrib/libarchive/libarchive/archive_read.3 [moved from contrib/libarchive-2/libarchive/archive_read.3 with 100% similarity]
contrib/libarchive/libarchive/archive_read.c [moved from contrib/libarchive-2/libarchive/archive_read.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_data_into_fd.c [moved from contrib/libarchive-2/libarchive/archive_read_data_into_fd.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_extract.c [moved from contrib/libarchive-2/libarchive/archive_read_extract.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_open_fd.c [moved from contrib/libarchive-2/libarchive/archive_read_open_fd.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_open_file.c [moved from contrib/libarchive-2/libarchive/archive_read_open_file.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_open_filename.c [moved from contrib/libarchive-2/libarchive/archive_read_open_filename.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_open_memory.c [moved from contrib/libarchive-2/libarchive/archive_read_open_memory.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_private.h [moved from contrib/libarchive-2/libarchive/archive_read_private.h with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_all.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_all.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_bzip2.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_compress.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_compress.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_gzip.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_gzip.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_none.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_none.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_compression_program.c [moved from contrib/libarchive-2/libarchive/archive_read_support_compression_program.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_all.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_all.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_ar.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_ar.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_cpio.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_cpio.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_empty.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_empty.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_iso9660.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_iso9660.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_mtree.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_mtree.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_tar.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_tar.c with 100% similarity]
contrib/libarchive/libarchive/archive_read_support_format_zip.c [moved from contrib/libarchive-2/libarchive/archive_read_support_format_zip.c with 100% similarity]
contrib/libarchive/libarchive/archive_string.c [moved from contrib/libarchive-2/libarchive/archive_string.c with 100% similarity]
contrib/libarchive/libarchive/archive_string.h [moved from contrib/libarchive-2/libarchive/archive_string.h with 100% similarity]
contrib/libarchive/libarchive/archive_string_sprintf.c [moved from contrib/libarchive-2/libarchive/archive_string_sprintf.c with 100% similarity]
contrib/libarchive/libarchive/archive_util.3 [moved from contrib/libarchive-2/libarchive/archive_util.3 with 100% similarity]
contrib/libarchive/libarchive/archive_util.c [moved from contrib/libarchive-2/libarchive/archive_util.c with 100% similarity]
contrib/libarchive/libarchive/archive_virtual.c [moved from contrib/libarchive-2/libarchive/archive_virtual.c with 100% similarity]
contrib/libarchive/libarchive/archive_write.3 [moved from contrib/libarchive-2/libarchive/archive_write.3 with 100% similarity]
contrib/libarchive/libarchive/archive_write.c [moved from contrib/libarchive-2/libarchive/archive_write.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_disk.3 [moved from contrib/libarchive-2/libarchive/archive_write_disk.3 with 100% similarity]
contrib/libarchive/libarchive/archive_write_disk.c [moved from contrib/libarchive-2/libarchive/archive_write_disk.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_disk_private.h [moved from contrib/libarchive-2/libarchive/archive_write_disk_private.h with 100% similarity]
contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c [moved from contrib/libarchive-2/libarchive/archive_write_disk_set_standard_lookup.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_open_fd.c [moved from contrib/libarchive-2/libarchive/archive_write_open_fd.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_open_file.c [moved from contrib/libarchive-2/libarchive/archive_write_open_file.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_open_filename.c [moved from contrib/libarchive-2/libarchive/archive_write_open_filename.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_open_memory.c [moved from contrib/libarchive-2/libarchive/archive_write_open_memory.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_private.h [moved from contrib/libarchive-2/libarchive/archive_write_private.h with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c [moved from contrib/libarchive-2/libarchive/archive_write_set_compression_bzip2.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_compression_compress.c [moved from contrib/libarchive-2/libarchive/archive_write_set_compression_compress.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_compression_gzip.c [moved from contrib/libarchive-2/libarchive/archive_write_set_compression_gzip.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_compression_none.c [moved from contrib/libarchive-2/libarchive/archive_write_set_compression_none.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_compression_program.c [moved from contrib/libarchive-2/libarchive/archive_write_set_compression_program.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_ar.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_ar.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_by_name.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_by_name.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_cpio.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_cpio.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_cpio_newc.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_pax.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_pax.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_shar.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_shar.c with 100% similarity]
contrib/libarchive/libarchive/archive_write_set_format_ustar.c [moved from contrib/libarchive-2/libarchive/archive_write_set_format_ustar.c with 100% similarity]
contrib/libarchive/libarchive/cpio.5 [moved from contrib/libarchive-2/libarchive/cpio.5 with 100% similarity]
contrib/libarchive/libarchive/filter_fork.c [moved from contrib/libarchive-2/libarchive/filter_fork.c with 100% similarity]
contrib/libarchive/libarchive/filter_fork.h [moved from contrib/libarchive-2/libarchive/filter_fork.h with 100% similarity]
contrib/libarchive/libarchive/libarchive-formats.5 [moved from contrib/libarchive-2/libarchive/libarchive-formats.5 with 100% similarity]
contrib/libarchive/libarchive/libarchive.3 [moved from contrib/libarchive-2/libarchive/libarchive.3 with 100% similarity]
contrib/libarchive/libarchive/libarchive_internals.3 [moved from contrib/libarchive-2/libarchive/libarchive_internals.3 with 100% similarity]
contrib/libarchive/libarchive/mtree.5 [moved from contrib/libarchive-2/libarchive/mtree.5 with 100% similarity]
contrib/libarchive/libarchive/tar.5 [moved from contrib/libarchive-2/libarchive/tar.5 with 100% similarity]
contrib/libarchive/tar/bsdtar.1 [moved from contrib/libarchive-2/tar/bsdtar.1 with 100% similarity]
contrib/libarchive/tar/bsdtar.c [moved from contrib/libarchive-2/tar/bsdtar.c with 100% similarity]
contrib/libarchive/tar/bsdtar.h [moved from contrib/libarchive-2/tar/bsdtar.h with 100% similarity]
contrib/libarchive/tar/bsdtar_platform.h [moved from contrib/libarchive-2/tar/bsdtar_platform.h with 100% similarity]
contrib/libarchive/tar/getdate.y [moved from contrib/libarchive-2/tar/getdate.y with 100% similarity]
contrib/libarchive/tar/matching.c [moved from contrib/libarchive-2/tar/matching.c with 100% similarity]
contrib/libarchive/tar/read.c [moved from contrib/libarchive-2/tar/read.c with 100% similarity]
contrib/libarchive/tar/siginfo.c [moved from contrib/libarchive-2/tar/siginfo.c with 100% similarity]
contrib/libarchive/tar/subst.c [moved from contrib/libarchive-2/tar/subst.c with 100% similarity]
contrib/libarchive/tar/tree.c [moved from contrib/libarchive-2/tar/tree.c with 100% similarity]
contrib/libarchive/tar/tree.h [moved from contrib/libarchive-2/tar/tree.h with 100% similarity]
contrib/libarchive/tar/util.c [moved from contrib/libarchive-2/tar/util.c with 100% similarity]
contrib/libarchive/tar/write.c [moved from contrib/libarchive-2/tar/write.c with 100% similarity]
contrib/libarchive/version [moved from contrib/libarchive-2/version with 100% similarity]
contrib/pnpinfo/pnpinfo.c
contrib/tcp_wrappers/fix_options.c
crypto/openssh-5/PROTOCOL [deleted file]
crypto/openssh-5/README [deleted file]
crypto/openssh-5/README.DELETED [deleted file]
crypto/openssh-5/README.DRAGONFLY [deleted file]
crypto/openssh-5/addrmatch.c [deleted file]
crypto/openssh-5/auth-options.c [deleted file]
crypto/openssh-5/auth.c [deleted file]
crypto/openssh-5/auth.h [deleted file]
crypto/openssh-5/auth2-chall.c [deleted file]
crypto/openssh-5/auth2.c [deleted file]
crypto/openssh-5/canohost.c [deleted file]
crypto/openssh-5/canohost.h [deleted file]
crypto/openssh-5/channels.c [deleted file]
crypto/openssh-5/channels.h [deleted file]
crypto/openssh-5/cipher.c [deleted file]
crypto/openssh-5/cipher.h [deleted file]
crypto/openssh-5/clientloop.c [deleted file]
crypto/openssh-5/compat.c [deleted file]
crypto/openssh-5/compat.h [deleted file]
crypto/openssh-5/defines.h [deleted file]
crypto/openssh-5/dispatch.c [deleted file]
crypto/openssh-5/kex.c [deleted file]
crypto/openssh-5/kexgexs.c [deleted file]
crypto/openssh-5/key.c [deleted file]
crypto/openssh-5/loginrec.c [deleted file]
crypto/openssh-5/misc.c [deleted file]
crypto/openssh-5/monitor.c [deleted file]
crypto/openssh-5/monitor.h [deleted file]
crypto/openssh-5/monitor_fdpass.c [deleted file]
crypto/openssh-5/monitor_wrap.c [deleted file]
crypto/openssh-5/monitor_wrap.h [deleted file]
crypto/openssh-5/myproposal.h [deleted file]
crypto/openssh-5/nchan.c [deleted file]
crypto/openssh-5/openbsd-compat/xmmap.c [deleted file]
crypto/openssh-5/packet.c [deleted file]
crypto/openssh-5/pathnames.h [deleted file]
crypto/openssh-5/readconf.c [deleted file]
crypto/openssh-5/readconf.h [deleted file]
crypto/openssh-5/scp.c [deleted file]
crypto/openssh-5/servconf.c [deleted file]
crypto/openssh-5/servconf.h [deleted file]
crypto/openssh-5/serverloop.c [deleted file]
crypto/openssh-5/session.c [deleted file]
crypto/openssh-5/sftp-server-main.c [deleted file]
crypto/openssh-5/sftp.1 [deleted file]
crypto/openssh-5/sftp.c [deleted file]
crypto/openssh-5/ssh-keygen.1 [deleted file]
crypto/openssh-5/ssh-keygen.c [deleted file]
crypto/openssh-5/ssh-keyscan.1 [deleted file]
crypto/openssh-5/ssh-keyscan.c [deleted file]
crypto/openssh-5/ssh.1 [deleted file]
crypto/openssh-5/ssh.c [deleted file]
crypto/openssh-5/ssh2.h [deleted file]
crypto/openssh-5/ssh_config [deleted file]
crypto/openssh-5/ssh_config.5 [deleted file]
crypto/openssh-5/sshconnect.c [deleted file]
crypto/openssh-5/sshconnect2.c [deleted file]
crypto/openssh-5/sshd.8 [deleted file]
crypto/openssh-5/sshd.c [deleted file]
crypto/openssh-5/sshd_config [deleted file]
crypto/openssh-5/sshd_config.5 [deleted file]
crypto/openssh-5/sshpty.c [deleted file]
crypto/openssh-5/ttymodes.c [deleted file]
crypto/openssh-5/uidswap.c [deleted file]
crypto/openssh/CREDITS [moved from crypto/openssh-5/CREDITS with 100% similarity]
crypto/openssh/LICENCE [moved from crypto/openssh-5/LICENCE with 100% similarity]
crypto/openssh/PROTOCOL [new file with mode: 0644]
crypto/openssh/PROTOCOL.agent [moved from crypto/openssh-5/PROTOCOL.agent with 100% similarity]
crypto/openssh/README [new file with mode: 0644]
crypto/openssh/README.DELETED [new file with mode: 0644]
crypto/openssh/README.DRAGONFLY [new file with mode: 0644]
crypto/openssh/README.compromised-keys [moved from crypto/openssh-5/README.compromised-keys with 100% similarity]
crypto/openssh/README.dns [moved from crypto/openssh-5/README.dns with 100% similarity]
crypto/openssh/README.tun [moved from crypto/openssh-5/README.tun with 100% similarity]
crypto/openssh/acss.c [moved from crypto/openssh-5/acss.c with 100% similarity]
crypto/openssh/acss.h [moved from crypto/openssh-5/acss.h with 100% similarity]
crypto/openssh/addrmatch.c [new file with mode: 0644]
crypto/openssh/atomicio.c [moved from crypto/openssh-5/atomicio.c with 100% similarity]
crypto/openssh/atomicio.h [moved from crypto/openssh-5/atomicio.h with 100% similarity]
crypto/openssh/audit-bsm.c [moved from crypto/openssh-5/audit-bsm.c with 100% similarity]
crypto/openssh/audit.c [moved from crypto/openssh-5/audit.c with 100% similarity]
crypto/openssh/audit.h [moved from crypto/openssh-5/audit.h with 100% similarity]
crypto/openssh/auth-bsdauth.c [moved from crypto/openssh-5/auth-bsdauth.c with 100% similarity]
crypto/openssh/auth-chall.c [moved from crypto/openssh-5/auth-chall.c with 100% similarity]
crypto/openssh/auth-krb5.c [moved from crypto/openssh-5/auth-krb5.c with 100% similarity]
crypto/openssh/auth-options.c [new file with mode: 0644]
crypto/openssh/auth-options.h [moved from crypto/openssh-5/auth-options.h with 100% similarity]
crypto/openssh/auth-pam.c [moved from crypto/openssh-5/auth-pam.c with 100% similarity]
crypto/openssh/auth-pam.h [moved from crypto/openssh-5/auth-pam.h with 100% similarity]
crypto/openssh/auth-passwd.c [moved from crypto/openssh-5/auth-passwd.c with 100% similarity]
crypto/openssh/auth-rh-rsa.c [moved from crypto/openssh-5/auth-rh-rsa.c with 100% similarity]
crypto/openssh/auth-rhosts.c [moved from crypto/openssh-5/auth-rhosts.c with 100% similarity]
crypto/openssh/auth-rsa.c [moved from crypto/openssh-5/auth-rsa.c with 100% similarity]
crypto/openssh/auth-skey.c [moved from crypto/openssh-5/auth-skey.c with 100% similarity]
crypto/openssh/auth.c [new file with mode: 0644]
crypto/openssh/auth.h [new file with mode: 0644]
crypto/openssh/auth1.c [moved from crypto/openssh-5/auth1.c with 100% similarity]
crypto/openssh/auth2-chall.c [new file with mode: 0644]
crypto/openssh/auth2-gss.c [moved from crypto/openssh-5/auth2-gss.c with 100% similarity]
crypto/openssh/auth2-hostbased.c [moved from crypto/openssh-5/auth2-hostbased.c with 100% similarity]
crypto/openssh/auth2-kbdint.c [moved from crypto/openssh-5/auth2-kbdint.c with 100% similarity]
crypto/openssh/auth2-none.c [moved from crypto/openssh-5/auth2-none.c with 100% similarity]
crypto/openssh/auth2-passwd.c [moved from crypto/openssh-5/auth2-passwd.c with 100% similarity]
crypto/openssh/auth2-pubkey.c [moved from crypto/openssh-5/auth2-pubkey.c with 100% similarity]
crypto/openssh/auth2.c [new file with mode: 0644]
crypto/openssh/authfd.c [moved from crypto/openssh-5/authfd.c with 100% similarity]
crypto/openssh/authfd.h [moved from crypto/openssh-5/authfd.h with 100% similarity]
crypto/openssh/authfile.c [moved from crypto/openssh-5/authfile.c with 100% similarity]
crypto/openssh/authfile.h [moved from crypto/openssh-5/authfile.h with 100% similarity]
crypto/openssh/bufaux.c [moved from crypto/openssh-5/bufaux.c with 100% similarity]
crypto/openssh/bufbn.c [moved from crypto/openssh-5/bufbn.c with 100% similarity]
crypto/openssh/buffer.c [moved from crypto/openssh-5/buffer.c with 100% similarity]
crypto/openssh/buffer.h [moved from crypto/openssh-5/buffer.h with 100% similarity]
crypto/openssh/canohost.c [new file with mode: 0644]
crypto/openssh/canohost.h [new file with mode: 0644]
crypto/openssh/channels.c [new file with mode: 0644]
crypto/openssh/channels.h [new file with mode: 0644]
crypto/openssh/cipher-3des1.c [moved from crypto/openssh-5/cipher-3des1.c with 100% similarity]
crypto/openssh/cipher-acss.c [moved from crypto/openssh-5/cipher-acss.c with 100% similarity]
crypto/openssh/cipher-aes.c [moved from crypto/openssh-5/cipher-aes.c with 100% similarity]
crypto/openssh/cipher-bf1.c [moved from crypto/openssh-5/cipher-bf1.c with 100% similarity]
crypto/openssh/cipher-ctr.c [moved from crypto/openssh-5/cipher-ctr.c with 100% similarity]
crypto/openssh/cipher.c [new file with mode: 0644]
crypto/openssh/cipher.h [new file with mode: 0644]
crypto/openssh/cleanup.c [moved from crypto/openssh-5/cleanup.c with 100% similarity]
crypto/openssh/clientloop.c [new file with mode: 0644]
crypto/openssh/clientloop.h [moved from crypto/openssh-5/clientloop.h with 100% similarity]
crypto/openssh/compat.c [new file with mode: 0644]
crypto/openssh/compat.h [new file with mode: 0644]
crypto/openssh/compress.c [moved from crypto/openssh-5/compress.c with 100% similarity]
crypto/openssh/compress.h [moved from crypto/openssh-5/compress.h with 100% similarity]
crypto/openssh/crc32.c [moved from crypto/openssh-5/crc32.c with 100% similarity]
crypto/openssh/crc32.h [moved from crypto/openssh-5/crc32.h with 100% similarity]
crypto/openssh/deattack.c [moved from crypto/openssh-5/deattack.c with 100% similarity]
crypto/openssh/deattack.h [moved from crypto/openssh-5/deattack.h with 100% similarity]
crypto/openssh/defines.h [new file with mode: 0644]
crypto/openssh/dh.c [moved from crypto/openssh-5/dh.c with 100% similarity]
crypto/openssh/dh.h [moved from crypto/openssh-5/dh.h with 100% similarity]
crypto/openssh/dispatch.c [new file with mode: 0644]
crypto/openssh/dispatch.h [moved from crypto/openssh-5/dispatch.h with 100% similarity]
crypto/openssh/dns.c [moved from crypto/openssh-5/dns.c with 100% similarity]
crypto/openssh/dns.h [moved from crypto/openssh-5/dns.h with 100% similarity]
crypto/openssh/entropy.c [moved from crypto/openssh-5/entropy.c with 100% similarity]
crypto/openssh/entropy.h [moved from crypto/openssh-5/entropy.h with 100% similarity]
crypto/openssh/fatal.c [moved from crypto/openssh-5/fatal.c with 100% similarity]
crypto/openssh/groupaccess.c [moved from crypto/openssh-5/groupaccess.c with 100% similarity]
crypto/openssh/groupaccess.h [moved from crypto/openssh-5/groupaccess.h with 100% similarity]
crypto/openssh/gss-genr.c [moved from crypto/openssh-5/gss-genr.c with 100% similarity]
crypto/openssh/gss-serv-krb5.c [moved from crypto/openssh-5/gss-serv-krb5.c with 100% similarity]
crypto/openssh/gss-serv.c [moved from crypto/openssh-5/gss-serv.c with 100% similarity]
crypto/openssh/hostfile.c [moved from crypto/openssh-5/hostfile.c with 100% similarity]
crypto/openssh/hostfile.h [moved from crypto/openssh-5/hostfile.h with 100% similarity]
crypto/openssh/includes.h [moved from crypto/openssh-5/includes.h with 100% similarity]
crypto/openssh/jpake.h [new file with mode: 0644]
crypto/openssh/kex.c [new file with mode: 0644]
crypto/openssh/kex.h [moved from crypto/openssh-5/kex.h with 100% similarity]
crypto/openssh/kexdh.c [moved from crypto/openssh-5/kexdh.c with 100% similarity]
crypto/openssh/kexdhc.c [moved from crypto/openssh-5/kexdhc.c with 100% similarity]
crypto/openssh/kexdhs.c [moved from crypto/openssh-5/kexdhs.c with 100% similarity]
crypto/openssh/kexgex.c [moved from crypto/openssh-5/kexgex.c with 100% similarity]
crypto/openssh/kexgexc.c [moved from crypto/openssh-5/kexgexc.c with 100% similarity]
crypto/openssh/kexgexs.c [new file with mode: 0644]
crypto/openssh/key.c [new file with mode: 0644]
crypto/openssh/key.h [moved from crypto/openssh-5/key.h with 100% similarity]
crypto/openssh/log.c [moved from crypto/openssh-5/log.c with 100% similarity]
crypto/openssh/log.h [moved from crypto/openssh-5/log.h with 100% similarity]
crypto/openssh/loginrec.c [new file with mode: 0644]
crypto/openssh/loginrec.h [moved from crypto/openssh-5/loginrec.h with 100% similarity]
crypto/openssh/mac.c [moved from crypto/openssh-5/mac.c with 100% similarity]
crypto/openssh/mac.h [moved from crypto/openssh-5/mac.h with 100% similarity]
crypto/openssh/match.c [moved from crypto/openssh-5/match.c with 100% similarity]
crypto/openssh/match.h [moved from crypto/openssh-5/match.h with 100% similarity]
crypto/openssh/md5crypt.c [moved from crypto/openssh-5/md5crypt.c with 100% similarity]
crypto/openssh/md5crypt.h [moved from crypto/openssh-5/md5crypt.h with 100% similarity]
crypto/openssh/misc.c [new file with mode: 0644]
crypto/openssh/misc.h [moved from crypto/openssh-5/misc.h with 100% similarity]
crypto/openssh/moduli [moved from crypto/openssh-5/moduli with 100% similarity]
crypto/openssh/moduli.5 [moved from crypto/openssh-5/moduli.5 with 100% similarity]
crypto/openssh/moduli.c [moved from crypto/openssh-5/moduli.c with 100% similarity]
crypto/openssh/monitor.c [new file with mode: 0644]
crypto/openssh/monitor.h [new file with mode: 0644]
crypto/openssh/monitor_fdpass.c [new file with mode: 0644]
crypto/openssh/monitor_fdpass.h [moved from crypto/openssh-5/monitor_fdpass.h with 100% similarity]
crypto/openssh/monitor_mm.c [moved from crypto/openssh-5/monitor_mm.c with 100% similarity]
crypto/openssh/monitor_mm.h [moved from crypto/openssh-5/monitor_mm.h with 100% similarity]
crypto/openssh/monitor_wrap.c [new file with mode: 0644]
crypto/openssh/monitor_wrap.h [new file with mode: 0644]
crypto/openssh/msg.c [moved from crypto/openssh-5/msg.c with 100% similarity]
crypto/openssh/msg.h [moved from crypto/openssh-5/msg.h with 100% similarity]
crypto/openssh/mux.c [moved from crypto/openssh-5/mux.c with 100% similarity]
crypto/openssh/myproposal.h [new file with mode: 0644]
crypto/openssh/nchan.c [new file with mode: 0644]
crypto/openssh/openbsd-compat/base64.h [moved from crypto/openssh-5/openbsd-compat/base64.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-arc4random.c [moved from crypto/openssh-5/openbsd-compat/bsd-arc4random.c with 100% similarity]
crypto/openssh/openbsd-compat/bsd-cray.h [moved from crypto/openssh-5/openbsd-compat/bsd-cray.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-cygwin_util.h [moved from crypto/openssh-5/openbsd-compat/bsd-cygwin_util.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-misc.c [moved from crypto/openssh-5/openbsd-compat/bsd-misc.c with 100% similarity]
crypto/openssh/openbsd-compat/bsd-misc.h [moved from crypto/openssh-5/openbsd-compat/bsd-misc.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-nextstep.h [moved from crypto/openssh-5/openbsd-compat/bsd-nextstep.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-poll.h [moved from crypto/openssh-5/openbsd-compat/bsd-poll.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-statvfs.h [moved from crypto/openssh-5/openbsd-compat/bsd-statvfs.h with 100% similarity]
crypto/openssh/openbsd-compat/bsd-waitpid.h [moved from crypto/openssh-5/openbsd-compat/bsd-waitpid.h with 100% similarity]
crypto/openssh/openbsd-compat/fake-rfc2553.h [moved from crypto/openssh-5/openbsd-compat/fake-rfc2553.h with 100% similarity]
crypto/openssh/openbsd-compat/fmt_scaled.c [moved from crypto/openssh-5/openbsd-compat/fmt_scaled.c with 100% similarity]
crypto/openssh/openbsd-compat/getrrsetbyname.c [moved from crypto/openssh-5/openbsd-compat/getrrsetbyname.c with 100% similarity]
crypto/openssh/openbsd-compat/getrrsetbyname.h [moved from crypto/openssh-5/openbsd-compat/getrrsetbyname.h with 100% similarity]
crypto/openssh/openbsd-compat/glob.h [moved from crypto/openssh-5/openbsd-compat/glob.h with 100% similarity]
crypto/openssh/openbsd-compat/openbsd-compat.h [moved from crypto/openssh-5/openbsd-compat/openbsd-compat.h with 100% similarity]
crypto/openssh/openbsd-compat/openssl-compat.h [moved from crypto/openssh-5/openbsd-compat/openssl-compat.h with 100% similarity]
crypto/openssh/openbsd-compat/port-aix.h [moved from crypto/openssh-5/openbsd-compat/port-aix.h with 100% similarity]
crypto/openssh/openbsd-compat/port-irix.h [moved from crypto/openssh-5/openbsd-compat/port-irix.h with 100% similarity]
crypto/openssh/openbsd-compat/port-linux.h [moved from crypto/openssh-5/openbsd-compat/port-linux.h with 100% similarity]
crypto/openssh/openbsd-compat/port-solaris.h [moved from crypto/openssh-5/openbsd-compat/port-solaris.h with 100% similarity]
crypto/openssh/openbsd-compat/port-tun.c [moved from crypto/openssh-5/openbsd-compat/port-tun.c with 100% similarity]
crypto/openssh/openbsd-compat/port-tun.h [moved from crypto/openssh-5/openbsd-compat/port-tun.h with 100% similarity]
crypto/openssh/openbsd-compat/port-uw.h [moved from crypto/openssh-5/openbsd-compat/port-uw.h with 100% similarity]
crypto/openssh/openbsd-compat/readpassphrase.h [moved from crypto/openssh-5/openbsd-compat/readpassphrase.h with 100% similarity]
crypto/openssh/openbsd-compat/sha2.h [moved from crypto/openssh-5/openbsd-compat/sha2.h with 100% similarity]
crypto/openssh/openbsd-compat/sigact.h [moved from crypto/openssh-5/openbsd-compat/sigact.h with 100% similarity]
crypto/openssh/openbsd-compat/sys-queue.h [moved from crypto/openssh-5/openbsd-compat/sys-queue.h with 100% similarity]
crypto/openssh/openbsd-compat/sys-tree.h [moved from crypto/openssh-5/openbsd-compat/sys-tree.h with 100% similarity]
crypto/openssh/openbsd-compat/xmmap.c [new file with mode: 0644]
crypto/openssh/packet.c [new file with mode: 0644]
crypto/openssh/packet.h [moved from crypto/openssh-5/packet.h with 100% similarity]
crypto/openssh/pathnames.h [new file with mode: 0644]
crypto/openssh/platform.c [moved from crypto/openssh-5/platform.c with 100% similarity]
crypto/openssh/platform.h [moved from crypto/openssh-5/platform.h with 100% similarity]
crypto/openssh/progressmeter.c [moved from crypto/openssh-5/progressmeter.c with 100% similarity]
crypto/openssh/progressmeter.h [moved from crypto/openssh-5/progressmeter.h with 100% similarity]
crypto/openssh/readconf.c [new file with mode: 0644]
crypto/openssh/readconf.h [new file with mode: 0644]
crypto/openssh/readpass.c [moved from crypto/openssh-5/readpass.c with 100% similarity]
crypto/openssh/rijndael.c [moved from crypto/openssh-5/rijndael.c with 100% similarity]
crypto/openssh/rijndael.h [moved from crypto/openssh-5/rijndael.h with 100% similarity]
crypto/openssh/rsa.c [moved from crypto/openssh-5/rsa.c with 100% similarity]
crypto/openssh/rsa.h [moved from crypto/openssh-5/rsa.h with 100% similarity]
crypto/openssh/scard-opensc.c [moved from crypto/openssh-5/scard-opensc.c with 100% similarity]
crypto/openssh/scard.c [moved from crypto/openssh-5/scard.c with 100% similarity]
crypto/openssh/scp.1 [moved from crypto/openssh-5/scp.1 with 100% similarity]
crypto/openssh/scp.c [new file with mode: 0644]
crypto/openssh/servconf.c [new file with mode: 0644]
crypto/openssh/servconf.h [new file with mode: 0644]
crypto/openssh/serverloop.c [new file with mode: 0644]
crypto/openssh/serverloop.h [moved from crypto/openssh-5/serverloop.h with 100% similarity]
crypto/openssh/session.c [new file with mode: 0644]
crypto/openssh/session.h [moved from crypto/openssh-5/session.h with 100% similarity]
crypto/openssh/sftp-client.c [moved from crypto/openssh-5/sftp-client.c with 100% similarity]
crypto/openssh/sftp-client.h [moved from crypto/openssh-5/sftp-client.h with 100% similarity]
crypto/openssh/sftp-common.c [moved from crypto/openssh-5/sftp-common.c with 100% similarity]
crypto/openssh/sftp-common.h [moved from crypto/openssh-5/sftp-common.h with 100% similarity]
crypto/openssh/sftp-glob.c [moved from crypto/openssh-5/sftp-glob.c with 100% similarity]
crypto/openssh/sftp-server-main.c [new file with mode: 0644]
crypto/openssh/sftp-server.8 [moved from crypto/openssh-5/sftp-server.8 with 100% similarity]
crypto/openssh/sftp-server.c [moved from crypto/openssh-5/sftp-server.c with 100% similarity]
crypto/openssh/sftp.1 [new file with mode: 0644]
crypto/openssh/sftp.c [new file with mode: 0644]
crypto/openssh/sftp.h [moved from crypto/openssh-5/sftp.h with 100% similarity]
crypto/openssh/ssh-add.1 [moved from crypto/openssh-5/ssh-add.1 with 100% similarity]
crypto/openssh/ssh-add.c [moved from crypto/openssh-5/ssh-add.c with 100% similarity]
crypto/openssh/ssh-agent.1 [moved from crypto/openssh-5/ssh-agent.1 with 100% similarity]
crypto/openssh/ssh-agent.c [moved from crypto/openssh-5/ssh-agent.c with 100% similarity]
crypto/openssh/ssh-dss.c [moved from crypto/openssh-5/ssh-dss.c with 100% similarity]
crypto/openssh/ssh-gss.h [moved from crypto/openssh-5/ssh-gss.h with 100% similarity]
crypto/openssh/ssh-keygen.1 [new file with mode: 0644]
crypto/openssh/ssh-keygen.c [new file with mode: 0644]
crypto/openssh/ssh-keyscan.1 [new file with mode: 0644]
crypto/openssh/ssh-keyscan.c [new file with mode: 0644]
crypto/openssh/ssh-keysign.8 [moved from crypto/openssh-5/ssh-keysign.8 with 100% similarity]
crypto/openssh/ssh-keysign.c [moved from crypto/openssh-5/ssh-keysign.c with 100% similarity]
crypto/openssh/ssh-rsa.c [moved from crypto/openssh-5/ssh-rsa.c with 100% similarity]
crypto/openssh/ssh-vulnkey.1 [moved from crypto/openssh-5/ssh-vulnkey.1 with 100% similarity]
crypto/openssh/ssh-vulnkey.c [moved from crypto/openssh-5/ssh-vulnkey.c with 100% similarity]
crypto/openssh/ssh.1 [new file with mode: 0644]
crypto/openssh/ssh.c [new file with mode: 0644]
crypto/openssh/ssh.h [moved from crypto/openssh-5/ssh.h with 100% similarity]
crypto/openssh/ssh1.h [moved from crypto/openssh-5/ssh1.h with 100% similarity]
crypto/openssh/ssh2.h [new file with mode: 0644]
crypto/openssh/ssh_config [new file with mode: 0644]
crypto/openssh/ssh_config.5 [new file with mode: 0644]
crypto/openssh/ssh_namespace.h [moved from crypto/openssh-5/ssh_namespace.h with 100% similarity]
crypto/openssh/sshconnect.c [new file with mode: 0644]
crypto/openssh/sshconnect.h [moved from crypto/openssh-5/sshconnect.h with 100% similarity]
crypto/openssh/sshconnect1.c [moved from crypto/openssh-5/sshconnect1.c with 100% similarity]
crypto/openssh/sshconnect2.c [new file with mode: 0644]
crypto/openssh/sshd.8 [new file with mode: 0644]
crypto/openssh/sshd.c [new file with mode: 0644]
crypto/openssh/sshd_config [new file with mode: 0644]
crypto/openssh/sshd_config.5 [new file with mode: 0644]
crypto/openssh/sshlogin.c [moved from crypto/openssh-5/sshlogin.c with 100% similarity]
crypto/openssh/sshlogin.h [moved from crypto/openssh-5/sshlogin.h with 100% similarity]
crypto/openssh/sshpty.c [new file with mode: 0644]
crypto/openssh/sshpty.h [moved from crypto/openssh-5/sshpty.h with 100% similarity]
crypto/openssh/sshtty.c [moved from crypto/openssh-5/sshtty.c with 100% similarity]
crypto/openssh/ttymodes.c [new file with mode: 0644]
crypto/openssh/ttymodes.h [moved from crypto/openssh-5/ttymodes.h with 100% similarity]
crypto/openssh/uidswap.c [new file with mode: 0644]
crypto/openssh/uidswap.h [moved from crypto/openssh-5/uidswap.h with 100% similarity]
crypto/openssh/umac.c [moved from crypto/openssh-5/umac.c with 100% similarity]
crypto/openssh/umac.h [moved from crypto/openssh-5/umac.h with 100% similarity]
crypto/openssh/uuencode.c [moved from crypto/openssh-5/uuencode.c with 100% similarity]
crypto/openssh/uuencode.h [moved from crypto/openssh-5/uuencode.h with 100% similarity]
crypto/openssh/xmalloc.c [moved from crypto/openssh-5/xmalloc.c with 100% similarity]
crypto/openssh/xmalloc.h [moved from crypto/openssh-5/xmalloc.h with 100% similarity]
etc/defaults/make.conf
gnu/usr.bin/Makefile
gnu/usr.bin/cpio/Makefile [deleted file]
gnu/usr.bin/cpio/doc/Makefile [deleted file]
gnu/usr.bin/diff/Makefile
gnu/usr.bin/diff/diff.c.patch [deleted file]
gnu/usr.bin/diff/diff.h.patch [deleted file]
lib/i18n_module/Makefile.inc
lib/libarchive/Makefile
lib/libatm/Makefile
lib/libbind/Makefile
lib/libbind9/Makefile
lib/libbz2/Makefile
lib/libc/amd64/DEFS.h [deleted file]
lib/libc/amd64/SYS.h
lib/libc/amd64/_fpmath.h
lib/libc/amd64/gen/_setjmp.S
lib/libc/amd64/gen/fabs.S
lib/libc/amd64/gen/ldexp.c
lib/libc/amd64/gen/modf.S
lib/libc/amd64/gen/rfork_thread.S
lib/libc/amd64/gen/setjmp.S
lib/libc/amd64/gen/sigsetjmp.S
lib/libc/amd64/stdlib/Makefile.inc [new file with mode: 0644]
lib/libc/amd64/stdlib/div.S [new file with mode: 0644]
lib/libc/amd64/stdlib/ldiv.S [new file with mode: 0644]
lib/libc/amd64/stdlib/lldiv.S [new file with mode: 0644]
lib/libc/amd64/string/Makefile.inc [new file with mode: 0644]
lib/libc/amd64/string/bcmp.S [new file with mode: 0644]
lib/libc/amd64/string/bcopy.S [new file with mode: 0644]
lib/libc/amd64/string/bzero.S [new file with mode: 0644]
lib/libc/amd64/string/memcmp.S [new file with mode: 0644]
lib/libc/amd64/string/memcpy.S [new file with mode: 0644]
lib/libc/amd64/string/memmove.S [new file with mode: 0644]
lib/libc/amd64/string/memset.S [new file with mode: 0644]
lib/libc/amd64/string/strcat.S [new file with mode: 0644]
lib/libc/amd64/string/strcmp.S [new file with mode: 0644]
lib/libc/amd64/string/strcpy.S [new file with mode: 0644]
lib/libc/amd64/sys/brk.S
lib/libc/amd64/sys/exect.S
lib/libc/amd64/sys/pipe.S
lib/libc/amd64/sys/ptrace.S
lib/libc/amd64/sys/reboot.S
lib/libc/amd64/sys/sbrk.S
lib/libc/amd64/sys/setlogin.S
lib/libc/amd64/sys/sigreturn.S
lib/libc/amd64/sys/vfork.S
lib/libc/gen/posix_spawn.3
lib/libc/i386/SYS.h
lib/libc/stdtime/localtime.c
lib/libc/sys/Makefile.inc
lib/libc_r/arch/amd64/_atomic_lock.S
lib/libcam/Makefile
lib/libcom_err/Makefile
lib/libdevinfo/Makefile
lib/libedit/Makefile
lib/libipsec/Makefile
lib/libipx/Makefile
lib/libmagic/Makefile
lib/libmagic/config.h
lib/libmd/Makefile
lib/libmd/i386/sha.S
lib/libpcap/Makefile
lib/libposix1e/Makefile
lib/libsbuf/Makefile
lib/libsdp/Makefile
lib/libsmdb/Makefile
lib/libsmutil/Makefile
lib/libstand/i386/_setjmp.S
lib/libtelnet/Makefile
lib/libutil/Makefile
lib/libxpg4/Makefile
lib/liby/Makefile
lib/pam_module/pam_ssh/Makefile
libexec/rpc.rquotad/rquotad.c
nrelease/Makefile
nrelease/gui/boot/beastie.4th
sbin/disklabel/disklabel.c
sbin/hammer/cache.c
sbin/hammer/cmd_cleanup.c
sbin/hammer/cmd_mirror.c
sbin/hammer/cmd_show.c
sbin/hammer/hammer.8
sbin/hammer/hammer.c
sbin/hammer/hammer.h
sbin/hammer/hammer_util.h
sbin/hammer/ondisk.c
sbin/i386/fdisk/fdisk.c
sbin/mount/mntopts.h
sbin/mount/mount.8
sbin/mount/mount.c
sbin/mount/mount_ufs.c
secure/Makefile.ssh.common
secure/lib/libcrypto/Makefile.inc
secure/lib/libcrypto/opensslconf-amd64.h
secure/lib/libcrypto/opensslconf-i386.h
secure/lib/libssh/config.h
secure/lib/libssh/version.h
share/man/man4/Makefile
share/man/man4/ahci.4 [new file with mode: 0644]
share/man/man4/drm.4 [new file with mode: 0644]
share/man/man4/nata.4
share/man/man4/sili.4 [new file with mode: 0644]
share/man/man5/make.conf.5
share/man/man8/rc.sendmail.8
share/zoneinfo/africa
share/zoneinfo/asia
share/zoneinfo/northamerica
sys/boot/forth/beastie.4th
sys/boot/pc32/Makefile
sys/bus/cam/cam_ccb.h
sys/bus/cam/cam_xpt.c
sys/bus/cam/cam_xpt.h
sys/bus/cam/scsi/scsi_cd.c
sys/bus/cam/scsi/scsi_da.c
sys/bus/cam/scsi/scsi_pass.c
sys/bus/pci/pcidevs
sys/bus/pci/pcidevs.h
sys/bus/pci/pcidevs_data.h
sys/bus/usb/ehci.c
sys/bus/usb/ehci_pci.c
sys/bus/usb/ohci.c
sys/bus/usb/ohci_pci.c
sys/bus/usb/uhci.c
sys/bus/usb/uhci_pci.c
sys/bus/usb/usbdi.c
sys/bus/usb/usbdi.h
sys/conf/files
sys/config/GENERIC
sys/config/LINT
sys/cpu/amd64/include/asm.h
sys/cpu/amd64/include/asmacros.h
sys/cpu/amd64/include/bus_dma.h
sys/cpu/i386/include/asm.h
sys/cpu/i386/include/asmacros.h
sys/cpu/i386/include/bus_at386.h
sys/ddb/db_input.c
sys/dev/acpica5/acpi_cpu_pstate.c
sys/dev/disk/Makefile
sys/dev/disk/ahci/Makefile
sys/dev/disk/ahci/TODO
sys/dev/disk/ahci/ahci.c
sys/dev/disk/ahci/ahci.h
sys/dev/disk/ahci/ahci_attach.c
sys/dev/disk/ahci/ahci_cam.c
sys/dev/disk/ahci/ahci_dragonfly.c
sys/dev/disk/ahci/ahci_dragonfly.h
sys/dev/disk/ahci/ahci_pm.c [new file with mode: 0644]
sys/dev/disk/ahci/atascsi.h
sys/dev/disk/ahci/pmreg.h [new file with mode: 0644]
sys/dev/disk/ccd/ccd.c
sys/dev/disk/sili/Makefile [new file with mode: 0644]
sys/dev/disk/sili/atascsi.h [new file with mode: 0644]
sys/dev/disk/sili/pmreg.h [new file with mode: 0644]
sys/dev/disk/sili/sili.c [new file with mode: 0644]
sys/dev/disk/sili/sili.h [new file with mode: 0644]
sys/dev/disk/sili/sili_attach.c [new file with mode: 0644]
sys/dev/disk/sili/sili_cam.c [new file with mode: 0644]
sys/dev/disk/sili/sili_dragonfly.c [new file with mode: 0644]
sys/dev/disk/sili/sili_dragonfly.h [new file with mode: 0644]
sys/dev/disk/sili/sili_pm.c [new file with mode: 0644]
sys/dev/drm/drm_bufs.c
sys/dev/drm/drm_context.c
sys/dev/drm/drm_drv.c
sys/dev/drm/drm_pciids.h
sys/dev/drm/i915_dma.c
sys/dev/drm/i915_drv.h
sys/dev/drm/i915_irq.c
sys/dev/drm/r300_cmdbuf.c
sys/dev/drm/r300_reg.h
sys/dev/drm/r600_cp.c
sys/dev/drm/radeon_cp.c
sys/dev/drm/radeon_drv.h
sys/dev/netif/nfe/if_nfe.c
sys/dev/sound/pci/hda/hda_reg.h
sys/dev/usbmisc/ukbd/ukbd.c
sys/dev/usbmisc/umass/umass.c
sys/kern/imgact_resident.c
sys/kern/init_sysent.c
sys/kern/kern_conf.c
sys/kern/kern_device.c
sys/kern/kern_exit.c
sys/kern/kern_jail.c
sys/kern/kern_linker.c
sys/kern/kern_lockf.c
sys/kern/kern_ntptime.c
sys/kern/kern_plimit.c
sys/kern/kern_prot.c
sys/kern/kern_resource.c
sys/kern/kern_shutdown.c
sys/kern/kern_sysctl.c
sys/kern/kern_time.c
sys/kern/kern_usched.c
sys/kern/kern_varsym.c
sys/kern/lwkt_thread.c
sys/kern/subr_disk.c
sys/kern/subr_diskmbr.c
sys/kern/syscalls.c
sys/kern/syscalls.master
sys/kern/tty_pty.c
sys/kern/vfs_helper.c
sys/net/route.c
sys/net/rtsock.c
sys/netinet/ip_icmp.c
sys/platform/pc32/acpica5/acpi_pstate_machdep.c
sys/platform/pc32/apic/apicreg.h
sys/platform/pc32/apic/mpapic.h
sys/platform/pc32/conf/files
sys/platform/pc32/i386/cpufreq_machdep.c [new file with mode: 0644]
sys/platform/pc32/i386/machdep.c
sys/platform/pc32/i386/mp_machdep.c
sys/platform/pc32/i386/mp_madt.c [new file with mode: 0644]
sys/platform/pc32/i386/pmap.c
sys/platform/pc32/i386/trap.c
sys/platform/pc32/include/cpufreq.h [new file with mode: 0644]
sys/platform/pc32/include/pmap.h
sys/platform/pc32/include/smp.h
sys/platform/pc64/amd64/trap.c
sys/platform/vkernel/i386/trap.c
sys/sys/conf.h
sys/sys/device.h
sys/sys/priv.h
sys/sys/resourcevar.h
sys/sys/thread.h
sys/sys/thread2.h
sys/sys/varsym.h
sys/vfs/hammer/hammer.h
sys/vfs/hammer/hammer_blockmap.c
sys/vfs/hammer/hammer_btree.c
sys/vfs/hammer/hammer_cursor.c
sys/vfs/hammer/hammer_disk.h
sys/vfs/hammer/hammer_inode.c
sys/vfs/hammer/hammer_mirror.c
sys/vfs/hammer/hammer_object.c
sys/vfs/hammer/hammer_ondisk.c
sys/vfs/hammer/hammer_reblock.c
sys/vfs/hammer/hammer_signal.c
sys/vfs/hammer/hammer_transaction.c
sys/vfs/hammer/hammer_vfsops.c
sys/vfs/hammer/hammer_vnops.c
sys/vfs/specfs/spec_vnops.c
sys/vfs/ufs/ufs_vnops.c
test/test/README
usr.bin/cpio/Makefile
usr.bin/file/Makefile
usr.bin/less/Makefile.common
usr.bin/pkg_radd/pkg_radd.sh
usr.bin/pkg_search/pkg_search.sh
usr.bin/sed/TEST/hanoi.sed [deleted file]
usr.bin/sed/TEST/math.sed [deleted file]
usr.bin/sed/TEST/sed.test [deleted file]
usr.bin/sed/compile.c
usr.bin/sed/defs.h
usr.bin/sed/misc.c
usr.bin/sed/process.c
usr.bin/sed/sed.1
usr.bin/systat/vmmeter.c
usr.bin/systat/vmstat.c
usr.bin/tar/Makefile
usr.sbin/boot0cfg/boot0cfg.8
usr.sbin/bthcid/parser.y
usr.sbin/iostat/iostat.c
usr.sbin/pnpinfo/Makefile

index 74af46a..95a3871 100644 (file)
@@ -1114,3 +1114,9 @@ TO_REMOVE+=/usr/share/man/cat9/namei.9.gz
 TO_REMOVE+=/usr/share/man/man9/namei.9.gz
 TO_REMOVE+=/usr/share/man/cat5/host.conf.5.gz
 TO_REMOVE+=/usr/share/man/man5/host.conf.5.gz
+TO_REMOVE+=/usr/share/misc/magic.mime
+TO_REMOVE+=/usr/share/misc/magic.mime.mgc
+TO_REMOVE+=/usr/bin/gcpio
+TO_REMOVE+=/usr/share/man/cat1/gcpio.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcpio.1.gz
+TO_REMOVE+=/usr/share/info/cpio.info.gz
index 99e02db..2f5a5d9 100644 (file)
@@ -1114,7 +1114,10 @@ relink:
        int fd1;
        int fd2;
 
-       path = mprintf("%s.tmp%d", dpath, (int)getpid());
+       if (st2Valid)
+               path = mprintf("%s.tmp%d", dpath, (int)getpid());
+       else
+               path = mprintf("%s", dpath);
 
        /*
         * Handle check failure message.
@@ -1198,7 +1201,7 @@ relink:
 #else
                    hc_utimes(&DstHost, path, tv);
 #endif
-                   if (xrename(path, dpath, st2_flags) != 0) {
+                   if (st2Valid && xrename(path, dpath, st2_flags) != 0) {
                        logerr("%-32s rename-after-copy failed: %s\n",
                            (dpath ? dpath : spath), strerror(errno)
                        );
@@ -1257,13 +1260,18 @@ skip_copy:
     } else if (S_ISLNK(st1.st_mode)) {
        char *link1 = malloc(GETLINKSIZE);
        char *link2 = malloc(GETLINKSIZE);
-       char *path = malloc(GETPATHSIZE);
+       char *path;
        int n1;
        int n2;
 
-       snprintf(path, GETPATHSIZE, "%s.tmp%d", dpath, (int)getpid());
        n1 = hc_readlink(&SrcHost, spath, link1, GETLINKSIZE - 1);
-       n2 = hc_readlink(&DstHost, dpath, link2, GETLINKSIZE - 1);
+       if (st2Valid) {
+               path = mprintf("%s.tmp%d", dpath, (int)getpid());
+               n2 = hc_readlink(&DstHost, dpath, link2, GETLINKSIZE - 1);
+       } else {
+               path = mprintf("%s", dpath);
+               n2 = -1;
+       }
        if (n1 >= 0) {
            if (ForceOpt || n1 != n2 || bcmp(link1, link2, n1) != 0) {
                hc_umask(&DstHost, ~st1.st_mode);
@@ -1281,7 +1289,7 @@ skip_copy:
                     * there is no lchmod() or lchflags(), we 
                     * cannot chmod or chflags a softlink.
                     */
-                   if (xrename(path, dpath, st2_flags) != 0) {
+                   if (st2Valid && xrename(path, dpath, st2_flags) != 0) {
                        logerr("%-32s rename softlink (%s->%s) failed: %s\n",
                            (dpath ? dpath : spath),
                            path, dpath, strerror(errno));
@@ -1309,7 +1317,7 @@ skip_copy:
        free(link2);
        free(path);
     } else if ((S_ISCHR(st1.st_mode) || S_ISBLK(st1.st_mode)) && DeviceOpt) {
-       char *path = malloc(GETPATHSIZE);
+       char *path = NULL;
 
        if (ForceOpt ||
            st2Valid == 0 || 
@@ -1318,14 +1326,19 @@ skip_copy:
            st1.st_uid != st2.st_uid ||
            st1.st_gid != st2.st_gid
        ) {
-           snprintf(path, GETPATHSIZE, "%s.tmp%d", dpath, (int)getpid());
+           if (st2Valid) {
+               path = mprintf("%s.tmp%d", dpath, (int)getpid());
+               xremove(&DstHost, path);
+           } else {
+               path = mprintf("%s", dpath);
+           }
 
-           xremove(&DstHost, path);
            if (hc_mknod(&DstHost, path, st1.st_mode, st1.st_rdev) == 0) {
                hc_chmod(&DstHost, path, st1.st_mode);
                hc_chown(&DstHost, path, st1.st_uid, st1.st_gid);
-               xremove(&DstHost, dpath);
-               if (xrename(path, dpath, st2_flags) != 0) {
+               if (st2Valid)
+                       xremove(&DstHost, dpath);
+               if (st2Valid && xrename(path, dpath, st2_flags) != 0) {
                    logerr("%-32s dev-rename-after-create failed: %s\n",
                        (dpath ? dpath : spath),
                        strerror(errno)
@@ -1344,7 +1357,8 @@ skip_copy:
            if (VerboseOpt >= 3)
                logstd("%-32s nochange\n", (dpath ? dpath : spath));
        }
-       free(path);
+       if (path)
+               free(path);
        CountSourceItems++;
     }
 done:
index 47f9847..280d7d8 100644 (file)
@@ -33,7 +33,7 @@
 .\" $FreeBSD: src/bin/df/df.1,v 1.18.2.9 2003/05/07 23:56:14 trhodes Exp $
 .\" $DragonFly: src/bin/df/df.1,v 1.3 2006/02/17 19:33:30 swildner Exp $
 .\"
-.Dd May 8, 1995
+.Dd June 10, 2009
 .Dt DF 1
 .Os
 .Sh NAME
@@ -67,8 +67,9 @@ option below).
 The following options are available:
 .Bl -tag -width Ds
 .It Fl a
-Show all mount points, including those that were mounted with the MNT_IGNORE
-flag.
+Show all mount points, including those that were mounted with the
+.Cm ignore
+option.
 .It Fl b
 Use 512-byte blocks rather than the default.  Note that
 this overrides the
index 5759aa3..af87caa 100644 (file)
@@ -832,6 +832,8 @@ evalcommand(union node *cmd, int flgs, struct backcmd *backcmd)
                commandname = argv[0];
                argptr = argv + 1;
                optptr = NULL;                  /* initialize nextopt */
+               optind = 1;                     /* and getopt */
+               optreset = 1;
                exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
                flushall();
 cmddone:
diff --git a/contrib/cpio/COPYING b/contrib/cpio/COPYING
deleted file mode 100644 (file)
index a43ea21..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-\f
-                   GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-\f
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-\f
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-\f
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                           NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-\f
-       Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/contrib/cpio/COPYING.LIB b/contrib/cpio/COPYING.LIB
deleted file mode 100644 (file)
index bbe3fe1..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-                 GNU LIBRARY GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-\f
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-\f
-                 GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-\f
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-\f
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-\f
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-\f
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-\f
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-\f
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                           NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-\f