From nobody Sun Dec 08 19:09:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5vgs4krGz5f3RV; Sun, 08 Dec 2024 19:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5vgs4Bw3z4GXt; Sun, 8 Dec 2024 19:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733684985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0rA3rUvpvshbtAIfFeqJdg21Z3RAx19Z1XYi/HOgBc=; b=GUQi9CVsrLSqeTWFaEsCCIoI7fWqVOXgrvtbGSbUyrjzbr20m/fNOV3UNJONq5j0VJtKno ULmgTgSldN9chGhmiK4P3wXvo0L5H6LOdenaJ23OXwS47PwhZ0jwWiUZn3mvu/zVx+rSNI 27Uui8SI8wP7SuCSm2qKtOMXMvXjra0peb0ziPZ5E69FaBtjoZf+uOboAmNrtBSehhcLcA lIFBZL5QHO1Yi+Uun10PKZhAQ+hamFMyuKKE+MafL4QFFUmnf8bq6rRL35yPZpl1k9EhWI cosfBy0ZBBRzOgiwiLjabG58dyC6zl3IGM4bNtfoXIek6e4VA5PJM6oerM/mhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733684985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0rA3rUvpvshbtAIfFeqJdg21Z3RAx19Z1XYi/HOgBc=; b=R6HXHaoOj9fJm873L0CeXvbDX47QTjv4uFbYesXkApjeDO2eZ0L1grkrgBtwI2ZCGaEJCf CR/Syf26fKAgmxmu7BC+AFdi/7HjJ9L9s09hPtwQSRKty7EXYtnvzIqISNcgzQwtWZLFN8 zCB1U30lFsd6CVYbzoZfTj1Qn7G822KqXzrFxH3Ye0eqvt9EZeCWyDsEBOIo3Vl4xK2TrY 0l/vTqpb8lRWJxNyl3Ka4Yy5dbTI9NUsEe2MDd2jnyEiyygbPCEGfdBkxpS1RD6kkUdsp5 rMshSdG33bmYYYXNClHnpqNYYl961sJ6S12qihbQMyjzpmR3qiiyNKh6+G+FEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733684985; a=rsa-sha256; cv=none; b=C3cJMgA+qv5HLJzYUHTzItbjRh7TzAOR7csA0sfydXTmWov0VD6y/wiGPOjjqt9WAqrlvg L4x1jU9ljTBmqQNkco4n79zQLDB2WkT9rBRODFlyvzyas2eKjMEdgpjwr+hUhQX1UG8EMR gSO+IQ8mN1tlkOz+e/+7SvOJCdrh8d8pNgpGKH0VQWlfNDsMl0DULMHxgmCOx1PaAtaM64 fPa5EAuek0GylNneLVVlUstZaeFZSv4R4F1eCb4BHgDCcO2Df4OTmdhj6ip+AgaxLwF4+s 9/Qij5V54bRFW72/4C5cYgKPR6zSgSXkqADwRjjwk2XDr6rE3k8PDYE/5SyIaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5vgs3pDKz14TG; Sun, 8 Dec 2024 19:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8J9joo055406; Sun, 8 Dec 2024 19:09:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8J9iZ9055403; Sun, 8 Dec 2024 19:09:44 GMT (envelope-from git) Date: Sun, 8 Dec 2024 19:09:44 GMT Message-Id: <202412081909.4B8J9iZ9055403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: ae316d1d1cff - main - MFV: file 5.46. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae316d1d1cffd71ab7751f94e10118777a88e027 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ae316d1d1cffd71ab7751f94e10118777a88e027 commit ae316d1d1cffd71ab7751f94e10118777a88e027 Merge: c6e56e6500fd 995a16e0c2eb Author: Xin LI AuthorDate: 2024-12-08 19:07:01 +0000 Commit: Xin LI CommitDate: 2024-12-08 19:08:17 +0000 MFV: file 5.46. MFC after: 2 weeks contrib/file/ChangeLog | 32 + contrib/file/Makefile.in | 1 + contrib/file/aclocal.m4 | 4 +- contrib/file/config.h.in | 137 +- contrib/file/configure | 3017 ++++++++++++-------- contrib/file/configure.ac | 35 +- contrib/file/doc/Makefile.in | 1 + contrib/file/doc/file.man | 6 +- contrib/file/doc/libmagic.man | 29 +- contrib/file/doc/magic.man | 112 +- contrib/file/ltmain.sh | 863 ++++-- contrib/file/m4/libtool.m4 | 227 +- contrib/file/m4/ltoptions.m4 | 4 +- contrib/file/m4/ltsugar.m4 | 2 +- contrib/file/m4/ltversion.m4 | 13 +- contrib/file/m4/lt~obsolete.m4 | 4 +- contrib/file/magic/Magdir/acorn | 35 +- contrib/file/magic/Magdir/adventure | 4 +- contrib/file/magic/Magdir/algol68 | 4 +- contrib/file/magic/Magdir/android | 14 +- contrib/file/magic/Magdir/animation | 126 +- contrib/file/magic/Magdir/apple | 58 +- contrib/file/magic/Magdir/archive | 291 +- contrib/file/magic/Magdir/aria | 2 + contrib/file/magic/Magdir/arm | 11 +- contrib/file/magic/Magdir/asf | 14 +- contrib/file/magic/Magdir/audio | 123 +- contrib/file/magic/Magdir/ber | 3 +- contrib/file/magic/Magdir/biosig | 6 +- contrib/file/magic/Magdir/bsdi | 9 +- contrib/file/magic/Magdir/c64 | 158 +- contrib/file/magic/Magdir/cafebabe | 91 +- contrib/file/magic/Magdir/cbor | 4 +- contrib/file/magic/Magdir/claris | 10 +- contrib/file/magic/Magdir/coff | 179 +- contrib/file/magic/Magdir/commands | 14 +- contrib/file/magic/Magdir/compress | 27 +- contrib/file/magic/Magdir/console | 426 ++- contrib/file/magic/Magdir/ctf | 1 + contrib/file/magic/Magdir/database | 41 +- contrib/file/magic/Magdir/dataone | 13 +- contrib/file/magic/Magdir/diff | 125 +- contrib/file/magic/Magdir/digital | 20 +- contrib/file/magic/Magdir/efi | 45 +- contrib/file/magic/Magdir/elf | 32 +- contrib/file/magic/Magdir/epoc | 37 +- contrib/file/magic/Magdir/espressif | 4 +- contrib/file/magic/Magdir/filesystems | 179 +- contrib/file/magic/Magdir/firmware | 146 +- contrib/file/magic/Magdir/fonts | 36 +- contrib/file/magic/Magdir/frame | 120 +- contrib/file/magic/Magdir/games | 78 +- contrib/file/magic/Magdir/gentoo | 22 +- contrib/file/magic/Magdir/geo | 6 +- contrib/file/magic/Magdir/geos | 11 +- contrib/file/magic/Magdir/hitachi-sh | 18 +- contrib/file/magic/Magdir/hp | 25 +- contrib/file/magic/Magdir/ibm370 | 14 +- contrib/file/magic/Magdir/ibm6000 | 9 +- contrib/file/magic/Magdir/iff | 23 +- contrib/file/magic/Magdir/images | 629 +++- contrib/file/magic/Magdir/ispell | 190 +- contrib/file/magic/Magdir/javascript | 29 +- contrib/file/magic/Magdir/jpeg | 55 +- contrib/file/magic/Magdir/keyman | 14 + contrib/file/magic/Magdir/lammps | 5 +- contrib/file/magic/Magdir/lauterbach | 7 + contrib/file/magic/Magdir/linux | 415 ++- contrib/file/magic/Magdir/lisp | 12 +- contrib/file/magic/Magdir/magic | 47 +- contrib/file/magic/Magdir/mail.news | 22 +- contrib/file/magic/Magdir/map | 3 +- contrib/file/magic/Magdir/meteorological | 17 +- contrib/file/magic/Magdir/mips | 180 +- contrib/file/magic/Magdir/mmdf | 23 +- contrib/file/magic/Magdir/motorola | 8 +- contrib/file/magic/Magdir/msdos | 1309 +++++++-- contrib/file/magic/Magdir/msooxml | 37 +- contrib/file/magic/Magdir/msvc | 13 +- contrib/file/magic/Magdir/msx | 31 +- contrib/file/magic/Magdir/music | 4 +- contrib/file/magic/Magdir/nasa | 3 +- contrib/file/magic/Magdir/ole2compounddocs | 54 +- contrib/file/magic/Magdir/olf | 14 +- contrib/file/magic/Magdir/pack | 101 + contrib/file/magic/Magdir/pc88 | 24 - contrib/file/magic/Magdir/pdp | 16 +- contrib/file/magic/Magdir/pgp | 140 +- contrib/file/magic/Magdir/plan9 | 8 +- contrib/file/magic/Magdir/printer | 28 +- contrib/file/magic/Magdir/python | 33 +- contrib/file/magic/Magdir/revision | 27 +- contrib/file/magic/Magdir/riff | 89 +- contrib/file/magic/Magdir/rpm | 12 +- contrib/file/magic/Magdir/sgml | 98 +- contrib/file/magic/Magdir/sharc | 6 +- contrib/file/magic/Magdir/sniffer | 8 +- contrib/file/magic/Magdir/sql | 95 +- contrib/file/magic/Magdir/ssh | 45 + contrib/file/magic/Magdir/ssl | 22 +- contrib/file/magic/Magdir/sun | 17 +- contrib/file/magic/Magdir/symbos | 3 +- contrib/file/magic/Magdir/terminfo | 14 +- contrib/file/magic/Magdir/uf2 | 40 +- contrib/file/magic/Magdir/uxn | 18 + contrib/file/magic/Magdir/varied.script | 5 +- contrib/file/magic/Magdir/vax | 4 +- contrib/file/magic/Magdir/virtual | 38 +- contrib/file/magic/Magdir/weak | 1 + contrib/file/magic/Magdir/windows | 167 +- contrib/file/magic/Magdir/wordprocessors | 50 +- contrib/file/magic/Magdir/xenix | 136 +- contrib/file/magic/Magdir/xilinx | 49 +- contrib/file/magic/Magdir/yara | 16 +- contrib/file/magic/Makefile.am | 7 +- contrib/file/magic/Makefile.in | 8 +- contrib/file/python/Makefile.in | 1 + contrib/file/src/Makefile.in | 1 + contrib/file/src/apprentice.c | 104 +- contrib/file/src/cdf.c | 108 +- contrib/file/src/cdf.h | 131 +- contrib/file/src/cdf_time.c | 22 +- contrib/file/src/compress.c | 77 +- contrib/file/src/der.c | 22 +- contrib/file/src/der.h | 4 +- contrib/file/src/encoding.c | 4 +- contrib/file/src/file.c | 10 +- contrib/file/src/file.h | 69 +- contrib/file/src/funcs.c | 19 +- contrib/file/src/is_csv.c | 9 +- contrib/file/src/magic.c | 27 +- contrib/file/src/magic.h.in | 5 +- contrib/file/src/mygetopt.h | 9 +- contrib/file/src/print.c | 50 +- contrib/file/src/readelf.c | 150 +- contrib/file/src/readelf.h | 31 + contrib/file/src/seccomp.c | 103 +- contrib/file/src/softmagic.c | 148 +- contrib/file/tests/Makefile.am | 21 + contrib/file/tests/Makefile.in | 22 + contrib/file/tests/keyman-0.result | 1 + contrib/file/tests/keyman-0.testfile | Bin 0 -> 1494 bytes contrib/file/tests/keyman-1.result | 1 + contrib/file/tests/keyman-1.testfile | Bin 0 -> 378 bytes contrib/file/tests/keyman-2.result | 1 + contrib/file/tests/keyman-2.testfile | Bin 0 -> 1092 bytes contrib/file/tests/multiple.result | 2 +- contrib/file/tests/rpm-v3.0-bin-aarch64.result | 1 + contrib/file/tests/rpm-v3.0-bin-aarch64.testfile | Bin 0 -> 6361 bytes contrib/file/tests/rpm-v3.0-bin-powerpc64.result | 1 + contrib/file/tests/rpm-v3.0-bin-powerpc64.testfile | Bin 0 -> 6309 bytes contrib/file/tests/rpm-v3.0-bin-s390x.result | 1 + contrib/file/tests/rpm-v3.0-bin-s390x.testfile | Bin 0 -> 6301 bytes contrib/file/tests/rpm-v3.0-bin-x86_64.result | 1 + contrib/file/tests/rpm-v3.0-bin-x86_64.testfile | Bin 0 -> 6365 bytes contrib/file/tests/rpm-v3.0-src.result | 1 + contrib/file/tests/rpm-v3.0-src.testfile | Bin 0 -> 6554 bytes contrib/file/tests/searchbug.magic | 12 + contrib/file/tests/searchbug.result | 1 + contrib/file/tests/searchbug.testfile | 1 + contrib/file/tests/uf2.result | 2 +- contrib/file/tests/utf16xmlsvg.result | 1 + contrib/file/tests/utf16xmlsvg.testfile | Bin 0 -> 5564 bytes lib/libmagic/config.h | 147 +- 164 files changed, 8963 insertions(+), 3905 deletions(-) diff --cc contrib/file/magic/Magdir/keyman index 000000000000,81d4d4ca0fc8..81d4d4ca0fc8 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/keyman +++ b/contrib/file/magic/Magdir/keyman diff --cc contrib/file/magic/Magdir/lauterbach index 000000000000,229157fce4e6..229157fce4e6 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/lauterbach +++ b/contrib/file/magic/Magdir/lauterbach diff --cc contrib/file/magic/Magdir/pack index 000000000000,e0f6835e8c84..e0f6835e8c84 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/pack +++ b/contrib/file/magic/Magdir/pack diff --cc contrib/file/magic/Magdir/uxn index 000000000000,a7910c550bc4..a7910c550bc4 mode 000000,100644..100644 --- a/contrib/file/magic/Magdir/uxn +++ b/contrib/file/magic/Magdir/uxn diff --cc contrib/file/src/apprentice.c index e795741d5e16,cf040cddd9e0..5289f8e87267 --- a/contrib/file/src/apprentice.c +++ b/contrib/file/src/apprentice.c @@@ -1135,12 -1137,24 +1137,26 @@@ apprentice_sort(const void *a, const vo const struct magic_entry *mb = CAST(const struct magic_entry *, b); size_t sa = file_magic_strength(ma->mp, ma->cont_count); size_t sb = file_magic_strength(mb->mp, mb->cont_count); - if (sa == sb) - return 0; - else if (sa > sb) - return -1; - else - return 1; + if (sa == sb) { + struct magic mpa = *ma->mp; + struct magic mpb = *mb->mp; + mpa.lineno = mpb.lineno = 0; + int x = memcmp(&mpa, &mpb, sizeof(mpa)); + if (x == 0) { + // Don't warn for DER + if (mpa.type == FILE_DER) + return 0; + file_magwarn1("Duplicate magic entry `%s'", + ma->mp->desc); ++#ifndef COMPILE_ONLY + file_mdump(ma->mp); + file_mdump(mb->mp); ++#endif + return 0; + } + return x > 0 ? -1 : 1; + } + return sa > sb ? -1 : 1; } /* diff --cc contrib/file/tests/keyman-0.result index 000000000000,b092464b82b9..b092464b82b9 mode 000000,100644..100644 --- a/contrib/file/tests/keyman-0.result +++ b/contrib/file/tests/keyman-0.result diff --cc contrib/file/tests/keyman-0.testfile index 000000000000,558a7b2d464c..558a7b2d464c mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/keyman-1.result index 000000000000,aa270a128ae5..aa270a128ae5 mode 000000,100644..100644 --- a/contrib/file/tests/keyman-1.result +++ b/contrib/file/tests/keyman-1.result diff --cc contrib/file/tests/keyman-1.testfile index 000000000000,9a5e835e04af..9a5e835e04af mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/keyman-2.result index 000000000000,a32b7f388edc..a32b7f388edc mode 000000,100644..100644 --- a/contrib/file/tests/keyman-2.result +++ b/contrib/file/tests/keyman-2.result diff --cc contrib/file/tests/keyman-2.testfile index 000000000000,9f4f8a691d67..9f4f8a691d67 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/rpm-v3.0-bin-aarch64.result index 000000000000,b173034cb8f8..b173034cb8f8 mode 000000,100644..100644 --- a/contrib/file/tests/rpm-v3.0-bin-aarch64.result +++ b/contrib/file/tests/rpm-v3.0-bin-aarch64.result diff --cc contrib/file/tests/rpm-v3.0-bin-aarch64.testfile index 000000000000,125fffa8f79b..125fffa8f79b mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/rpm-v3.0-bin-powerpc64.result index 000000000000,c4526e29b558..c4526e29b558 mode 000000,100644..100644 --- a/contrib/file/tests/rpm-v3.0-bin-powerpc64.result +++ b/contrib/file/tests/rpm-v3.0-bin-powerpc64.result diff --cc contrib/file/tests/rpm-v3.0-bin-powerpc64.testfile index 000000000000,8d8ded32ad7f..8d8ded32ad7f mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/rpm-v3.0-bin-s390x.result index 000000000000,0008d7e82da1..0008d7e82da1 mode 000000,100644..100644 --- a/contrib/file/tests/rpm-v3.0-bin-s390x.result +++ b/contrib/file/tests/rpm-v3.0-bin-s390x.result diff --cc contrib/file/tests/rpm-v3.0-bin-s390x.testfile index 000000000000,cb459adf5198..cb459adf5198 mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/rpm-v3.0-bin-x86_64.result index 000000000000,e3fcc7d9d40b..e3fcc7d9d40b mode 000000,100644..100644 --- a/contrib/file/tests/rpm-v3.0-bin-x86_64.result +++ b/contrib/file/tests/rpm-v3.0-bin-x86_64.result diff --cc contrib/file/tests/rpm-v3.0-bin-x86_64.testfile index 000000000000,9f1ecb3fea2f..9f1ecb3fea2f mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/rpm-v3.0-src.result index 000000000000,d21ce34cbe1c..d21ce34cbe1c mode 000000,100644..100644 --- a/contrib/file/tests/rpm-v3.0-src.result +++ b/contrib/file/tests/rpm-v3.0-src.result diff --cc contrib/file/tests/rpm-v3.0-src.testfile index 000000000000,f6bdce32771d..f6bdce32771d mode 000000,100644..100644 Binary files differ diff --cc contrib/file/tests/searchbug.magic index 000000000000,ec892aaef803..ec892aaef803 mode 000000,100644..100644 --- a/contrib/file/tests/searchbug.magic +++ b/contrib/file/tests/searchbug.magic diff --cc contrib/file/tests/searchbug.result index 000000000000,9110ff092dfd..9110ff092dfd mode 000000,100644..100644 --- a/contrib/file/tests/searchbug.result +++ b/contrib/file/tests/searchbug.result diff --cc contrib/file/tests/searchbug.testfile index 000000000000,eca7c592a9d7..eca7c592a9d7 mode 000000,100644..100644 --- a/contrib/file/tests/searchbug.testfile +++ b/contrib/file/tests/searchbug.testfile diff --cc contrib/file/tests/utf16xmlsvg.result index 000000000000,280377488e7c..280377488e7c mode 000000,100644..100644 --- a/contrib/file/tests/utf16xmlsvg.result +++ b/contrib/file/tests/utf16xmlsvg.result diff --cc contrib/file/tests/utf16xmlsvg.testfile index 000000000000,a92267299b98..a92267299b98 mode 000000,100644..100644 Binary files differ diff --cc lib/libmagic/config.h index 232d801a6512,000000000000..12cd382ab9bb mode 100644,000000..100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@@ -1,523 -1,0 +1,544 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define in built-in ELF support is used */ +#define BUILTIN_ELF 1 + +/* Enable bzlib compression support */ +/* #undef BZLIBSUPPORT */ + +/* Define for ELF core file support */ +#define ELFCORE 1 + - /* Define to 1 if you have the `asctime_r' function. */ ++/* Define to 1 if you have the 'asctime_r' function. */ +#define HAVE_ASCTIME_R 1 + - /* Define to 1 if you have the `asprintf' function. */ ++/* Define to 1 if you have the 'asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the header file. */ - /* #undef HAVE_BYTESWAP_H */ ++#ifndef __APPLE__ /* Cross building tools on macOS */ ++#define HAVE_BYTESWAP_H 1 ++#endif + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BZLIB_H */ + - /* Define to 1 if you have the `ctime_r' function. */ ++/* Define to 1 if you have the 'ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* HAVE_DAYLIGHT */ +/* #undef HAVE_DAYLIGHT */ + - /* Define to 1 if you have the declaration of `daylight', and to 0 if you ++/* Define to 1 if you have the declaration of 'daylight', and to 0 if you + don't. */ +#define HAVE_DECL_DAYLIGHT 0 + - /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. ++/* Define to 1 if you have the declaration of 'tzname', and to 0 if you don't. + */ +#define HAVE_DECL_TZNAME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + - /* Define to 1 if you have the `dprintf' function. */ ++/* Define to 1 if you have the 'dprintf' function. */ +#define HAVE_DPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + - /* Define to 1 if you have the `fmtcheck' function. */ ++/* Define to 1 if you have the 'fmtcheck' function. */ +#define HAVE_FMTCHECK 1 + - /* Define to 1 if you have the `fork' function. */ ++/* Define to 1 if you have the 'fork' function. */ +#define HAVE_FORK 1 + - /* Define to 1 if you have the `freelocale' function. */ ++/* Define to 1 if you have the 'freelocale' function. */ +#define HAVE_FREELOCALE 1 + - /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ ++/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ +#define HAVE_FSEEKO 1 + - /* Define to 1 if you have the `getline' function. */ ++/* Define to 1 if you have the 'getline' function. */ +#define HAVE_GETLINE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + - /* Define to 1 if you have the `getopt_long' function. */ ++/* Define to 1 if you have the 'getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + - /* Define to 1 if you have the `getpagesize' function. */ ++/* Define to 1 if you have the 'getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + - /* Define to 1 if you have the `gmtime_r' function. */ ++/* Define to 1 if you have the 'gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + - /* Define to 1 if the system has the type `intptr_t'. */ ++/* Define to 1 if the system has the type 'intptr_t'. */ +#define HAVE_INTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + - /* Define to 1 if you have the `bz2' library (-lbz2). */ ++/* Define to 1 if you have the 'bz2' library (-lbz2). */ +/* #undef HAVE_LIBBZ2 */ + - /* Define to 1 if you have the `gnurx' library (-lgnurx). */ ++/* Define to 1 if you have the 'gnurx' library (-lgnurx). */ +/* #undef HAVE_LIBGNURX */ + - /* Define to 1 if you have the `lz' library (-llz). */ ++/* Define to 1 if you have the 'lrzip' library (-llrzip). */ ++/* #undef HAVE_LIBLRZIP */ ++ ++/* Define to 1 if you have the 'lz' library (-llz). */ +/* #undef HAVE_LIBLZ */ + - /* Define to 1 if you have the `lzma' library (-llzma). */ ++/* Define to 1 if you have the 'lzma' library (-llzma). */ +/* #undef HAVE_LIBLZMA */ + - /* Define to 1 if you have the `seccomp' library (-lseccomp). */ ++/* Define to 1 if you have the 'seccomp' library (-lseccomp). */ +/* #undef HAVE_LIBSECCOMP */ + - /* Define to 1 if you have the `z' library (-lz). */ ++/* Define to 1 if you have the 'z' library (-lz). */ +#define HAVE_LIBZ 1 + - /* Define to 1 if you have the `zstd' library (-lzstd). */ ++/* Define to 1 if you have the 'zstd' library (-lzstd). */ +/* #undef HAVE_LIBZSTD */ + - /* Define to 1 if you have the `localtime_r' function. */ ++/* Define to 1 if you have the 'localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LRZIP_H */ ++ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LZLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LZMA_H */ + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if declares mbstate_t. */ +#define HAVE_MBSTATE_T 1 + - /* Define to 1 if you have the `memmem' function. */ ++/* Define to 1 if you have the 'memmem' function. */ +#define HAVE_MEMMEM 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + - /* Define to 1 if you have the `mkostemp' function. */ ++/* Define to 1 if you have the 'mkostemp' function. */ +#define HAVE_MKOSTEMP 1 + - /* Define to 1 if you have the `mkstemp' function. */ ++/* Define to 1 if you have the 'mkstemp' function. */ +#define HAVE_MKSTEMP 1 + - /* Define to 1 if you have a working `mmap' system call. */ ++/* Define to 1 if you have a working 'mmap' system call. */ +#define HAVE_MMAP 1 + - /* Define to 1 if you have the `newlocale' function. */ ++/* Define to 1 if you have the 'newlocale' function. */ +#define HAVE_NEWLOCALE 1 + - /* Define to 1 if you have the `pipe2' function. */ ++/* Define to 1 if you have the 'pipe2' function. */ +#ifndef __APPLE__ /* Cross building tools on macOS */ +#define HAVE_PIPE2 1 +#endif + - /* Define to 1 if you have the `posix_spawnp' function. */ ++/* Define to 1 if you have the 'posix_spawnp' function. */ +#define HAVE_POSIX_SPAWNP 1 + - /* Define to 1 if you have the `pread' function. */ ++/* Define to 1 if you have the 'pread' function. */ +#define HAVE_PREAD 1 + +/* Have sig_t type */ +#define HAVE_SIG_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SPAWN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + - /* Define to 1 if you have the `strcasestr' function. */ ++/* Define to 1 if you have the 'strcasestr' function. */ +#define HAVE_STRCASESTR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + - /* Define to 1 if you have the `strlcat' function. */ ++/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + - /* Define to 1 if you have the `strlcpy' function. */ ++/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + - /* Define to 1 if you have the `strndup' function. */ ++/* Define to 1 if you have the 'strndup' function. */ +#define HAVE_STRNDUP 1 + - /* Define to 1 if you have the `strtof' function. */ ++/* Define to 1 if you have the 'strtof' function. */ +#define HAVE_STRTOF 1 + +/* HAVE_STRUCT_OPTION */ +#define HAVE_STRUCT_OPTION 1 + - /* Define to 1 if `st_rdev' is a member of `struct stat'. */ ++/* Define to 1 if 'st_rdev' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_RDEV 1 + - /* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */ ++/* Define to 1 if 'tm_gmtoff' is a member of 'struct tm'. */ +#define HAVE_STRUCT_TM_TM_GMTOFF 1 + - /* Define to 1 if `tm_zone' is a member of `struct tm'. */ ++/* Define to 1 if 'tm_zone' is a member of 'struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BSWAP_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSMACROS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UTIME_H */ + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* HAVE_TM_ISDST */ +#define HAVE_TM_ISDST 1 + +/* HAVE_TM_ZONE */ +#define HAVE_TM_ZONE 1 + +/* HAVE_TZNAME */ +#define HAVE_TZNAME 1 + - /* Define to 1 if the system has the type `uintptr_t'. */ ++/* Define to 1 if the system has the type 'uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + - /* Define to 1 if you have the `uselocale' function. */ ++/* Define to 1 if you have the 'uselocale' function. */ +#define HAVE_USELOCALE 1 + - /* Define to 1 if you have the `utime' function. */ ++/* Define to 1 if you have the 'utime' function. */ +#define HAVE_UTIME 1 + - /* Define to 1 if you have the `utimes' function. */ ++/* Define to 1 if you have the 'utimes' function. */ +#define HAVE_UTIMES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + - /* Define to 1 if you have the `vasprintf' function. */ ++/* Define to 1 if you have the 'vasprintf' function. */ +#define HAVE_VASPRINTF 1 + - /* Define to 1 if you have the `vfork' function. */ ++/* Define to 1 if you have the 'vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCTYPE_H 1 + - /* Define to 1 if you have the `wcwidth' function. */ ++/* Define to 1 if you have the 'wcwidth' function. */ +#define HAVE_WCWIDTH 1 + - /* Define to 1 if `fork' works. */ ++/* Define to 1 if 'fork' works. */ +#define HAVE_WORKING_FORK 1 + - /* Define to 1 if `vfork' works. */ ++/* Define to 1 if 'vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* Define to 1 if you have the header file. */ +#ifndef __linux__ /* Cross building tools build with glibc on linux */ +#define HAVE_XLOCALE_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_ZLIB_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ZSTD_ERRORS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ZSTD_H */ + ++/* Enable lrziplib compression support */ ++/* #undef LRZIPLIBSUPPORT */ ++ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Enable lzlib compression support */ +/* #undef LZLIBSUPPORT */ + - /* Define to 1 if `major', `minor', and `makedev' are declared in . ++/* Define to 1 if 'major', 'minor', and 'makedev' are declared in . + */ +/* #undef MAJOR_IN_MKDEV */ + - /* Define to 1 if `major', `minor', and `makedev' are declared in ++/* Define to 1 if 'major', 'minor', and 'makedev' are declared in + . */ +/* #undef MAJOR_IN_SYSMACROS */ + +/* Name of package */ +#define PACKAGE "file" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "christos@astron.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "file" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "file 5.45" ++#define PACKAGE_STRING "file 5.46" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "file" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.45" ++#define PACKAGE_VERSION "5.46" + - /* Define to 1 if all of the C90 standard headers exist (not just the ones ++/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + - /* Define to 1 if your declares `struct tm'. */ ++/* Define to 1 if your declares 'struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + - /* Enable extensions on AIX 3, Interix. */ ++/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif ++/* Enable extensions specified by C23 Annex F. */ ++#ifndef __STDC_WANT_IEC_60559_EXT__ ++# define __STDC_WANT_IEC_60559_EXT__ 1 ++#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif - /* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ ++/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.45" ++#define VERSION "5.46" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Enable xzlib compression support */ +/* #undef XZLIBSUPPORT */ + +/* Enable zlib compression support */ +#define ZLIBSUPPORT 1 + +/* Enable zstdlib compression support */ +/* #undef ZSTDLIBSUPPORT */ + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + - /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++/* Define to 1 if necessary to make fseeko visible. */ +/* #undef _LARGEFILE_SOURCE */ + - /* Define for large files, on AIX-style hosts. */ ++/* Define to 1 on platforms where this makes off_t a 64-bit type. */ +/* #undef _LARGE_FILES */ + ++/* Number of bits in time_t, on hosts where this is settable. */ ++/* #undef _TIME_BITS */ ++ +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + ++/* Define to 1 on platforms where this makes time_t a 64-bit type. */ ++/* #undef __MINGW_USE_VC2005_COMPAT */ ++ +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of a signed integer type wide enough to hold a pointer, + if such a type exists, and if the system does not define it. */ +/* #undef intptr_t */ + +/* Define to a type if does not define. */ +/* #undef mbstate_t */ + - /* Define to `long int' if does not define. */ ++/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + - /* Define to `unsigned int' if does not define. */ ++/* Define as 'unsigned int' if doesn't define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ + - /* Define as `fork' if `vfork' does not work. */ ++/* Define as 'fork' if 'vfork' does not work. */ +/* #undef vfork */