git: Revert "Import file-5.22."

[Sascha Wildner]

commit 62e32461beaaf0150d067c24edae7b34ac0bf4c9
Author: Sascha Wildner <saw at online.de>
Date:   Sat Sep 23 21:22:44 2017 +0200

    Revert "Import file-5.22."
    
    This reverts commit 89a9c80e537ed7238142c9af2cdc03401742a18a.
    
    For some reason the 5.22 upgrade was not git-merged, looks like
    copied instead. Caused merge conflicts with 5.32.

Summary of changes:
 contrib/file/ChangeLog                             | 155 +-----
 contrib/file/README                                |  32 +-
 contrib/file/doc/file.man                          |  15 +-
 contrib/file/doc/libmagic.man                      |  67 +--
 contrib/file/doc/magic.man                         |  34 +-
 contrib/file/magic/Magdir/android                  | 141 ++---
 contrib/file/magic/Magdir/animation                | 168 +-----
 contrib/file/magic/Magdir/apple                    |  10 +-
 contrib/file/magic/Magdir/archive                  |  45 +-
 contrib/file/magic/Magdir/att3b                    |  10 +-
 contrib/file/magic/Magdir/audio                    |   6 +-
 contrib/file/magic/Magdir/bflt                     |   4 +-
 contrib/file/magic/Magdir/blender                  |   4 +-
 contrib/file/magic/Magdir/bsdi                     |   8 +-
 contrib/file/magic/Magdir/c-lang                   |   4 +-
 contrib/file/magic/Magdir/cafebabe                 |   6 +-
 contrib/file/magic/Magdir/clarion                  |   4 +-
 contrib/file/magic/Magdir/claris                   |   4 +-
 contrib/file/magic/Magdir/clipper                  |   6 +-
 contrib/file/magic/Magdir/commands                 |   4 +-
 contrib/file/magic/Magdir/compress                 |  23 +-
 contrib/file/magic/Magdir/cups                     |   8 +-
 contrib/file/magic/Magdir/database                 | 189 +++----
 contrib/file/magic/Magdir/dump                     |  10 +-
 contrib/file/magic/Magdir/dyadic                   |  90 ++--
 contrib/file/magic/Magdir/efi                      |   4 +-
 contrib/file/magic/Magdir/elf                      |  17 +-
 contrib/file/magic/Magdir/encore                   |   6 +-
 contrib/file/magic/Magdir/filesystems              | 338 ++++++------
 contrib/file/magic/Magdir/flash                    |  26 +-
 contrib/file/magic/Magdir/fonts                    |   6 +-
 contrib/file/magic/Magdir/fortran                  |   4 +-
 contrib/file/magic/Magdir/games                    |  20 +-
 contrib/file/magic/Magdir/gimp                     |   6 +-
 contrib/file/magic/Magdir/gnome                    |   6 +-
 contrib/file/magic/Magdir/gpt                      |   3 +-
 contrib/file/magic/Magdir/graphviz                 |   6 +-
 contrib/file/magic/Magdir/hp                       |  30 +-
 contrib/file/magic/Magdir/ibm370                   |  10 +-
 contrib/file/magic/Magdir/images                   | 251 +--------
 contrib/file/magic/Magdir/intel                    |  12 +-
 contrib/file/magic/Magdir/isz                      |   2 +-
 contrib/file/magic/Magdir/jpeg                     | 187 ++++---
 contrib/file/magic/Magdir/karma                    |   4 +-
 contrib/file/magic/Magdir/kerberos                 |  45 --
 contrib/file/magic/Magdir/linux                    |  38 +-
 contrib/file/magic/Magdir/mach                     | 106 ++--
 contrib/file/magic/Magdir/macintosh                |  86 +--
 contrib/file/magic/Magdir/map                      |  25 -
 contrib/file/magic/Magdir/marc21                   |  12 +-
 contrib/file/magic/Magdir/mips                     |  46 +-
 contrib/file/magic/Magdir/motorola                 |  30 +-
 contrib/file/magic/Magdir/msdos                    | 130 ++++-
 contrib/file/magic/Magdir/msooxml                  |   4 +-
 contrib/file/magic/Magdir/msx                      |   2 +-
 contrib/file/magic/Magdir/natinst                  |   4 +-
 contrib/file/magic/Magdir/ncr                      |  16 +-
 contrib/file/magic/Magdir/netbsd                   |  46 +-
 contrib/file/magic/Magdir/nitpicker                |   2 +-
 contrib/file/magic/Magdir/oasis                    |   4 +-
 contrib/file/magic/Magdir/palm                     |  10 +-
 contrib/file/magic/Magdir/pascal                   |  10 +-
 contrib/file/magic/Magdir/pdp                      |   8 +-
 contrib/file/magic/Magdir/perl                     |  33 +-
 contrib/file/magic/Magdir/pgp                      | 444 +--------------
 contrib/file/magic/Magdir/printer                  |  22 +-
 contrib/file/magic/Magdir/python                   |   5 +-
 contrib/file/magic/Magdir/qt                       |  19 -
 contrib/file/magic/Magdir/riff                     |  29 +-
 .../file/magic/Magdir/{meteorological => rinex}    |   7 +-
 contrib/file/magic/Magdir/scientific               |  12 +-
 contrib/file/magic/Magdir/sequent                  |  29 +-
 contrib/file/magic/Magdir/sereal                   |  25 -
 contrib/file/magic/Magdir/sgi                      |  18 +-
 contrib/file/magic/Magdir/sharc                    |   4 +-
 contrib/file/magic/Magdir/sql                      |   4 +-
 contrib/file/magic/Magdir/ssh                      |   2 -
 contrib/file/magic/Magdir/sun                      |  38 +-
 contrib/file/magic/Magdir/symbos                   |   2 +-
 contrib/file/magic/Magdir/sysex                    |   4 +-
 contrib/file/magic/Magdir/ti-8x                    |   4 +-
 contrib/file/magic/Magdir/troff                    |   6 +-
 contrib/file/magic/Magdir/uterus                   |   2 +-
 contrib/file/magic/Magdir/varied.out               |   4 +-
 contrib/file/magic/Magdir/vax                      |   6 +-
 contrib/file/magic/Magdir/virtual                  | 112 +---
 contrib/file/magic/Magdir/vms                      |   2 +-
 contrib/file/magic/Magdir/vorbis                   |  22 +-
 contrib/file/magic/Magdir/windows                  |   9 +-
 contrib/file/magic/Magdir/xilinx                   |   4 +-
 contrib/file/magic/Magdir/xwindows                 |  14 +-
 contrib/file/magic/Magdir/zfs                      |   8 +-
 contrib/file/src/apprentice.c                      | 596 +++++++--------------
 contrib/file/src/ascmagic.c                        |   5 +-
 contrib/file/src/cdf.c                             | 182 ++-----
 contrib/file/src/cdf.h                             |  26 -
 contrib/file/src/cdf_time.c                        |   7 +-
 contrib/file/src/compress.c                        |  47 +-
 contrib/file/src/elfclass.h                        |  34 +-
 contrib/file/src/encoding.c                        |   3 +-
 contrib/file/src/file.c                            |  66 +--
 contrib/file/src/file.h                            |  58 +-
 contrib/file/src/file_opts.h                       |   6 -
 contrib/file/src/fsmagic.c                         |  47 +-
 contrib/file/src/funcs.c                           | 139 +----
 contrib/file/src/magic.c                           | 127 +----
 contrib/file/src/magic.h                           |  13 +-
 contrib/file/src/readcdf.c                         | 160 ++----
 contrib/file/src/readelf.c                         | 559 +++++++------------
 contrib/file/src/softmagic.c                       | 586 +++++++++++---------
 110 files changed, 1938 insertions(+), 4222 deletions(-)
 delete mode 100644 contrib/file/magic/Magdir/kerberos
 delete mode 100644 contrib/file/magic/Magdir/map
 delete mode 100644 contrib/file/magic/Magdir/qt
 rename contrib/file/magic/Magdir/{meteorological => rinex} (88%)
 delete mode 100644 contrib/file/magic/Magdir/sereal

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/62e32461beaaf0150d067c24edae7b34ac0bf4c9


-- 
DragonFly BSD source repository