Author: gordon
Date: Wed Mar 7 06:04:25 2018
New Revision: 330569
URL: https://svnweb.freebsd.org/changeset/base/330569
Log:
Update file(1) to new version with security update. [EN-18:02.file]
Approved by: so
Security: FreeBSD-EN-18:02.file
Security: CVE-2017-1000249
Added:
releng/10.3/contrib/file/magic/Magdir/algol68
releng/10.3/contrib/file/magic/Magdir/apache
releng/10.3/contrib/file/magic/Magdir/application
releng/10.3/contrib/file/magic/Magdir/apt
releng/10.3/contrib/file/magic/Magdir/ber
releng/10.3/contrib/file/magic/Magdir/bhl
releng/10.3/contrib/file/magic/Magdir/bioinformatics
releng/10.3/contrib/file/magic/Magdir/coff
releng/10.3/contrib/file/magic/Magdir/coverage
releng/10.3/contrib/file/magic/Magdir/der
releng/10.3/contrib/file/magic/Magdir/finger
releng/10.3/contrib/file/magic/Magdir/flif
releng/10.3/contrib/file/magic/Magdir/gconv
releng/10.3/contrib/file/magic/Magdir/gpu
releng/10.3/contrib/file/magic/Magdir/microfocus
releng/10.3/contrib/file/magic/Magdir/pc88
releng/10.3/contrib/file/magic/Magdir/pc98
releng/10.3/contrib/file/magic/Magdir/polyml
releng/10.3/contrib/file/magic/Magdir/psl
releng/10.3/contrib/file/magic/Magdir/vacuum-cleaner
releng/10.3/contrib/file/magic/Magdir/webassembly
releng/10.3/contrib/file/magic/Magdir/x68000
releng/10.3/contrib/file/magic/Magdir/yara
releng/10.3/contrib/file/src/der.c
releng/10.3/contrib/file/src/der.h
releng/10.3/contrib/file/src/dprintf.c
releng/10.3/contrib/file/tests/hddrawcopytool.result
releng/10.4/contrib/file/magic/Magdir/apache
releng/10.4/contrib/file/magic/Magdir/bhl
releng/10.4/contrib/file/magic/Magdir/gconv
releng/10.4/contrib/file/magic/Magdir/gpu
releng/10.4/contrib/file/magic/Magdir/webassembly
releng/10.4/contrib/file/magic/Magdir/yara
releng/10.4/contrib/file/tests/hddrawcopytool.result
releng/11.1/contrib/file/magic/Magdir/apache
releng/11.1/contrib/file/magic/Magdir/bhl
releng/11.1/contrib/file/magic/Magdir/gconv
releng/11.1/contrib/file/magic/Magdir/gpu
releng/11.1/contrib/file/magic/Magdir/webassembly
releng/11.1/contrib/file/magic/Magdir/yara
releng/11.1/contrib/file/tests/hddrawcopytool.result
Deleted:
releng/10.3/contrib/file/python/README
releng/10.3/contrib/file/src/magic.h
Modified:
releng/10.3/contrib/file/ChangeLog
releng/10.3/contrib/file/README
releng/10.3/contrib/file/TODO
releng/10.3/contrib/file/aclocal.m4
releng/10.3/contrib/file/config.guess
releng/10.3/contrib/file/config.h.in
releng/10.3/contrib/file/config.sub
releng/10.3/contrib/file/configure
releng/10.3/contrib/file/configure.ac
releng/10.3/contrib/file/doc/file.man
releng/10.3/contrib/file/doc/libmagic.man
releng/10.3/contrib/file/doc/magic.man
releng/10.3/contrib/file/ltmain.sh
releng/10.3/contrib/file/magic/Localstuff
releng/10.3/contrib/file/magic/Magdir/adventure
releng/10.3/contrib/file/magic/Magdir/amanda
releng/10.3/contrib/file/magic/Magdir/amigaos
releng/10.3/contrib/file/magic/Magdir/android
releng/10.3/contrib/file/magic/Magdir/animation
releng/10.3/contrib/file/magic/Magdir/apple
releng/10.3/contrib/file/magic/Magdir/archive
releng/10.3/contrib/file/magic/Magdir/att3b
releng/10.3/contrib/file/magic/Magdir/audio
releng/10.3/contrib/file/magic/Magdir/blackberry
releng/10.3/contrib/file/magic/Magdir/blender
releng/10.3/contrib/file/magic/Magdir/c-lang
releng/10.3/contrib/file/magic/Magdir/cad
releng/10.3/contrib/file/magic/Magdir/cafebabe
releng/10.3/contrib/file/magic/Magdir/claris
releng/10.3/contrib/file/magic/Magdir/clipper
releng/10.3/contrib/file/magic/Magdir/commands
releng/10.3/contrib/file/magic/Magdir/compress
releng/10.3/contrib/file/magic/Magdir/console
releng/10.3/contrib/file/magic/Magdir/cups
releng/10.3/contrib/file/magic/Magdir/database
releng/10.3/contrib/file/magic/Magdir/diff
releng/10.3/contrib/file/magic/Magdir/dolby
releng/10.3/contrib/file/magic/Magdir/dump
releng/10.3/contrib/file/magic/Magdir/dyadic
releng/10.3/contrib/file/magic/Magdir/editors
releng/10.3/contrib/file/magic/Magdir/elf
releng/10.3/contrib/file/magic/Magdir/filesystems
releng/10.3/contrib/file/magic/Magdir/flash
releng/10.3/contrib/file/magic/Magdir/fonts
releng/10.3/contrib/file/magic/Magdir/fortran
releng/10.3/contrib/file/magic/Magdir/fsav
releng/10.3/contrib/file/magic/Magdir/games
releng/10.3/contrib/file/magic/Magdir/gcc
releng/10.3/contrib/file/magic/Magdir/geo
releng/10.3/contrib/file/magic/Magdir/gnu
releng/10.3/contrib/file/magic/Magdir/gpt
releng/10.3/contrib/file/magic/Magdir/gringotts
releng/10.3/contrib/file/magic/Magdir/hitachi-sh
releng/10.3/contrib/file/magic/Magdir/ibm370
releng/10.3/contrib/file/magic/Magdir/ibm6000
releng/10.3/contrib/file/magic/Magdir/icc
releng/10.3/contrib/file/magic/Magdir/images
releng/10.3/contrib/file/magic/Magdir/intel
releng/10.3/contrib/file/magic/Magdir/isz
releng/10.3/contrib/file/magic/Magdir/java
releng/10.3/contrib/file/magic/Magdir/jpeg
releng/10.3/contrib/file/magic/Magdir/kerberos
releng/10.3/contrib/file/magic/Magdir/kml
releng/10.3/contrib/file/magic/Magdir/linux
releng/10.3/contrib/file/magic/Magdir/lisp
releng/10.3/contrib/file/magic/Magdir/m4
releng/10.3/contrib/file/magic/Magdir/mach
releng/10.3/contrib/file/magic/Magdir/macintosh
releng/10.3/contrib/file/magic/Magdir/make
releng/10.3/contrib/file/magic/Magdir/maple
releng/10.3/contrib/file/magic/Magdir/marc21
releng/10.3/contrib/file/magic/Magdir/mathematica
releng/10.3/contrib/file/magic/Magdir/metastore
releng/10.3/contrib/file/magic/Magdir/meteorological
releng/10.3/contrib/file/magic/Magdir/mime
releng/10.3/contrib/file/magic/Magdir/misctools
releng/10.3/contrib/file/magic/Magdir/modem
releng/10.3/contrib/file/magic/Magdir/mozilla
releng/10.3/contrib/file/magic/Magdir/msdos
releng/10.3/contrib/file/magic/Magdir/msvc
releng/10.3/contrib/file/magic/Magdir/msx
releng/10.3/contrib/file/magic/Magdir/mup
releng/10.3/contrib/file/magic/Magdir/nasa
releng/10.3/contrib/file/magic/Magdir/netbsd
releng/10.3/contrib/file/magic/Magdir/netscape
releng/10.3/contrib/file/magic/Magdir/nitpicker
releng/10.3/contrib/file/magic/Magdir/os2
releng/10.3/contrib/file/magic/Magdir/os9
releng/10.3/contrib/file/magic/Magdir/pbf
releng/10.3/contrib/file/magic/Magdir/pdf
releng/10.3/contrib/file/magic/Magdir/pdp
releng/10.3/contrib/file/magic/Magdir/perl
releng/10.3/contrib/file/magic/Magdir/pgf
releng/10.3/contrib/file/magic/Magdir/pgp
releng/10.3/contrib/file/magic/Magdir/printer
releng/10.3/contrib/file/magic/Magdir/project
releng/10.3/contrib/file/magic/Magdir/psdbms
releng/10.3/contrib/file/magic/Magdir/python
releng/10.3/contrib/file/magic/Magdir/riff
releng/10.3/contrib/file/magic/Magdir/ruby
releng/10.3/contrib/file/magic/Magdir/sccs
releng/10.3/contrib/file/magic/Magdir/scientific
releng/10.3/contrib/file/magic/Magdir/sendmail
releng/10.3/contrib/file/magic/Magdir/sequent
releng/10.3/contrib/file/magic/Magdir/sgml
releng/10.3/contrib/file/magic/Magdir/sharc
releng/10.3/contrib/file/magic/Magdir/sinclair
releng/10.3/contrib/file/magic/Magdir/sketch
releng/10.3/contrib/file/magic/Magdir/sql
releng/10.3/contrib/file/magic/Magdir/ssl
releng/10.3/contrib/file/magic/Magdir/sysex
releng/10.3/contrib/file/magic/Magdir/terminfo
releng/10.3/contrib/file/magic/Magdir/vms
releng/10.3/contrib/file/magic/Magdir/vmware
releng/10.3/contrib/file/magic/Magdir/vorbis
releng/10.3/contrib/file/magic/Magdir/windows
releng/10.3/contrib/file/magic/Magdir/wordprocessors
releng/10.3/contrib/file/magic/Magdir/xenix
releng/10.3/contrib/file/magic/Magdir/xilinx
releng/10.3/contrib/file/magic/Magdir/xwindows
releng/10.3/contrib/file/magic/Makefile.am
releng/10.3/contrib/file/magic/Makefile.in
releng/10.3/contrib/file/python/magic.py
releng/10.3/contrib/file/python/setup.py
releng/10.3/contrib/file/src/Makefile.am
releng/10.3/contrib/file/src/Makefile.in
releng/10.3/contrib/file/src/apprentice.c
releng/10.3/contrib/file/src/ascmagic.c
releng/10.3/contrib/file/src/cdf.c
releng/10.3/contrib/file/src/cdf.h
releng/10.3/contrib/file/src/cdf_time.c
releng/10.3/contrib/file/src/compress.c
releng/10.3/contrib/file/src/file.c
releng/10.3/contrib/file/src/file.h
releng/10.3/contrib/file/src/file_opts.h
releng/10.3/contrib/file/src/fmtcheck.c
releng/10.3/contrib/file/src/fsmagic.c
releng/10.3/contrib/file/src/funcs.c
releng/10.3/contrib/file/src/is_tar.c
releng/10.3/contrib/file/src/magic.c
releng/10.3/contrib/file/src/magic.h.in
releng/10.3/contrib/file/src/print.c
releng/10.3/contrib/file/src/readcdf.c
releng/10.3/contrib/file/src/readelf.c
releng/10.3/contrib/file/src/readelf.h
releng/10.3/contrib/file/src/softmagic.c
releng/10.3/contrib/file/src/vasprintf.c
releng/10.3/contrib/file/tests/Makefile.am
releng/10.3/contrib/file/tests/Makefile.in
releng/10.3/contrib/file/tests/test.c
releng/10.3/lib/libmagic/Makefile
releng/10.3/lib/libmagic/config.h
releng/10.4/contrib/file/ChangeLog
releng/10.4/contrib/file/aclocal.m4
releng/10.4/contrib/file/config.guess
releng/10.4/contrib/file/config.sub
releng/10.4/contrib/file/configure
releng/10.4/contrib/file/configure.ac
releng/10.4/contrib/file/doc/file.man
releng/10.4/contrib/file/doc/libmagic.man
releng/10.4/contrib/file/doc/magic.man
releng/10.4/contrib/file/magic/Localstuff
releng/10.4/contrib/file/magic/Magdir/adventure
releng/10.4/contrib/file/magic/Magdir/amanda
releng/10.4/contrib/file/magic/Magdir/amigaos
releng/10.4/contrib/file/magic/Magdir/android
releng/10.4/contrib/file/magic/Magdir/animation
releng/10.4/contrib/file/magic/Magdir/apple
releng/10.4/contrib/file/magic/Magdir/archive
releng/10.4/contrib/file/magic/Magdir/att3b
releng/10.4/contrib/file/magic/Magdir/audio
releng/10.4/contrib/file/magic/Magdir/blackberry
releng/10.4/contrib/file/magic/Magdir/blender
releng/10.4/contrib/file/magic/Magdir/c-lang
releng/10.4/contrib/file/magic/Magdir/cad
releng/10.4/contrib/file/magic/Magdir/cafebabe
releng/10.4/contrib/file/magic/Magdir/clipper
releng/10.4/contrib/file/magic/Magdir/coff
releng/10.4/contrib/file/magic/Magdir/commands
releng/10.4/contrib/file/magic/Magdir/compress
releng/10.4/contrib/file/magic/Magdir/console
releng/10.4/contrib/file/magic/Magdir/cups
releng/10.4/contrib/file/magic/Magdir/database
releng/10.4/contrib/file/magic/Magdir/der
releng/10.4/contrib/file/magic/Magdir/diff
releng/10.4/contrib/file/magic/Magdir/dolby
releng/10.4/contrib/file/magic/Magdir/dump
releng/10.4/contrib/file/magic/Magdir/dyadic
releng/10.4/contrib/file/magic/Magdir/editors
releng/10.4/contrib/file/magic/Magdir/filesystems
releng/10.4/contrib/file/magic/Magdir/flash
releng/10.4/contrib/file/magic/Magdir/fonts
releng/10.4/contrib/file/magic/Magdir/fsav
releng/10.4/contrib/file/magic/Magdir/games
releng/10.4/contrib/file/magic/Magdir/geo
releng/10.4/contrib/file/magic/Magdir/gnu
releng/10.4/contrib/file/magic/Magdir/gpt
releng/10.4/contrib/file/magic/Magdir/gringotts
releng/10.4/contrib/file/magic/Magdir/hitachi-sh
releng/10.4/contrib/file/magic/Magdir/ibm370
releng/10.4/contrib/file/magic/Magdir/ibm6000
releng/10.4/contrib/file/magic/Magdir/icc
releng/10.4/contrib/file/magic/Magdir/images
releng/10.4/contrib/file/magic/Magdir/intel
releng/10.4/contrib/file/magic/Magdir/isz
releng/10.4/contrib/file/magic/Magdir/jpeg
releng/10.4/contrib/file/magic/Magdir/kerberos
releng/10.4/contrib/file/magic/Magdir/kml
releng/10.4/contrib/file/magic/Magdir/linux
releng/10.4/contrib/file/magic/Magdir/lisp
releng/10.4/contrib/file/magic/Magdir/m4
releng/10.4/contrib/file/magic/Magdir/macintosh
releng/10.4/contrib/file/magic/Magdir/make
releng/10.4/contrib/file/magic/Magdir/maple
releng/10.4/contrib/file/magic/Magdir/marc21
releng/10.4/contrib/file/magic/Magdir/mathematica
releng/10.4/contrib/file/magic/Magdir/metastore
releng/10.4/contrib/file/magic/Magdir/meteorological
releng/10.4/contrib/file/magic/Magdir/microfocus
releng/10.4/contrib/file/magic/Magdir/mime
releng/10.4/contrib/file/magic/Magdir/misctools
releng/10.4/contrib/file/magic/Magdir/modem
releng/10.4/contrib/file/magic/Magdir/mozilla
releng/10.4/contrib/file/magic/Magdir/msdos
releng/10.4/contrib/file/magic/Magdir/msvc
releng/10.4/contrib/file/magic/Magdir/msx
releng/10.4/contrib/file/magic/Magdir/mup
releng/10.4/contrib/file/magic/Magdir/nasa
releng/10.4/contrib/file/magic/Magdir/netbsd
releng/10.4/contrib/file/magic/Magdir/netscape
releng/10.4/contrib/file/magic/Magdir/nitpicker
releng/10.4/contrib/file/magic/Magdir/os2
releng/10.4/contrib/file/magic/Magdir/os9
releng/10.4/contrib/file/magic/Magdir/pbf
releng/10.4/contrib/file/magic/Magdir/pc88
releng/10.4/contrib/file/magic/Magdir/pc98
releng/10.4/contrib/file/magic/Magdir/pdf
releng/10.4/contrib/file/magic/Magdir/pdp
releng/10.4/contrib/file/magic/Magdir/perl
releng/10.4/contrib/file/magic/Magdir/pgf
releng/10.4/contrib/file/magic/Magdir/pgp
releng/10.4/contrib/file/magic/Magdir/printer
releng/10.4/contrib/file/magic/Magdir/project
releng/10.4/contrib/file/magic/Magdir/psdbms
releng/10.4/contrib/file/magic/Magdir/python
releng/10.4/contrib/file/magic/Magdir/riff
releng/10.4/contrib/file/magic/Magdir/ruby
releng/10.4/contrib/file/magic/Magdir/sccs
releng/10.4/contrib/file/magic/Magdir/scientific
releng/10.4/contrib/file/magic/Magdir/sendmail
releng/10.4/contrib/file/magic/Magdir/sequent
releng/10.4/contrib/file/magic/Magdir/sgml
releng/10.4/contrib/file/magic/Magdir/sharc
releng/10.4/contrib/file/magic/Magdir/sketch
releng/10.4/contrib/file/magic/Magdir/sql
releng/10.4/contrib/file/magic/Magdir/ssl
releng/10.4/contrib/file/magic/Magdir/sysex
releng/10.4/contrib/file/magic/Magdir/terminfo
releng/10.4/contrib/file/magic/Magdir/vms
releng/10.4/contrib/file/magic/Magdir/vmware
releng/10.4/contrib/file/magic/Magdir/vorbis
releng/10.4/contrib/file/magic/Magdir/windows
releng/10.4/contrib/file/magic/Magdir/xenix
releng/10.4/contrib/file/magic/Magdir/xilinx
releng/10.4/contrib/file/magic/Magdir/xwindows
releng/10.4/contrib/file/magic/Makefile.am
releng/10.4/contrib/file/magic/Makefile.in
releng/10.4/contrib/file/python/magic.py
releng/10.4/contrib/file/src/apprentice.c
releng/10.4/contrib/file/src/cdf.c
releng/10.4/contrib/file/src/cdf.h
releng/10.4/contrib/file/src/cdf_time.c
releng/10.4/contrib/file/src/compress.c
releng/10.4/contrib/file/src/der.c
releng/10.4/contrib/file/src/file.h
releng/10.4/contrib/file/src/fsmagic.c
releng/10.4/contrib/file/src/funcs.c
releng/10.4/contrib/file/src/is_tar.c
releng/10.4/contrib/file/src/magic.c
releng/10.4/contrib/file/src/magic.h.in
releng/10.4/contrib/file/src/print.c
releng/10.4/contrib/file/src/readcdf.c
releng/10.4/contrib/file/src/readelf.c
releng/10.4/contrib/file/src/readelf.h
releng/10.4/contrib/file/src/softmagic.c
releng/10.4/contrib/file/src/vasprintf.c
releng/10.4/contrib/file/tests/Makefile.am
releng/10.4/contrib/file/tests/Makefile.in
releng/10.4/contrib/file/tests/test.c
releng/10.4/lib/libmagic/config.h
releng/11.1/contrib/file/ChangeLog
releng/11.1/contrib/file/aclocal.m4
releng/11.1/contrib/file/config.guess
releng/11.1/contrib/file/config.sub
releng/11.1/contrib/file/configure
releng/11.1/contrib/file/configure.ac
releng/11.1/contrib/file/doc/file.man
releng/11.1/contrib/file/doc/libmagic.man
releng/11.1/contrib/file/doc/magic.man
releng/11.1/contrib/file/magic/Localstuff
releng/11.1/contrib/file/magic/Magdir/adventure
releng/11.1/contrib/file/magic/Magdir/amanda
releng/11.1/contrib/file/magic/Magdir/amigaos
releng/11.1/contrib/file/magic/Magdir/android
releng/11.1/contrib/file/magic/Magdir/animation
releng/11.1/contrib/file/magic/Magdir/apple
releng/11.1/contrib/file/magic/Magdir/archive
releng/11.1/contrib/file/magic/Magdir/att3b
releng/11.1/contrib/file/magic/Magdir/audio
releng/11.1/contrib/file/magic/Magdir/blackberry
releng/11.1/contrib/file/magic/Magdir/blender
releng/11.1/contrib/file/magic/Magdir/c-lang
releng/11.1/contrib/file/magic/Magdir/cad
releng/11.1/contrib/file/magic/Magdir/cafebabe
releng/11.1/contrib/file/magic/Magdir/clipper
releng/11.1/contrib/file/magic/Magdir/coff
releng/11.1/contrib/file/magic/Magdir/commands
releng/11.1/contrib/file/magic/Magdir/compress
releng/11.1/contrib/file/magic/Magdir/console
releng/11.1/contrib/file/magic/Magdir/cups
releng/11.1/contrib/file/magic/Magdir/database
releng/11.1/contrib/file/magic/Magdir/der
releng/11.1/contrib/file/magic/Magdir/diff
releng/11.1/contrib/file/magic/Magdir/dolby
releng/11.1/contrib/file/magic/Magdir/dump
releng/11.1/contrib/file/magic/Magdir/dyadic
releng/11.1/contrib/file/magic/Magdir/editors
releng/11.1/contrib/file/magic/Magdir/filesystems
releng/11.1/contrib/file/magic/Magdir/flash
releng/11.1/contrib/file/magic/Magdir/fonts
releng/11.1/contrib/file/magic/Magdir/fsav
releng/11.1/contrib/file/magic/Magdir/games
releng/11.1/contrib/file/magic/Magdir/geo
releng/11.1/contrib/file/magic/Magdir/gnu
releng/11.1/contrib/file/magic/Magdir/gpt
releng/11.1/contrib/file/magic/Magdir/gringotts
releng/11.1/contrib/file/magic/Magdir/hitachi-sh
releng/11.1/contrib/file/magic/Magdir/ibm370
releng/11.1/contrib/file/magic/Magdir/ibm6000
releng/11.1/contrib/file/magic/Magdir/icc
releng/11.1/contrib/file/magic/Magdir/images
releng/11.1/contrib/file/magic/Magdir/intel
releng/11.1/contrib/file/magic/Magdir/isz
releng/11.1/contrib/file/magic/Magdir/jpeg
releng/11.1/contrib/file/magic/Magdir/kerberos
releng/11.1/contrib/file/magic/Magdir/kml
releng/11.1/contrib/file/magic/Magdir/linux
releng/11.1/contrib/file/magic/Magdir/lisp
releng/11.1/contrib/file/magic/Magdir/m4
releng/11.1/contrib/file/magic/Magdir/macintosh
releng/11.1/contrib/file/magic/Magdir/make
releng/11.1/contrib/file/magic/Magdir/maple
releng/11.1/contrib/file/magic/Magdir/marc21
releng/11.1/contrib/file/magic/Magdir/mathematica
releng/11.1/contrib/file/magic/Magdir/metastore
releng/11.1/contrib/file/magic/Magdir/meteorological
releng/11.1/contrib/file/magic/Magdir/microfocus
releng/11.1/contrib/file/magic/Magdir/mime
releng/11.1/contrib/file/magic/Magdir/misctools
releng/11.1/contrib/file/magic/Magdir/modem
releng/11.1/contrib/file/magic/Magdir/mozilla
releng/11.1/contrib/file/magic/Magdir/msdos
releng/11.1/contrib/file/magic/Magdir/msvc
releng/11.1/contrib/file/magic/Magdir/msx
releng/11.1/contrib/file/magic/Magdir/mup
releng/11.1/contrib/file/magic/Magdir/nasa
releng/11.1/contrib/file/magic/Magdir/netbsd
releng/11.1/contrib/file/magic/Magdir/netscape
releng/11.1/contrib/file/magic/Magdir/nitpicker
releng/11.1/contrib/file/magic/Magdir/os2
releng/11.1/contrib/file/magic/Magdir/os9
releng/11.1/contrib/file/magic/Magdir/pbf
releng/11.1/contrib/file/magic/Magdir/pc88
releng/11.1/contrib/file/magic/Magdir/pc98
releng/11.1/contrib/file/magic/Magdir/pdf
releng/11.1/contrib/file/magic/Magdir/pdp
releng/11.1/contrib/file/magic/Magdir/perl
releng/11.1/contrib/file/magic/Magdir/pgf
releng/11.1/contrib/file/magic/Magdir/pgp
releng/11.1/contrib/file/magic/Magdir/printer
releng/11.1/contrib/file/magic/Magdir/project
releng/11.1/contrib/file/magic/Magdir/psdbms
releng/11.1/contrib/file/magic/Magdir/python
releng/11.1/contrib/file/magic/Magdir/riff
releng/11.1/contrib/file/magic/Magdir/ruby
releng/11.1/contrib/file/magic/Magdir/sccs
releng/11.1/contrib/file/magic/Magdir/scientific
releng/11.1/contrib/file/magic/Magdir/sendmail
releng/11.1/contrib/file/magic/Magdir/sequent
releng/11.1/contrib/file/magic/Magdir/sgml
releng/11.1/contrib/file/magic/Magdir/sharc
releng/11.1/contrib/file/magic/Magdir/sketch
releng/11.1/contrib/file/magic/Magdir/sql
releng/11.1/contrib/file/magic/Magdir/ssl
releng/11.1/contrib/file/magic/Magdir/sysex
releng/11.1/contrib/file/magic/Magdir/terminfo
releng/11.1/contrib/file/magic/Magdir/vms
releng/11.1/contrib/file/magic/Magdir/vmware
releng/11.1/contrib/file/magic/Magdir/vorbis
releng/11.1/contrib/file/magic/Magdir/windows
releng/11.1/contrib/file/magic/Magdir/xenix
releng/11.1/contrib/file/magic/Magdir/xilinx
releng/11.1/contrib/file/magic/Magdir/xwindows
releng/11.1/contrib/file/magic/Makefile.am
releng/11.1/contrib/file/magic/Makefile.in
releng/11.1/contrib/file/python/magic.py
releng/11.1/contrib/file/src/apprentice.c
releng/11.1/contrib/file/src/cdf.c
releng/11.1/contrib/file/src/cdf.h
releng/11.1/contrib/file/src/cdf_time.c
releng/11.1/contrib/file/src/compress.c
releng/11.1/contrib/file/src/der.c
releng/11.1/contrib/file/src/file.h
releng/11.1/contrib/file/src/fsmagic.c
releng/11.1/contrib/file/src/funcs.c
releng/11.1/contrib/file/src/is_tar.c
releng/11.1/contrib/file/src/magic.c
releng/11.1/contrib/file/src/magic.h.in
releng/11.1/contrib/file/src/print.c
releng/11.1/contrib/file/src/readcdf.c
releng/11.1/contrib/file/src/readelf.c
releng/11.1/contrib/file/src/readelf.h
releng/11.1/contrib/file/src/softmagic.c
releng/11.1/contrib/file/src/vasprintf.c
releng/11.1/contrib/file/tests/Makefile.am
releng/11.1/contrib/file/tests/Makefile.in
releng/11.1/contrib/file/tests/test.c
releng/11.1/lib/libmagic/config.h
Modified: releng/10.3/contrib/file/ChangeLog
==============================================================================
--- releng/10.3/contrib/file/ChangeLog Wed Mar 7 06:01:44 2018
(r330568)
+++ releng/10.3/contrib/file/ChangeLog Wed Mar 7 06:04:25 2018
(r330569)
@@ -1,3 +1,157 @@
+2017-09-02 11:53 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.32
+
+2017-08-28 16:37 Christos Zoulas <chris...@zoulas.com>
+
+ * Always reset state in {file,buffer}_apprentice (Krzysztof Wilczynski)
+
+2017-08-27 03:55 Christos Zoulas <chris...@zoulas.com>
+
+ * Fix always true condition (Thomas Jarosch)
+
+2017-05-24 17:30 Christos Zoulas <chris...@zoulas.com>
+
+ * pickier parsing of numeric values in magic files.
+
+2017-05-23 17:55 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/615 add magic_getflags()
+
+2017-05-23 13:55 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.31
+
+2017-03-17 20:32 Christos Zoulas <chris...@zoulas.com>
+
+ * remove trailing spaces from magic files
+ * refactor is_tar
+ * better bounds checks for cdf
+
+2017-02-10 12:24 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.30
+
+2017-02-07 23:27 Christos Zoulas <chris...@zoulas.com>
+
+ * If we exceeded the offset in a search return no match
+ (Christoph Biedl)
+ * Be more lenient on corrupt CDF files (Christoph Biedl)
+
+2017-02-04 16:46 Christos Zoulas <chris...@zoulas.com>
+
+ * pacify ubsan sign extension (oss-fuzz/524)
+
+2017-02-01 12:42 Christos Zoulas <chris...@zoulas.com>
+
+ * off by one in cdf parsing (PR/593)
+ * report debugging sections in elf (PR/591)
+
+2016-11-06 10:52 Christos Zoulas <chris...@zoulas.com>
+
+ * Allow @@@ in extensions
+ * Add missing overflow check in der magic (Jonas Wagner)
+
+2016-10-25 10:40 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.29
+
+2016-10-24 11:20 Christos Zoulas <chris...@zoulas.com>
+
+ * der getlength overflow (Jonas Wagner)
+ * multiple magic file load failure (Christoph Biedl)
+
+2016-10-17 11:26 Christos Zoulas <chris...@zoulas.com>
+
+ * CDF parsing improvements (Guy Helmer)
+
+2016-07-20 7:26 Christos Zoulas <chris...@zoulas.com>
+
+ * Add support for signed indirect offsets
+
+2016-07-18 7:41 Christos Zoulas <chris...@zoulas.com>
+
+ * cat /dev/null | file - should print empty (Christoph Biedl)
+
+2016-07-05 15:20 Christos Zoulas <chris...@zoulas.com>
+
+ * Bump string size from 64 to 96.
+
+2016-06-13 20:20 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/556: Fix separators on annotations.
+
+2016-06-13 19:40 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.28
+ * fix leak on allocation failure
+
+2016-06-01 1:20 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/555: Avoid overflow for offset > nbytes
+ * PR/550: Segv on DER parsing:
+ - use the correct variable for length
+ - set offset to 0 on failure.
+
+2016-05-13 12:00 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.27
+
+2016-04-18 9:35 Christos Zoulas <chris...@zoulas.com>
+
+ * Errors comparing DER entries or computing offsets
+ are just indications of malformed non-DER files.
+ Don't print them.
+ * Offset comparison was off-by-one.
+ * Fix compression code (Werner Fink)
+ * Put new bytes constant in the right file (not the generated one)
+
+2016-04-16 18:34 Christos Zoulas <chris...@zoulas.com>
+
+ * release 5.26
+
+2016-03-31 13:50 Christos Zoulas <chris...@zoulas.com>
+
+ * make the number of bytes read from files configurable.
+
+2016-03-21 13:40 Christos Zoulas <chris...@zoulas.com>
+
+ * Add bounds checks for DER code (discovered by Thomas Jarosch)
+ * Change indirect recursion limit to indirect use count and
+ bump from 15 to 50 to prevent abuse.
+
+2016-03-13 20:39 Christos Zoulas <chris...@zoulas.com>
+
+ * Add -00 which prints filename\0description\0
+
+2016-03-01 13:28 Christos Zoulas <chris...@zoulas.com>
+
+ * Fix ID3 indirect parsing
+
+2016-01-19 10:18 Christos Zoulas <chris...@zoulas.com>
+
+ * add DER parsing capability
+
+2015-11-13 10:35 Christos Zoulas <chris...@zoulas.com>
+
+ * provide dprintf(3) for the OS's that don't have it.
+
+2015-11-11 16:25 Christos Zoulas <chris...@zoulas.com>
+
+ * redo the compression code report decompression errors
+
+2015-11-10 23:25 Christos Zoulas <chris...@zoulas.com>
+
+ * REG_STARTEND code is not working as expected, delete it.
+
+2015-11-09 16:05 Christos Zoulas <chris...@zoulas.com>
+
+ * Add zlib support if we have it.
+
+2015-11-05 11:22 Christos Zoulas <chris...@zoulas.com>
+
+ * PR/492: compression forking was broken with magic_buffer.
+
2015-09-16 9:50 Christos Zoulas <chris...@zoulas.com>
* release 5.25
@@ -287,7 +441,7 @@
`
2013-11-06 14:40 Christos Zoulas <chris...@zoulas.com>
- * fix erroneous non-zero exit code from non-existant file and message
+ * fix erroneous non-zero exit code from non-existent file and message
2013-10-29 14:25 Christos Zoulas <chris...@zoulas.com>
Modified: releng/10.3/contrib/file/README
==============================================================================
--- releng/10.3/contrib/file/README Wed Mar 7 06:01:44 2018
(r330568)
+++ releng/10.3/contrib/file/README Wed Mar 7 06:04:25 2018
(r330569)
@@ -1,6 +1,6 @@
## README for file(1) Command ##
- @(#) $File: README,v 1.49 2015/01/02 20:23:04 christos Exp $
+ @(#) $File: README,v 1.50 2016/04/16 22:40:54 christos Exp $
Mailing List: f...@mx.gw.com
Mailing List archives: http://mx.gw.com/pipermail/file/
@@ -67,17 +67,41 @@ in magic(5) format please, to the maintainer, Christos
COPYING - read this first.
README - read this second (you are currently reading this file).
INSTALL - read on how to install
+src/localtime_r.c
+src/magic.c
+src/magic.h
+src/mygetopt.h
+src/newtest2.c
+src/newtest3.c
+src/pread.c
+src/print.c
+src/readcdf.c
+src/readelf.c
+src/readelf.h
+src/regex.c
+src/regex2.c
+src/softmagic.c
+src/strcasestr.c
+src/strlcat.c
+src/strlcpy.c
+src/strndup.c
+src/tar.h
+src/teststrchr.c
+src/vasprintf.c
+src/x.c
src/apprentice.c - parses /etc/magic to learn magic
-src/asctime_r.c - replacement for OS's that don't have it.
src/apptype.c - used for OS/2 specific application type magic
-src/asprintf.c - replacement for OS's that don't have it.
src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
src/asctime_r.c - replacement for OS's that don't have it.
src/asprintf.c - replacement for OS's that don't have it.
+src/asctime_r.c - replacement for OS's that don't have it.
+src/asprintf.c - replacement for OS's that don't have it.
src/cdf.[ch] - parser for Microsoft Compound Document Files
src/cdf_time.c - time converter for CDF.
src/compress.c - handles decompressing files to look inside.
src/ctime_r.c - replacement for OS's that don't have it.
+src/der.[ch] - parser for Distinguished Encoding Rules
+src/dprintf.c - replacement for OS's that don't have it.
src/elfclass.h - common code for elf 32/64.
src/encoding.c - handles unicode encodings
src/file.c - the main program
@@ -88,10 +112,13 @@ src/fsmagic.c - first set of tests the program runs, b
src/funcs.c - utilility functions
src/getline.c - replacement for OS's that don't have it.
src/getopt_long.c - replacement for OS's that don't have it.
-src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).
-src/names.h - header file for ascmagic.c
+src/gmtime_r.c - replacement for OS's that don't have it.
+src/is_tar.c, tar.h - knows about Tape ARchive format (courtesy John Gilmore).
+src/localtime_r.c - replacement for OS's that don't have it.
src/magic.h.in - source file for magic.h
+src/mygetopt.h - replacement for OS's that don't have it.
src/magic.c - the libmagic api
+src/names.h - header file for ascmagic.c
src/pread.c - replacement for OS's that don't have it.
src/print.c - print results, errors, warnings.
src/readcdf.c - CDF wrapper.
Modified: releng/10.3/contrib/file/TODO
==============================================================================
--- releng/10.3/contrib/file/TODO Wed Mar 7 06:01:44 2018
(r330568)
+++ releng/10.3/contrib/file/TODO Wed Mar 7 06:04:25 2018
(r330569)
@@ -6,7 +6,6 @@ file, not here. More speculative material can live her
listed in the BUGS section of the man page had been fixed!)
---
-
It would be nice to simplify file considerably. For example,
reimplement the apprentice and non-pattern magic methods in Python,
and compile the magic patterns to a giant regex (or something similar;
@@ -15,8 +14,23 @@ small amount of C is needed (because fast execution is
required for soft magic, not the more detailed information given by
hard-wired routines). In this regard, note that hplip, which is
BSD-licensed, has a magic reimplementation in Python.
-
+---
Read the kerberos magic entry for more ideas.
-
+---
Write a string merger to make magic entry sizes dynamic.
Strings will be converted to offsets from the string table.
+---
+Programming language support, we can introduce the concept of a group
+of rules where n rules need to match before the rule is positive. This
+could require structural changes to the matching code :-(
+
+0 group 2 # require 2 matches
+# rule 1
+>0 ....
+...
+# rule 2
+>0 ....
+...
+
+christos
+
Modified: releng/10.3/contrib/file/aclocal.m4
==============================================================================
--- releng/10.3/contrib/file/aclocal.m4 Wed Mar 7 06:01:44 2018
(r330568)
+++ releng/10.3/contrib/file/aclocal.m4 Wed Mar 7 06:04:25 2018
(r330569)
@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the b
To do so, use the procedure documented by the package, typically
'autoreconf'.])])
# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Modified: releng/10.3/contrib/file/config.guess
==============================================================================
--- releng/10.3/contrib/file/config.guess Wed Mar 7 06:01:44 2018
(r330568)
+++ releng/10.3/contrib/file/config.guess Wed Mar 7 06:04:25 2018
(r330569)
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2017-01-01'
# This file 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
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,20 +20,18 @@ timestamp='2012-02-10'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patc...@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+#
+# Please send patches to <config-patc...@gnu.org>.
+
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
@@ -54,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEAS
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's,
,,g'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -153,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
+ echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e
's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne
's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
+ # to ELF recently (or will in the future) and ABI.
case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ os=netbsdelf
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -182,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -192,18 +224,26 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d.
-f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -216,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -232,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\)
processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
+ UNAME_MACHINE=alphaev5 ;;
"EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
+ UNAME_MACHINE=alphaev56 ;;
"EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
+ UNAME_MACHINE=alphapca56 ;;
"EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
+ UNAME_MACHINE=alphapca57 ;;
"EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
+ UNAME_MACHINE=alphaev6 ;;
"EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
+ UNAME_MACHINE=alphaev67 ;;
"EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
+ UNAME_MACHINE=alphaev69 ;;
"EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
+ UNAME_MACHINE=alphaev7 ;;
"EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
+ UNAME_MACHINE=alphaev79 ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
@@ -302,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -340,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
- SUN_ARCH="i386"
+ SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
- SUN_ARCH="x86_64"
+ SUN_ARCH=x86_64
fi
fi
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -374,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}')
2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
echo m68k-sun-sunos${UNAME_RELEASE}
@@ -560,8 +603,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -598,13 +642,13 @@ EOF
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
@@ -643,11 +687,11 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) &&
HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) &&
HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
+ if [ ${HP_ARCH} = hppa2.0w ]
then
eval $set_cc_for_build
@@ -660,12 +704,12 @@ EOF
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
grep -q __LP64__
then
- HP_ARCH="hppa2.0w"
+ HP_ARCH=hppa2.0w
else
- HP_ARCH="hppa64"
+ HP_ARCH=hppa64
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -770,14 +814,14 @@ EOF
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -801,10 +845,13 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -852,21 +899,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +926,60 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
+ e2k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -950,54 +998,69 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ mips64el:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
+ exit ;;
+ or32:Linux:*:* | or1k*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1073,7 +1136,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1201,6 +1264,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1219,6 +1285,9 @@ EOF
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-ACE:SUPER-UX:*:*)
+ echo sxace-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1227,24 +1296,36 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo
'#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
+ if test "$UNAME_PROCESSOR" = x86; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
@@ -1256,7 +1337,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,7 +1356,7 @@ EOF
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- if test "$cputype" = "386"; then
+ if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
@@ -1317,7 +1398,7 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/
.*$//'
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/
.*$//'`
exit ;;
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
@@ -1328,174 +1409,25 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
+ exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
