diff --git a/abi_libs b/abi_libs new file mode 100644 --- /dev/null +++ b/abi_libs @@ -0,0 +1 @@ +libmagic.so.1 diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -1,3 +1,4 @@ +libmagic.so.1:accept_ranges libmagic.so.1:buffer_apprentice libmagic.so.1:buffer_fill libmagic.so.1:buffer_fini @@ -46,11 +47,13 @@ libmagic.so.1:file_buffer libmagic.so.1:file_check_mem libmagic.so.1:file_checkfmt +libmagic.so.1:file_clear_closexec libmagic.so.1:file_copystr libmagic.so.1:file_default libmagic.so.1:file_encoding libmagic.so.1:file_error libmagic.so.1:file_fmttime +libmagic.so.1:file_formats libmagic.so.1:file_fsmagic libmagic.so.1:file_getbuffer libmagic.so.1:file_is_csv @@ -63,9 +66,13 @@ libmagic.so.1:file_mdump libmagic.so.1:file_ms_alloc libmagic.so.1:file_ms_free +libmagic.so.1:file_names +libmagic.so.1:file_nformats +libmagic.so.1:file_nnames libmagic.so.1:file_oomem libmagic.so.1:file_parse_guid libmagic.so.1:file_pipe2file +libmagic.so.1:file_pipe_closexec libmagic.so.1:file_pop_buffer libmagic.so.1:file_print_guid libmagic.so.1:file_printable @@ -84,6 +91,7 @@ libmagic.so.1:file_showstr libmagic.so.1:file_signextend libmagic.so.1:file_softmagic +libmagic.so.1:file_strtrim libmagic.so.1:file_trycdf libmagic.so.1:file_tryelf libmagic.so.1:file_vprintf diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,3 +1,4 @@ libbz2.so.1.0 libc.so.6 +liblzma.so.5 libz.so.1 diff --git a/abi_used_symbols b/abi_used_symbols new file mode 100644 --- /dev/null +++ b/abi_used_symbols @@ -0,0 +1,125 @@ +libbz2.so.1.0:BZ2_bzDecompress +libbz2.so.1.0:BZ2_bzDecompressEnd +libbz2.so.1.0:BZ2_bzDecompressInit +libc.so.6:__asprintf_chk +libc.so.6:__assert_fail +libc.so.6:__ctype_b_loc +libc.so.6:__ctype_tolower_loc +libc.so.6:__ctype_toupper_loc +libc.so.6:__dprintf_chk +libc.so.6:__errno_location +libc.so.6:__fdelt_chk +libc.so.6:__fprintf_chk +libc.so.6:__fxstat +libc.so.6:__getdelim +libc.so.6:__isoc99_sscanf +libc.so.6:__libc_start_main +libc.so.6:__lxstat +libc.so.6:__memcpy_chk +libc.so.6:__pread_chk +libc.so.6:__printf_chk +libc.so.6:__read_chk +libc.so.6:__snprintf_chk +libc.so.6:__stack_chk_fail +libc.so.6:__vasprintf_chk +libc.so.6:__vfprintf_chk +libc.so.6:__xstat +libc.so.6:_exit +libc.so.6:abort +libc.so.6:access +libc.so.6:asctime_r +libc.so.6:calloc +libc.so.6:close +libc.so.6:closedir +libc.so.6:ctime_r +libc.so.6:dup2 +libc.so.6:execvp +libc.so.6:exit +libc.so.6:fclose +libc.so.6:fcntl +libc.so.6:fflush +libc.so.6:fopen +libc.so.6:fork +libc.so.6:fputc +libc.so.6:fputs +libc.so.6:free +libc.so.6:freelocale +libc.so.6:fwrite +libc.so.6:getenv +libc.so.6:getopt_long +libc.so.6:gmtime_r +libc.so.6:ioctl +libc.so.6:iswprint +libc.so.6:localtime_r +libc.so.6:lseek +libc.so.6:malloc +libc.so.6:mbrtowc +libc.so.6:memchr +libc.so.6:memcmp +libc.so.6:memcpy +libc.so.6:memmem +libc.so.6:memmove +libc.so.6:memset +libc.so.6:mkstemp +libc.so.6:mktime +libc.so.6:mmap +libc.so.6:mprotect +libc.so.6:munmap +libc.so.6:newlocale +libc.so.6:open +libc.so.6:opendir +libc.so.6:optarg +libc.so.6:optind +libc.so.6:pipe2 +libc.so.6:pread +libc.so.6:putc +libc.so.6:puts +libc.so.6:qsort +libc.so.6:read +libc.so.6:readdir +libc.so.6:readlink +libc.so.6:realloc +libc.so.6:regcomp +libc.so.6:regerror +libc.so.6:regexec +libc.so.6:regfree +libc.so.6:rewind +libc.so.6:select +libc.so.6:setlocale +libc.so.6:sigaction +libc.so.6:snprintf +libc.so.6:stderr +libc.so.6:stdin +libc.so.6:stdout +libc.so.6:strcasestr +libc.so.6:strchr +libc.so.6:strcmp +libc.so.6:strcspn +libc.so.6:strdup +libc.so.6:strerror +libc.so.6:strlen +libc.so.6:strncmp +libc.so.6:strndup +libc.so.6:strrchr +libc.so.6:strstr +libc.so.6:strtod +libc.so.6:strtof +libc.so.6:strtol +libc.so.6:strtoul +libc.so.6:strtoull +libc.so.6:umask +libc.so.6:unlink +libc.so.6:uselocale +libc.so.6:utimes +libc.so.6:vfork +libc.so.6:waitpid +libc.so.6:wcwidth +libc.so.6:write +liblzma.so.5:lzma_auto_decoder +liblzma.so.5:lzma_code +liblzma.so.5:lzma_end +libz.so.1:inflate +libz.so.1:inflateEnd +libz.so.1:inflateInit2_ +libz.so.1:inflateInit_ +libz.so.1:zError diff --git a/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch b/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch new file mode 100644 --- /dev/null +++ b/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch @@ -0,0 +1,165 @@ +From 0fdada3f2cccf1228b61eecddbc9450647e9455d Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sun, 4 Apr 2021 18:02:15 +0200 +Subject: [File] [PATCH] Use unsigned datatypes for filesystem UUIDs + +Fixes a regression introduced in 0478d9251abafd0876cdb3121ef2c07af6c99513 + +Reported-By: Richard W.M. Jones +Reporated-At: https://bugs.astron.com/view.php?id=253 +Reporated-At: https://bugzilla.redhat.com/show_bug.cgi?id=1945122 +--- + magic/Magdir/filesystems | 52 +++++++++++++++++++-------------------- + magic/Magdir/linux | 28 ++++++++++----------- + tests/ext4.result | 1 + + tests/ext4.testfile | Bin 0 -> 2048 bytes + 4 files changed, 41 insertions(+), 40 deletions(-) + create mode 100644 tests/ext4.result + create mode 100644 tests/ext4.testfile + +diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems +index 0cb45cbf..14ee70f3 100644 +--- a/magic/Magdir/filesystems ++++ b/magic/Magdir/filesystems +@@ -1739,12 +1739,12 @@ + >>>0x464 lelong >0x0000007 ext4 filesystem data + # else large INCOMPAT? + >>0x460 lelong >0x000003f ext4 filesystem data +->0x468 belong x \b, UUID=%08x +->0x46c beshort x \b-%04x +->0x46e beshort x \b-%04x +->0x470 beshort x \b-%04x +->0x472 belong x \b-%08x +->0x476 beshort x \b%04x ++>0x468 ubelong x \b, UUID=%08x ++>0x46c ubeshort x \b-%04x ++>0x46e ubeshort x \b-%04x ++>0x470 ubeshort x \b-%04x ++>0x472 ubelong x \b-%08x ++>0x476 ubeshort x \b%04x + >0x478 string >0 \b, volume name "%s" + # General flags for any ext* fs + >0x460 lelong &0x0000004 (needs journal recovery) +@@ -1767,12 +1767,12 @@ + + # f2fs filesystem - Tuomas Tynkkynen + 0x400 lelong 0xF2F52010 F2FS filesystem +->0x46c belong x \b, UUID=%08x +->0x470 beshort x \b-%04x +->0x472 beshort x \b-%04x +->0x474 beshort x \b-%04x +->0x476 belong x \b-%08x +->0x47a beshort x \b%04x ++>0x46c ubelong x \b, UUID=%08x ++>0x470 ubeshort x \b-%04x ++>0x472 ubeshort x \b-%04x ++>0x474 ubeshort x \b-%04x ++>0x476 ubelong x \b-%08x ++>0x47a ubeshort x \b%04x + >0x147c lestring16 x \b, volume name "%s" + + # Minix filesystems - Juan Cespedes +@@ -2296,20 +2296,20 @@ + >>0x10060 string >\0 lockproto %s) + + # Russell Coker +-0x10040 string _BHRfS_M BTRFS Filesystem +->0x1012b string >\0 label "%s", +->0x10090 lelong x sectorsize %d, +->0x10094 lelong x nodesize %d, +->0x10098 lelong x leafsize %d, +->0x10020 belong x UUID=%08x- +->0x10024 beshort x \b%04x- +->0x10026 beshort x \b%04x- +->0x10028 beshort x \b%04x- +->0x1002a beshort x \b%04x +->0x1002c belong x \b%08x, +->0x10078 lequad x %lld/ +->0x10070 lequad x \b%lld bytes used, +->0x10088 lequad x %lld devices ++0x10040 string _BHRfS_M BTRFS Filesystem ++>0x1012b string >\0 label "%s", ++>0x10090 lelong x sectorsize %d, ++>0x10094 lelong x nodesize %d, ++>0x10098 lelong x leafsize %d, ++>0x10020 ubelong x UUID=%08x- ++>0x10024 ubeshort x \b%04x- ++>0x10026 ubeshort x \b%04x- ++>0x10028 ubeshort x \b%04x- ++>0x1002a ubeshort x \b%04x ++>0x1002c ubelong x \b%08x, ++>0x10078 lequad x %lld/ ++>0x10070 lequad x \b%lld bytes used, ++>0x10088 lequad x %lld devices + + # dvdisaster's .ecc + # From: "Nelson A. de Oliveira" +diff --git a/magic/Magdir/linux b/magic/Magdir/linux +index 693cef6f..3203fce8 100644 +--- a/magic/Magdir/linux ++++ b/magic/Magdir/linux +@@ -83,20 +83,20 @@ + + # format v1, supported since 1998 + 0 name linux-swap +->0x400 lelong 1 little endian, version %u, +->>0x404 lelong x size %u pages, +->>0x408 lelong x %u bad pages, +->0x400 belong 1 big endian, version %u, +->>0x404 belong x size %u pages, +->>0x408 belong x %u bad pages, +->0x41c string \0 no label, +->0x41c string >\0 LABEL=%s, +->0x40c belong x UUID=%08x +->0x410 beshort x \b-%04x +->0x412 beshort x \b-%04x +->0x414 beshort x \b-%04x +->0x416 belong x \b-%08x +->0x41a beshort x \b%04x ++>0x400 lelong 1 little endian, version %u, ++>>0x404 lelong x size %u pages, ++>>0x408 lelong x %u bad pages, ++>0x400 belong 1 big endian, version %u, ++>>0x404 belong x size %u pages, ++>>0x408 belong x %u bad pages, ++>0x41c string \0 no label, ++>0x41c string >\0 LABEL=%s, ++>0x40c ubelong x UUID=%08x ++>0x410 ubeshort x \b-%04x ++>0x412 ubeshort x \b-%04x ++>0x414 ubeshort x \b-%04x ++>0x416 ubelong x \b-%08x ++>0x41a ubeshort x \b%04x + + 0xff6 string SWAPSPACE2 Linux swap file, 4k page size, + >0 use linux-swap +diff --git a/tests/ext4.result b/tests/ext4.result +new file mode 100644 +index 00000000..e48ac193 +--- /dev/null ++++ b/tests/ext4.result +@@ -0,0 +1 @@ ++Linux rev 1.0 ext4 filesystem data, UUID=d32bbb08-3a76-4510-a064-3045f887dbdf (extents) (64bit) (large files) (huge files) +\ No newline at end of file +diff --git a/tests/ext4.testfile b/tests/ext4.testfile +new file mode 100644 +index 0000000000000000000000000000000000000000..6add6b92a62f6cdda64f07adaa860d5102963b17 +GIT binary patch +literal 2048 +zcmZQz7zLvtFd70QH3S4e9_L_SNCQ%Lm>C#YfixpX3P +zo)N4L!UswK0Zbn^klg^pHb8uciGd-Tg@NI+_HGWVGFO2GDF&`T+HcjvYxt=jI(^WOQKQfy#pX!S$J$0q9gX0QpA|h(R>SWMv=*g~JD6 +pIGF%xOaKcdgbXZ95F!i=EI>h!S;Gm4AqU)W^4Ku;i*I5x7XVZUAejIF + +literal 0 +HcmV?d00001 + + +base-commit: 2f62d5544d13ca32dc09504ec70358db581e9e65 +-- +2.31.1 + +-- +File mailing list +File@astron.com +https://mailman.astron.com/mailman/listinfo/file diff --git a/files/encoding-Fix-backward-compatibility-with-5.39.patch b/files/encoding-Fix-backward-compatibility-with-5.39.patch new file mode 100644 --- /dev/null +++ b/files/encoding-Fix-backward-compatibility-with-5.39.patch @@ -0,0 +1,34 @@ +From b649025fa917c0dc80ed70fa9cd24d5dec9450e0 Mon Sep 17 00:00:00 2001 +From: Anatol Belski +Date: Sun, 4 Apr 2021 22:10:27 +0200 +Subject: [File] [PATCH] encoding: Fix backward compatibility with 5.39 + +If a file contains just a short ascii string with repeating bytes, the +behavior won't be same as before 5.40. This ensures all the bytes have +been taken into account. + +Signed-off-by: Anatol Belski +--- + src/encoding.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/encoding.c b/src/encoding.c +index c8b40439..bf28b997 100644 +--- a/src/encoding.c ++++ b/src/encoding.c +@@ -283,7 +283,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \ + u = 0; \ + for (i = 0; i < __arraycount(dist); i++) { \ + if (dist[i]) \ +- u++; \ ++ u += dist[i]; \ + } \ + if (u < 3) \ + return 0; \ +-- +2.30.2 + +-- +File mailing list +File@astron.com +https://mailman.astron.com/mailman/listinfo/file diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : file -version : '5.39' -release : 20 +version : '5.40' +release : 21 source : - - https://github.com/file/file/archive/FILE5_39.tar.gz : 6c136f512bf4851b06de4d829ba4df8cbffc1ab1ecfbc1a4ded88a7c4f8c4180 + - https://github.com/file/file/archive/FILE5_40.tar.gz : 35488116b068042320374f60e505e37c2c61b899402f9968e070b63dc39286d4 homepage : http://www.darwinsys.com/file license : BSD-2-Clause component : system.base @@ -13,8 +13,11 @@ builddeps : - pkgconfig(liblzma) - bzip2-devel + - git setup : | %patch -p1 < $pkgfiles/change-dest-for-mgc-file.patch + %patch -p1 < $pkgfiles/encoding-Fix-backward-compatibility-with-5.39.patch + git apply -p1 < $pkgfiles/Use-unsigned-datatypes-for-filesystem-UUIDs.patch %reconfigure --disable-static --enable-shared build : | %make diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ file http://www.darwinsys.com/file - Joshua Strobl - joshua@streambits.io + Martin Reboredo + yakoyoku@gmail.com BSD-2-Clause system.base @@ -37,7 +37,7 @@ system.devel - file + file /usr/include/magic.h @@ -46,12 +46,12 @@ - - 2020-07-15 - 5.39 + + 2021-04-08 + 5.40 Packaging update - Joshua Strobl - joshua@streambits.io + Martin Reboredo + yakoyoku@gmail.com \ No newline at end of file