Page MenuHomeSolus
Files F11034400

D12099.id30802.diff
No OneTemporary
Actions

D12099.id30802.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,102 +1,3 @@
-libmagic.so.1:accept_ranges
-libmagic.so.1:buffer_apprentice
-libmagic.so.1:buffer_fill
-libmagic.so.1:buffer_fini
-libmagic.so.1:buffer_init
-libmagic.so.1:cdf_count_chain
-libmagic.so.1:cdf_ctime
-libmagic.so.1:cdf_find_stream
-libmagic.so.1:cdf_print_classid
-libmagic.so.1:cdf_print_elapsed_time
-libmagic.so.1:cdf_print_property_name
-libmagic.so.1:cdf_read_dir
-libmagic.so.1:cdf_read_doc_summary_info
-libmagic.so.1:cdf_read_header
-libmagic.so.1:cdf_read_long_sector_chain
-libmagic.so.1:cdf_read_property_info
-libmagic.so.1:cdf_read_sat
-libmagic.so.1:cdf_read_sector
-libmagic.so.1:cdf_read_sector_chain
-libmagic.so.1:cdf_read_short_sector
-libmagic.so.1:cdf_read_short_sector_chain
-libmagic.so.1:cdf_read_short_stream
-libmagic.so.1:cdf_read_ssat
-libmagic.so.1:cdf_read_summary_info
-libmagic.so.1:cdf_read_user_stream
-libmagic.so.1:cdf_swap_class
-libmagic.so.1:cdf_swap_dir
-libmagic.so.1:cdf_swap_header
-libmagic.so.1:cdf_timespec_to_timestamp
-libmagic.so.1:cdf_timestamp_to_timespec
-libmagic.so.1:cdf_tole2
-libmagic.so.1:cdf_tole4
-libmagic.so.1:cdf_tole8
-libmagic.so.1:cdf_u16tos8
-libmagic.so.1:cdf_unpack_catalog
-libmagic.so.1:cdf_unpack_dir
-libmagic.so.1:cdf_unpack_header
-libmagic.so.1:cdf_unpack_summary_info
-libmagic.so.1:cdf_zero_stream
-libmagic.so.1:der_cmp
-libmagic.so.1:der_offs
-libmagic.so.1:file_apprentice
-libmagic.so.1:file_ascmagic
-libmagic.so.1:file_ascmagic_with_encoding
-libmagic.so.1:file_badread
-libmagic.so.1:file_badseek
-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
-libmagic.so.1:file_is_json
-libmagic.so.1:file_is_tar
-libmagic.so.1:file_looks_utf8
-libmagic.so.1:file_magerror
-libmagic.so.1:file_magicfind
-libmagic.so.1:file_magwarn
-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
-libmagic.so.1:file_printedlen
-libmagic.so.1:file_printf
-libmagic.so.1:file_pstring_get_length
-libmagic.so.1:file_pstring_length_size
-libmagic.so.1:file_push_buffer
-libmagic.so.1:file_regcomp
-libmagic.so.1:file_regerror
-libmagic.so.1:file_regexec
-libmagic.so.1:file_regfree
-libmagic.so.1:file_replace
-libmagic.so.1:file_reset
-libmagic.so.1:file_separator
-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
-libmagic.so.1:file_zmagic
-libmagic.so.1:fmtcheck
libmagic.so.1:magic_buffer
libmagic.so.1:magic_check
libmagic.so.1:magic_close
@@ -115,6 +16,3 @@
libmagic.so.1:magic_setflags
libmagic.so.1:magic_setparam
libmagic.so.1:magic_version
-libmagic.so.1:sread
-libmagic.so.1:strlcat
-libmagic.so.1:strlcpy
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -10,11 +10,9 @@
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
@@ -23,7 +21,6 @@
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
@@ -44,6 +41,7 @@
libc.so.6:fputs
libc.so.6:free
libc.so.6:freelocale
+libc.so.6:fstat
libc.so.6:fwrite
libc.so.6:getenv
libc.so.6:getopt_long
@@ -52,6 +50,7 @@
libc.so.6:iswprint
libc.so.6:localtime_r
libc.so.6:lseek
+libc.so.6:lstat
libc.so.6:malloc
libc.so.6:mbrtowc
libc.so.6:memchr
@@ -88,6 +87,7 @@
libc.so.6:setlocale
libc.so.6:sigaction
libc.so.6:snprintf
+libc.so.6:stat
libc.so.6:stderr
libc.so.6:stdin
libc.so.6:stdout
diff --git a/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch b/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch
deleted file mode 100644
--- a/files/Use-unsigned-datatypes-for-filesystem-UUIDs.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 0fdada3f2cccf1228b61eecddbc9450647e9455d Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-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 <rjones@redhat.com>
-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 <tuomas.tynkkynen@iki.fi>
- 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 <cespedes@debian.org>
-@@ -2296,20 +2296,20 @@
- >>0x10060 string >\0 lockproto %s)
-
- # Russell Coker <russell@coker.com.au>
--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" <naoliv@gmail.com>
-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#YfixpX3<eZ{3?K%p12T25WhO8%{Qn>P
-zo)N4L!UswK0Zbn^klg^pHb8uciGd-Tg@NI+_HGWVGFO2GDF&`T+Hc<nO3?uDW0(o_
-z8XT;9zbXHrk*Cc>jvYxt=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
deleted file mode 100644
--- a/files/encoding-Fix-backward-compatibility-with-5.39.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b649025fa917c0dc80ed70fa9cd24d5dec9450e0 Mon Sep 17 00:00:00 2001
-From: Anatol Belski <ab@php.net>
-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 <ab@php.net>
----
- 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.40'
-release : 21
+version : '5.41'
+release : 22
source :
- - https://github.com/file/file/archive/FILE5_40.tar.gz : 35488116b068042320374f60e505e37c2c61b899402f9968e070b63dc39286d4
+ - https://github.com/file/file/archive/refs/tags/FILE5_41.tar.gz : 088fd09e8f2f7e8fda05e07ba9586df8708e1676a44db207b4496bd44e7f49f4
homepage : http://www.darwinsys.com/file
license : BSD-2-Clause
component : system.base
@@ -16,8 +16,6 @@
- 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
@@ -27,7 +25,7 @@
%make check
# If these don't pass, ypkg will create very broken packages
- TEST1=`file /usr/lib64/libc-2.31.so | grep "ELF 64-bit LSB shared object" | wc -l`
+ TEST1=`file /usr/lib64/libc-2.33.so | grep "ELF 64-bit LSB shared object" | wc -l`
TEST2=`file /usr/bin/file | grep "ELF 64-bit LSB executable" | wc -l`
if [ $TEST1 -eq 0 ]; then
echo "Failed TEST1"
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -37,7 +37,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="21">file</Dependency>
+ <Dependency release="22">file</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/magic.h</Path>
@@ -46,12 +46,12 @@
</Files>
</Package>
<History>
- <Update release="21">
- <Date>2021-04-08</Date>
- <Version>5.40</Version>
+ <Update release="22">
+ <Date>2021-10-26</Date>
+ <Version>5.41</Version>
<Comment>Packaging update</Comment>
<Name>Martin Reboredo</Name>
<Email>yakoyoku@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 4:47 PM (1 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5800224
Default Alt Text
D12099.id30802.diff (13 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.