Module Name: src
Committed By: christos
Date: Fri Aug 18 19:00:11 UTC 2023
Modified Files:
src/external/bsd/file/dist: ChangeLog Makefile.in aclocal.m4
config.guess config.sub configure configure.ac
src/external/bsd/file/dist/doc: Makefile.in file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: apple archive cad coff
commands elf filesystems games geo jpeg linux mail.news msdos xenix
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
cdf_time.c compress.c der.c encoding.c file.c file.h fsmagic.c
funcs.c is_csv.c is_json.c magic.c print.c readcdf.c readelf.c
softmagic.c
src/external/bsd/file/dist/tests: Makefile.in
src/external/bsd/file/include: config.h
src/external/bsd/file/lib: Makefile
Removed Files:
src/external/bsd/file/dist: .travis.yml
src/external/bsd/file/dist/fuzz: Dockerfile build.sh magic_fuzzer.c
project.yaml
src/external/bsd/file/dist/magic/magdir: dsf etf
src/external/bsd/file/dist/python: HOWTO magic.pyi pyproject.toml
threads.py
src/external/bsd/file/dist/tests: pgp-binary-key-v4-ecc-rev.result
pgp-binary-key-v4-rsa-no-userid-rev.result
Log Message:
merge conflicts between file-5.43 and file-5.45
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/.travis.yml
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/ChangeLog
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/Makefile.in \
src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/config.sub
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/fuzz/Dockerfile \
src/external/bsd/file/dist/fuzz/build.sh \
src/external/bsd/file/dist/fuzz/magic_fuzzer.c \
src/external/bsd/file/dist/fuzz/project.yaml
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/magdir/apple
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/magic/magdir/archive
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/cad \
src/external/bsd/file/dist/magic/magdir/coff \
src/external/bsd/file/dist/magic/magdir/commands \
src/external/bsd/file/dist/magic/magdir/games \
src/external/bsd/file/dist/magic/magdir/linux \
src/external/bsd/file/dist/magic/magdir/mail.news \
src/external/bsd/file/dist/magic/magdir/msdos \
src/external/bsd/file/dist/magic/magdir/xenix
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/magic/magdir/dsf \
src/external/bsd/file/dist/magic/magdir/etf
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/magic/magdir/elf \
src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/geo \
src/external/bsd/file/dist/magic/magdir/jpeg
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/python/HOWTO \
src/external/bsd/file/dist/python/magic.pyi \
src/external/bsd/file/dist/python/pyproject.toml \
src/external/bsd/file/dist/python/threads.py
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/src/Makefile.in
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/funcs.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/cdf_time.c \
src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/compress.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/der.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/file.c \
src/external/bsd/file/dist/src/fsmagic.c \
src/external/bsd/file/dist/src/magic.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/is_csv.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/is_json.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/src/readcdf.c
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/tests/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/file/dist/tests/pgp-binary-key-v4-ecc-rev.result \
src/external/bsd/file/dist/tests/pgp-binary-key-v4-rsa-no-userid-rev.result
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/include/config.h
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
