Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2024-11-30 13:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Sat Nov 30 13:27:00 2024 rev:139 rq:1227112 version:5.46 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2024-11-09 20:52:43.440325150 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.28523/file.changes 2024-11-30 13:27:04.151764520 +0100 @@ -1,0 +2,29 @@ +Thu Nov 28 10:51:57 UTC 2024 - Dr. Werner Fink <[email protected]> + +- Update to 5.46: + * Add OFFPOSITIVE + * avoid leaking symbols in libmagic + * PR/562: jsummers: Search/regex offsets are absolute to the + beginning of the file, so adjust them by subtracting the + offset that the "use" starts so that we don't double-count it. + * PR/543: matshch: bump nbuf so we can get the flags into the buffer. + * Add Android elf notes (enh) + * Add limit for number of magic warnings allowed + * check regex bounds (found by clusterfuzz) +- Remove patch file-5.45-type_t.dif now upstream +- Port patches + * file-4.24-autoconf.dif + * file-5.17-option.dif + * file-5.18-javacheck.dif + * file-5.19-biorad.dif + * file-5.19-printf.dif + * file-5.19-zip2.0.dif + * file-5.22-elf.dif + * file-5.28-btrfs-image.dif + * file-5.45-type_t.dif + * file-secure_getenv.patch +- Port patch file-5.45.dif and rename it to file-5.46.dif + * Note that our kernel magics do not fit anymore as + upstream now has a huge rework and extended features + +------------------------------------------------------------------- Old: ---- file-5.45-type_t.dif file-5.45.dif file-5.45.tar.gz file-5.45.tar.gz.asc New: ---- file-5.46.dif file-5.46.tar.gz file-5.46.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.079803174 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.079803174 +0100 @@ -34,7 +34,7 @@ %endif # # Set Version also in python-magic.spec -Version: 5.45 +Version: 5.46 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -44,7 +44,7 @@ Source3: file-rpmlintrc Source4: https://www.astron.com/pub/file/file-%{version}.tar.gz.asc Source5: file.keyring -Patch0: file-5.45.dif +Patch0: file-5.46.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,8 +63,6 @@ Patch32: file-5.19-clicfs.dif Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif -# PATCH-FIX-UPSTREAM: Support max time_t on 32bit -Patch42: file-5.45-type_t.dif Patch43: file-seccomp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -110,7 +108,6 @@ %prep %setup -q -n file-%{version} -%patch -P 42 -p0 -b .t_t %patch -P 1 -p0 -b .misc %patch -P 4 -p0 -b .conf %patch -P 5 -p0 -b .tex ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.103804173 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.107804340 +0100 @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global _miscdir %{_datadir}/misc Name: python-magic -Version: 5.45 +Version: 5.46 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause ++++++ file-4.24-autoconf.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.171807006 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.175807173 +0100 @@ -38,7 +38,7 @@ #include <stdint.h> #endif -@@ -542,4 +545,5 @@ typedef struct { +@@ -573,4 +576,5 @@ typedef struct { #define DF_1_STUB 0x04000000 /* Stub */ #define DF_1_PIE 0x08000000 /* Position Independent Executable */ ++++++ file-5.17-option.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.187807673 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.191807839 +0100 @@ -2,7 +2,7 @@ =================================================================== --- file-5.43.orig/src/file.c +++ file-5.43/src/file.c -@@ -263,6 +263,8 @@ main(int argc, char *argv[]) +@@ -265,6 +265,8 @@ main(int argc, char *argv[]) break; case 'e': case OPT_EXCLUDE_QUIET: @@ -11,7 +11,7 @@ for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -275,7 +277,7 @@ main(int argc, char *argv[]) +@@ -277,7 +279,7 @@ main(int argc, char *argv[]) break; case 'f': @@ -20,7 +20,7 @@ usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -285,6 +287,8 @@ main(int argc, char *argv[]) +@@ -287,6 +289,8 @@ main(int argc, char *argv[]) ++didsomefiles; break; case 'F': @@ -29,7 +29,7 @@ separator = optarg; break; case 'i': -@@ -297,6 +301,8 @@ main(int argc, char *argv[]) +@@ -299,6 +303,8 @@ main(int argc, char *argv[]) action = FILE_LIST; break; case 'm': ++++++ file-5.18-javacheck.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.199808172 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.203808339 +0100 @@ -1,14 +1,18 @@ Index: magic/Magdir/cafebabe =================================================================== ---- magic/Magdir/cafebabe.orig -+++ magic/Magdir/cafebabe -@@ -17,7 +17,7 @@ - ### JAVA START ### - # Reference: http://en.wikipedia.org/wiki/Java_class_file - # Update: Joerg Jenderek +--- + magic/Magdir/cafebabe | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- magic/Magdir/cafebabe ++++ magic/Magdir/cafebabe 2024-11-28 08:56:12.978938091 +0000 +@@ -32,7 +32,7 @@ + # Reference: https://opensource.apple.com/source/cctools/cctools-949.0.1/ + # include/mach-o/fat.h + # include/mach/machine.h -0 belong 0xcafebabe +0 belong 0xcafebabe Cafe Babe - >4 ubelong >30 compiled Java class data, - !:mime application/x-java-applet - #!:mime application/java-byte-code + >4 belong 1 Mach-O universal binary with 1 architecture: + !:mime application/x-mach-binary + >>8 use mach-o \b ++++++ file-5.19-biorad.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.215808839 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.215808839 +0100 @@ -6,7 +6,7 @@ =================================================================== --- magic/Magdir/images.orig +++ magic/Magdir/images -@@ -2180,6 +2180,8 @@ +@@ -2378,6 +2378,8 @@ # https://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt # Samples: https://www.loci.wisc.edu/software/sample-data 14 uleshort <2 ++++++ file-5.19-printf.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.235809672 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.239809838 +0100 @@ -6,7 +6,7 @@ =================================================================== --- src/apprentice.c.orig +++ src/apprentice.c -@@ -2623,7 +2623,7 @@ check_format_type(const char *ptr, int t +@@ -2647,7 +2647,7 @@ check_format_type(const char *ptr, int t } } else h = 0; ++++++ file-5.19-zip2.0.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.251810339 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.251810339 +0100 @@ -1,19 +1,20 @@ --- - magic/Magdir/archive | 5 +++++ - 1 file changed, 5 insertions(+) + magic/Magdir/archive | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) --- magic/Magdir/archive -+++ magic/Magdir/archive 2023-07-28 09:40:12.243809381 +0000 -@@ -1622,6 +1622,11 @@ ++++ magic/Magdir/archive 2024-11-28 08:59:31.099299217 +0000 +@@ -1793,7 +1793,11 @@ 0 string PK\x07\x08PK\x03\x04 Zip multi-volume archive data, at least PKZIP v2.50 to extract !:mime application/zip !:ext zip/cbz +- +>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract +>>34 ubelong 0x74797065 \b, mime type +>>>38 regex application/[a-z+-]+ \b %s -+!:mime application/unknown+zip ++!:mime application/unknown+zip +!:ext zip/cbz - # Android APK file (Zip archive) 0 string PK\003\004 + !:strength +1 ++++++ file-5.22-elf.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.263810838 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.267811004 +0100 @@ -6,7 +6,7 @@ =================================================================== --- src/readelf.c.orig +++ src/readelf.c -@@ -825,7 +825,7 @@ do_core_note(struct magic_set *ms, unsig +@@ -884,7 +884,7 @@ do_core_note(struct magic_set *ms, unsig default: if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { @@ -15,7 +15,7 @@ unsigned char c; /* * Extract the program name. We assume -@@ -837,7 +837,9 @@ do_core_note(struct magic_set *ms, unsig +@@ -896,7 +896,9 @@ do_core_note(struct magic_set *ms, unsig * If the characters aren't all printable, * reject it. */ ++++++ file-5.28-btrfs-image.dif ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.279811505 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.283811671 +0100 @@ -17,7 +17,7 @@ =================================================================== --- file-5.43.orig/magic/Magdir/filesystems +++ file-5.43/magic/Magdir/filesystems -@@ -2257,20 +2257,29 @@ +@@ -2277,20 +2277,29 @@ >>0x10060 string >\0 lockproto %s) # Russell Coker <[email protected]> ++++++ file-5.45-type_t.dif -> file-5.46.dif ++++++ ++++ 643 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/file/file-5.45-type_t.dif ++++ and /work/SRC/openSUSE:Factory/.file.new.28523/file-5.46.dif ++++++ file-5.45.tar.gz -> file-5.46.tar.gz ++++++ ++++ 23577 lines of diff (skipped) ++++++ file-secure_getenv.patch ++++++ --- /var/tmp/diff_new_pack.ZtjcTe/_old 2024-11-30 13:27:05.563823334 +0100 +++ /var/tmp/diff_new_pack.ZtjcTe/_new 2024-11-30 13:27:05.563823334 +0100 @@ -6,7 +6,7 @@ --- file-5.42/configure.ac +++ file-5.42/configure.ac 2022-06-13 08:34:50.347521415 +0000 -@@ -130,6 +130,8 @@ if test "$enable_xzlib" != "no"; then +@@ -138,6 +138,8 @@ if test "$enable_xzlib" != "no"; then fi AC_CHECK_TYPE([sig_t],[AC_DEFINE([HAVE_SIG_T],1,[Have sig_t type])],,[#include <signal.h>]) @@ -17,7 +17,7 @@ AC_TYPE_SIZE_T --- file-5.42/src/file.h +++ file-5.42/src/file.h 2022-06-13 08:34:50.347521415 +0000 -@@ -726,4 +726,12 @@ static const char *rcsid(const char *p) +@@ -735,4 +735,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif
