Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2022-06-16 18:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Thu Jun 16 18:19:35 2022 rev:128 rq:982386 version:5.42 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2022-04-30 22:52:03.188184907 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1548/file.changes 2022-06-16 18:19:39.668032948 +0200 @@ -1,0 +2,29 @@ +Mon Jun 13 08:45:48 UTC 2022 - Dr. Werner Fink <wer...@suse.de> + +- Update to 5.42: + * PR/348: add missing cases to prevent file from aborting on + random magic files. + * PR/351: octalify filenames when not raw before printing. + * fix regex cacheing bug (Dirk Mueller) + * merge file_regcomp and file_regerror() to simplify the code + and reduce memory requirements for storing regexes (Dirk Mueller) + * cache regex (Dirk Mueller) + * detect filesystem full by flushing output (Dirk Mueller) + * implement running decompressor programs using + posix_spawnp(2) instead of vfork(2) + * Add support for msdos dates and times + * use the system byte swapping functions if available (Werner Fink) +- Port patches + * file-5.17-option.dif + * file-5.19-biorad.dif + * file-5.19-printf.dif + * file-5.19-zip2.0.dif + * file-5.28-btrfs-image.dif + * file-secure_getenv.patch +- Remove patches now upstream + * file-5.23-endian.patch + * file-5.41-cache-regexps-locale-restore.patch + * file-5.41-cache-regexps.patch +- Port and rename patch file-5.41.dif which is now file-5.42.dif + +------------------------------------------------------------------- Old: ---- file-5.23-endian.patch file-5.41-cache-regexps-locale-restore.patch file-5.41-cache-regexps.patch file-5.41.dif file-5.41.tar.gz file-5.41.tar.gz.asc New: ---- file-5.42.dif file-5.42.tar.gz file-5.42.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.576034239 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.584034251 +0200 @@ -33,7 +33,7 @@ %endif # # Set Version also in python-magic.spec -Version: 5.41 +Version: 5.42 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -43,7 +43,7 @@ Source3: file-rpmlintrc Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc Source5: file.keyring -Patch: file-5.41.dif +Patch: file-5.42.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -60,11 +60,8 @@ Patch27: file-5.19-zip2.0.dif Patch31: file-5.19-biorad.dif Patch32: file-5.19-clicfs.dif -Patch34: file-5.23-endian.patch Patch37: file-secure_getenv.patch -Patch38: file-5.41-cache-regexps.patch Patch39: file-5.28-btrfs-image.dif -Patch40: file-5.41-cache-regexps-locale-restore.patch # Upstream commits as patches BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -125,11 +122,8 @@ %patch27 -p0 -b .zip2.0 %patch31 -p0 -b .biorad %patch32 -p0 -b .clicfs -%patch34 -p0 -b .endian %patch37 -p1 -b .getenv -%patch38 -p1 -b .regexp %patch39 -p1 -b .btrfs -%patch40 -p1 -b .locale %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.600034274 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.604034279 +0200 @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global _miscdir %{_datadir}/misc Name: python-magic -Version: 5.41 +Version: 5.42 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause ++++++ file-5.17-option.dif ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.640034330 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.644034336 +0200 @@ -1,6 +1,6 @@ --- file-5.39/src/file.c.orig 2020-06-17 16:13:36.625305367 +0200 +++ file-5.39/src/file.c 2020-06-17 16:15:12.429553163 +0200 -@@ -251,6 +251,8 @@ +@@ -254,6 +254,8 @@ break; case 'e': case OPT_EXCLUDE_QUIET: @@ -9,7 +9,7 @@ for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -263,7 +265,7 @@ +@@ -266,7 +268,7 @@ break; case 'f': @@ -18,7 +18,7 @@ usage(); if (magic == NULL) if ((magic = load(magicfile, flags)) == NULL) -@@ -273,6 +275,8 @@ +@@ -276,6 +278,8 @@ ++didsomefiles; break; case 'F': @@ -27,7 +27,7 @@ separator = optarg; break; case 'i': -@@ -285,6 +289,8 @@ +@@ -288,6 +292,8 @@ action = FILE_LIST; break; case 'm': ++++++ file-5.19-biorad.dif ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.656034353 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.656034353 +0200 @@ -3,14 +3,14 @@ 1 file changed, 2 insertions(+) --- magic/Magdir/images -+++ magic/Magdir/images 2019-05-27 08:52:51.674238380 +0000 -@@ -1566,6 +1566,8 @@ ++++ magic/Magdir/images 2022-06-13 08:30:37.596139595 +0000 +@@ -1951,6 +1951,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 leshort <2 -+>4 leshort >0 -+>49 byte 0 - >62 leshort <2 - >>54 leshort 12345 Bio-Rad .PIC Image File - >>>0 leshort >0 %d x + 14 uleshort <2 ++>4 uleshort >0 ++>49 byte 0 + >62 uleshort <2 + >>54 uleshort 12345 Bio-Rad .PIC Image File + >>>0 uleshort >0 %d x ++++++ file-5.19-printf.dif ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.672034376 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.672034376 +0200 @@ -4,7 +4,7 @@ --- src/apprentice.c +++ src/apprentice.c 2021-10-19 08:52:01.991343421 +0000 -@@ -2489,7 +2489,7 @@ check_format_type(const char *ptr, int t +@@ -2608,7 +2608,7 @@ check_format_type(const char *ptr, int t } } else h = 0; ++++++ file-5.19-zip2.0.dif ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.688034399 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.692034404 +0200 @@ -4,7 +4,7 @@ --- magic/Magdir/archive +++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000 -@@ -1200,6 +1200,11 @@ +@@ -1399,6 +1399,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 ++++++ file-5.28-btrfs-image.dif ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.704034422 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.708034427 +0200 @@ -9,9 +9,9 @@ that out and use it with both the on-disk superblock and the ones contained within the image. - - - +--- + magic/Magdir/filesystems | 37 +++++++++++++++++++++++-------------- + 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems --- a/magic/Magdir/filesystems @@ -58,6 +58,6 @@ +>>0x440 string _BHRfS_M \b, contains +>>>0x400 use btrfs_super_block - # dvdisaster's .ecc - # From: "Nelson A. de Oliveira" <nao...@gmail.com> + 0 string btrfs-stream BTRFS stream file + ++++++ file-5.41.dif -> file-5.42.dif ++++++ --- /work/SRC/openSUSE:Factory/file/file-5.41.dif 2021-10-23 00:50:18.945120646 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1548/file-5.42.dif 2022-06-16 18:19:39.524032744 +0200 @@ -10,7 +10,7 @@ 8 files changed, 313 insertions(+), 68 deletions(-) --- magic/Magdir/elf -+++ magic/Magdir/elf 2021-10-19 09:27:23.638685060 +0000 ++++ magic/Magdir/elf 2022-06-13 08:44:29.248838085 +0000 @@ -152,7 +152,7 @@ >18 leshort 47 Renesas H8/300H, >18 leshort 48 Renesas H8S, @@ -21,7 +21,7 @@ >18 leshort 52 Motorola Coldfire, >18 leshort 53 Motorola M68HC12, --- magic/Magdir/linux -+++ magic/Magdir/linux 2021-10-19 09:27:23.638685060 +0000 ++++ magic/Magdir/linux 2022-06-13 08:44:29.248838085 +0000 @@ -140,27 +140,31 @@ # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 # Linux kernel boot images (i386 arch) (Wolfram Kleff) @@ -71,7 +71,7 @@ 0 belong 0xb8c0078e Linux kernel >0x1e3 string Loading version 1.3.79 or older --- magic/Magdir/msad -+++ magic/Magdir/msad 2021-10-19 09:27:23.638685060 +0000 ++++ magic/Magdir/msad 2022-06-13 08:44:29.248838085 +0000 @@ -0,0 +1,5 @@ +#------------------------------------------------------------------------------ +# msad: file(1) magic for msad @@ -79,7 +79,7 @@ +# This must precede the heuristic for raw G3 data +4 string Standard\ Jet\ DB Microsoft Access Database --- magic/Magdir/msdos -+++ magic/Magdir/msdos 2021-10-19 09:27:23.638685060 +0000 ++++ magic/Magdir/msdos 2022-06-13 08:44:29.248838085 +0000 @@ -145,9 +145,9 @@ >>(0x3c.l+22) leshort&0x0200 >0 (stripped to external PDB) >>(0x3c.l+22) leshort&0x1000 >0 system file @@ -102,7 +102,7 @@ # updated by Joerg Jenderek at Oct 2008,2015 --- magic/Makefile.am -+++ magic/Makefile.am 2021-10-19 09:31:45.610115482 +0000 ++++ magic/Makefile.am 2022-06-13 08:44:29.248838085 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -120,7 +120,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -102,7 +101,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -105,7 +104,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -128,7 +128,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -147,6 +145,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -150,6 +148,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -137,7 +137,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -157,7 +157,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ +@@ -160,7 +160,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -145,7 +145,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/locoscript \ -@@ -165,7 +164,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -168,7 +167,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -153,7 +153,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -189,11 +187,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -192,11 +190,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -166,7 +166,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -252,6 +250,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -258,6 +256,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -175,7 +175,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -341,9 +341,21 @@ EXTRA_DIST = \ +@@ -347,9 +347,21 @@ EXTRA_DIST = \ $(MAGIC_DIR)/scripts/create_filemagic_flac \ $(MAGIC_FRAGMENTS) @@ -199,7 +199,7 @@ # FIXME: Build file natively as well so that it can be used to compile # the target's magic file; for now we bail if the local version does not match -@@ -355,19 +367,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -361,19 +373,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -239,7 +239,7 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2021-10-19 09:34:04.535688599 +0000 ++++ magic/Makefile.in 2022-06-13 08:44:29.248838085 +0000 @@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -257,7 +257,7 @@ $(MAGIC_FRAGMENT_DIR)/application \ $(MAGIC_FRAGMENT_DIR)/applix \ $(MAGIC_FRAGMENT_DIR)/apt \ -@@ -376,7 +375,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ +@@ -379,7 +378,6 @@ $(MAGIC_FRAGMENT_DIR)/erlang \ $(MAGIC_FRAGMENT_DIR)/espressif \ $(MAGIC_FRAGMENT_DIR)/esri \ $(MAGIC_FRAGMENT_DIR)/fcs \ @@ -265,7 +265,7 @@ $(MAGIC_FRAGMENT_DIR)/finger \ $(MAGIC_FRAGMENT_DIR)/flash \ $(MAGIC_FRAGMENT_DIR)/flif \ -@@ -421,6 +419,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ +@@ -424,6 +422,8 @@ $(MAGIC_FRAGMENT_DIR)/isz \ $(MAGIC_FRAGMENT_DIR)/java \ $(MAGIC_FRAGMENT_DIR)/javascript \ $(MAGIC_FRAGMENT_DIR)/jpeg \ @@ -274,7 +274,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -431,7 +431,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ +@@ -434,7 +434,6 @@ $(MAGIC_FRAGMENT_DIR)/lammps \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -282,7 +282,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/locoscript \ -@@ -439,7 +438,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ +@@ -442,7 +441,6 @@ $(MAGIC_FRAGMENT_DIR)/lua \ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ @@ -290,7 +290,7 @@ $(MAGIC_FRAGMENT_DIR)/macos \ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ -@@ -463,11 +461,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -466,11 +464,11 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -303,7 +303,7 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msvc \ $(MAGIC_FRAGMENT_DIR)/msx \ -@@ -526,6 +524,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ +@@ -532,6 +530,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ @@ -312,7 +312,7 @@ $(MAGIC_FRAGMENT_DIR)/rpi \ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rpmsg \ -@@ -615,10 +615,22 @@ EXTRA_DIST = \ +@@ -621,10 +621,22 @@ EXTRA_DIST = \ $(MAGIC_DIR)/scripts/create_filemagic_flac \ $(MAGIC_FRAGMENTS) @@ -336,7 +336,7 @@ # FIXME: Build file natively as well so that it can be used to compile # the target's magic file; for now we bail if the local version does not match @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT} -@@ -843,23 +855,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -849,23 +861,25 @@ uninstall-am: uninstall-pkgdataDATA .PRECIOUS: Makefile @@ -379,7 +379,7 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- src/Makefile.am -+++ src/Makefile.am 2021-10-19 09:27:23.654684781 +0000 ++++ src/Makefile.am 2022-06-13 08:44:29.248838085 +0000 @@ -1,4 +1,4 @@ -MAGIC = $(pkgdatadir)/magic +MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic @@ -387,7 +387,7 @@ nodist_include_HEADERS = magic.h --- src/dcore.c -+++ src/dcore.c 2021-10-19 09:27:23.654684781 +0000 ++++ src/dcore.c 2022-06-13 08:44:29.248838085 +0000 @@ -0,0 +1,207 @@ +/* + * Show goo about ELF core files ++++++ file-5.41.tar.gz -> file-5.42.tar.gz ++++++ ++++ 11350 lines of diff (skipped) ++++++ file-secure_getenv.patch ++++++ --- /var/tmp/diff_new_pack.OiSsv4/_old 2022-06-16 18:19:40.972034803 +0200 +++ /var/tmp/diff_new_pack.OiSsv4/_new 2022-06-16 18:19:40.976034808 +0200 @@ -1,14 +1,11 @@ --- - file-5.38/configure.ac | 2 ++ - file-5.38/src/file.c | 2 +- - file-5.38/src/file.h | 8 ++++++++ - file-5.38/src/magic.c | 10 +++++----- - 4 files changed, 16 insertions(+), 6 deletions(-) + file-5.42/configure.ac | 2 ++ + file-5.42/src/file.h | 8 ++++++++ + file-5.42/src/magic.c | 12 ++++++------ + 3 files changed, 16 insertions(+), 6 deletions(-) -Index: file-5.38/configure.ac -=================================================================== ---- file-5.38.orig/configure.ac -+++ file-5.38/configure.ac +--- file-5.42/configure.ac ++++ file-5.42/configure.ac 2022-06-13 08:34:50.347521415 +0000 @@ -114,6 +114,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>]) @@ -18,11 +15,9 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_OFF_T AC_TYPE_SIZE_T -Index: file-5.38/src/file.h -=================================================================== ---- file-5.38.orig/src/file.h -+++ file-5.38/src/file.h -@@ -700,4 +700,12 @@ static const char *rcsid(const char *p) +--- file-5.42/src/file.h ++++ file-5.42/src/file.h 2022-06-13 08:34:50.347521415 +0000 +@@ -706,4 +706,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif @@ -35,10 +30,8 @@ +#endif + #endif /* __file_h__ */ -Index: file-5.38/src/magic.c -=================================================================== ---- file-5.38.orig/src/magic.c -+++ file-5.38/src/magic.c +--- file-5.42/src/magic.c ++++ file-5.42/src/magic.c 2022-06-13 08:36:49.997304349 +0000 @@ -185,7 +185,7 @@ get_default_magic(void) free(default_magic); default_magic = NULL; @@ -48,9 +41,14 @@ return MAGIC; if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0) -@@ -222,16 +222,16 @@ out: +@@ -222,20 +222,20 @@ out: } + /* Before anything else, try to get a magic file from user HOME */ +- if ((home = getenv("HOME")) != NULL) ++ if ((home = secure_getenv("HOME")) != NULL) + _w32_append_path(&hmagicpath, "%s%s", home, hmagic); + /* First, try to get a magic file from user-application data */ - if ((home = getenv("LOCALAPPDATA")) != NULL) + if ((home = secure_getenv("LOCALAPPDATA")) != NULL) @@ -58,7 +56,7 @@ /* Second, try to get a magic file from the user profile data */ - if ((home = getenv("USERPROFILE")) != NULL) -+ if ((home = secure_getenv("USERPROFILE")) != NULL) ++ if ((home = secure_getenv("USERPROFILE")) != NULL) _w32_append_path(&hmagicpath, "%s/Local Settings/Application Data%s", home, hmagic); @@ -68,7 +66,7 @@ _w32_append_path(&hmagicpath, "%s%s", home, hmagic); /* Fourth, try to get magic file relative to exe location */ -@@ -252,7 +252,7 @@ magic_getpath(const char *magicfile, int +@@ -256,7 +256,7 @@ magic_getpath(const char *magicfile, int if (magicfile != NULL) return magicfile;
