Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2021-10-23 00:50:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Sat Oct 23 00:50:11 2021 rev:123 rq:926661 version:5.41 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2021-04-29 01:36:34.118422658 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1890/file.changes 2021-10-23 00:50:20.409120977 +0200 @@ -1,0 +2,49 @@ +Thu Oct 21 06:24:35 UTC 2021 - Dr. Werner Fink <wer...@suse.de> + +- Remove file-5.38-allow-readlinkat.dif as already doen in latest + file 5.41 + +------------------------------------------------------------------- +Tue Oct 19 09:52:12 UTC 2021 - Dr. Werner Fink <wer...@suse.de> + +- Update to 5.41: + * Avinash Sonawane: Fix tzname detection + * Fix relationship tests with "search" magic, don't short circuit + logic + * Fix memory leak in compile mode + * PR/272: kiefermat: Only set returnval = 1 when we printed something + (in all cases print or !print). This simplifies the logic and fixes + the issue in the PR with -k and --mime-type there was no continuation + printed before the default case. + * PR/270: Don't translate unprintable characters in %s magic formats + when -r + * PR/269: Avoid undefined behavior with clang (adding offset to NULL) + * Add a new flag (f) that requires that the match is a full word, + not a partial word match. + * Add varint types (unused) + * PR/256: mutableVoid: If the file is less than 3 bytes, use the file + length to determine type + * PR/259: aleksandr.v.novichkov: mime printing through indirect magic + is not taken into account, use match directly so that it does. +- Remove patches now upstream + * file-5.40-1c677c04.patch + * file-5.40-3096f87f.patch + * file-5.40-4c5fe1ad.patch + * file-5.40-6b34436a.patch + * file-5.40-749e1ecf.patch + * file-5.40-9b0459af.patch + * file-5.40-9e2becec.patch + * file-5.40-ascii.patch + * file-5.40-f0601504.patch + * file-5.40-f7705dca.patch +- Port patches + * file-5.19-biorad.dif + * file-5.19-printf.dif + * file-5.19-zip2.0.dif + * file-5.23-endian.patch + * file-5.28-btrfs-image.dif + * file-5.38-allow-readlinkat.dif + * file-secure_getenv.patch +- Port and rename patch file-5.39.dif which is now file-5.41.dif + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/file/python-magic.changes 2021-04-29 01:36:34.138422686 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1890/python-magic.changes 2021-10-23 00:50:20.461120989 +0200 @@ -1,0 +2,5 @@ +Tue Oct 19 09:55:47 UTC 2021 - Dr. Werner Fink <wer...@suse.de> + +- Update to 5.41 + +------------------------------------------------------------------- Old: ---- file-5.38-allow-readlinkat.dif file-5.39.dif file-5.40-1c677c04.patch file-5.40-3096f87f.patch file-5.40-4c5fe1ad.patch file-5.40-6b34436a.patch file-5.40-749e1ecf.patch file-5.40-9b0459af.patch file-5.40-9e2becec.patch file-5.40-ascii.patch file-5.40-f0601504.patch file-5.40-f7705dca.patch file-5.40.tar.gz file-5.40.tar.gz.asc New: ---- file-5.41.dif file-5.41.tar.gz file-5.41.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.469121215 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.469121215 +0200 @@ -33,7 +33,7 @@ %endif # # Set Version also in python-magic.spec -Version: 5.40 +Version: 5.41 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.39.dif +Patch: file-5.41.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,19 +63,7 @@ Patch34: file-5.23-endian.patch Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif -Patch40: file-5.38-allow-readlinkat.dif # Upstream commits as patches -Patch41: file-5.40-1c677c04.patch -Patch42: file-5.40-9e2becec.patch -Patch43: file-5.40-6b34436a.patch -Patch44: file-5.40-9b0459af.patch -Patch45: file-5.40-f0601504.patch -Patch46: file-5.40-3096f87f.patch -Patch47: file-5.40-f7705dca.patch -Patch48: file-5.40-749e1ecf.patch -Patch49: file-5.40-4c5fe1ad.patch -# My fix of the ASCII count bug -Patch60: file-5.40-ascii.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -119,16 +107,6 @@ %prep %setup -q -n file-%{version} -%patch41 -p0 -%patch42 -p0 -%patch43 -p0 -%patch44 -p0 -%patch45 -p0 -%patch46 -p0 -%patch47 -p0 -%patch48 -p0 -%patch49 -p0 -%patch60 -p0 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex @@ -148,7 +126,6 @@ %patch34 -p0 -b .endian %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs -%patch40 -p1 -b .readlinkat %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h @@ -223,6 +200,6 @@ %{_libdir}/pkgconfig/libmagic.pc %doc %{_mandir}/man3/libmagic.3.gz %license COPYING -%doc README AUTHORS NEWS ChangeLog +%doc README.DEVELOPER AUTHORS NEWS ChangeLog %changelog ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.489121220 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.493121221 +0200 @@ -27,7 +27,7 @@ BuildRequires: python-rpm-macros BuildRequires: zlib-devel URL: http://www.darwinsys.com/file/ -Version: 5.40 +Version: 5.41 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause ++++++ file-5.19-biorad.dif ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.533121230 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.537121231 +0200 @@ -4,7 +4,7 @@ --- magic/Magdir/images +++ magic/Magdir/images 2019-05-27 08:52:51.674238380 +0000 -@@ -1348,6 +1348,8 @@ +@@ -1566,6 +1566,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 ++++++ file-5.19-printf.dif ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.549121234 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.549121234 +0200 @@ -1,19 +1,15 @@ --- - src/apprentice.c | 6 ++++++ - 1 file changed, 6 insertions(+) + src/apprentice.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) --- src/apprentice.c -+++ src/apprentice.c 2019-02-21 06:39:25.249091320 +0000 -@@ -2476,6 +2476,12 @@ check_format_type(const char *ptr, int t ++++ src/apprentice.c 2021-10-19 08:52:01.991343421 +0000 +@@ -2489,7 +2489,7 @@ check_format_type(const char *ptr, int t + } + } else + h = 0; +- while (*ptr && strchr("-.#", *ptr) != NULL) ++ while (*ptr && strchr("-.# +'", *ptr) != NULL) ptr++; - if (*ptr == '#') - ptr++; -+ if (*ptr == ' ') -+ ptr++; -+ if (*ptr == '+') -+ ptr++; -+ if (*ptr == '\'') -+ ptr++; #define CHECKLEN() do { \ for (len = cnt = 0; isdigit(CAST(unsigned char, *ptr)); ptr++, cnt++) \ - len = len * 10 + (*ptr - '0'); \ ++++++ file-5.19-zip2.0.dif ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.561121236 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.561121236 +0200 @@ -4,7 +4,7 @@ --- magic/Magdir/archive +++ magic/Magdir/archive 2019-02-21 06:49:05.298138025 +0000 -@@ -1117,6 +1117,11 @@ +@@ -1200,6 +1200,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.23-endian.patch ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.569121238 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.569121238 +0200 @@ -4,7 +4,7 @@ 2 files changed, 10 insertions(+), 114 deletions(-) --- src/apprentice.c -+++ src/apprentice.c 2019-02-21 07:03:30.961751563 +0000 ++++ src/apprentice.c 2021-10-19 08:56:33.418646912 +0000 @@ -50,7 +50,7 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1. #endif #include <dirent.h> @@ -14,7 +14,7 @@ #define EATAB {while (isascii(CAST(unsigned char, *l)) && \ isspace(CAST(unsigned char, *l))) ++l;} -@@ -124,9 +124,11 @@ private struct mlist *mlist_alloc(void); +@@ -124,9 +124,11 @@ private void mlist_free_all(struct magic private void mlist_free(struct mlist *); private void byteswap(struct magic *, uint32_t); private void bs1(struct magic *); @@ -29,10 +29,11 @@ private char *mkdbname(struct magic_set *, const char *, int); private struct magic_map *apprentice_buf(struct magic_set *, struct magic *, size_t); -@@ -3347,67 +3349,6 @@ byteswap(struct magic *magic, uint32_t n +@@ -3355,67 +3357,6 @@ byteswap(struct magic *magic, uint32_t n + bs1(&magic[i]); } - /* +-/* - * swap a short - */ -private uint16_t @@ -93,13 +94,12 @@ - return rv; -} - --/* - * byteswap a single magic entry - */ - private void + protected uintmax_t + file_varint2uintmax_t(const unsigned char *us, int t, size_t *l) + { --- src/cdf.c -+++ src/cdf.c 2019-02-21 07:05:15.503772161 +0000 -@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.114 201 ++++ src/cdf.c 2021-10-19 08:53:37.577690786 +0000 +@@ -48,6 +48,7 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.120 202 #include <time.h> #include <ctype.h> #include <limits.h> @@ -107,7 +107,7 @@ #ifndef EFTYPE #define EFTYPE EINVAL -@@ -120,55 +121,9 @@ cdf_calloc(const char *file __attribute_ +@@ -124,55 +125,9 @@ cdf_calloc(const char *file __attribute_ return calloc(n, u); } ++++++ file-5.28-btrfs-image.dif ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.581121241 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.581121241 +0200 @@ -16,7 +16,7 @@ diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems -@@ -2296,20 +2296,29 @@ +@@ -2302,20 +2302,29 @@ >>0x10060 string >\0 lockproto %s) # Russell Coker <russ...@coker.com.au> ++++++ file-5.38-allow-readlinkat.dif -> file-5.41.dif ++++++ ++++ 614 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/file/file-5.38-allow-readlinkat.dif ++++ and /work/SRC/openSUSE:Factory/.file.new.1890/file-5.41.dif ++++++ file-5.40.tar.gz -> file-5.41.tar.gz ++++++ ++++ 10725 lines of diff (skipped) ++++++ file-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.857121303 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.857121303 +0200 @@ -1,4 +1,3 @@ -addFilter(".*Warning:.*using.*regular.*magic.*file.*/usr/share/misc/magic.*") addFilter(".*W:.*no-dependency-on file.*/file-libs/libfile.*") addFilter(".*W:.*name-repeated-in-summary.*") -addFilter(".*E:.*shlib-fixed-dependency.*") +addFilter(".*:.*shlib-fixed-dependency.*") ++++++ file-secure_getenv.patch ++++++ --- /var/tmp/diff_new_pack.aWtpVv/_old 2021-10-23 00:50:21.869121306 +0200 +++ /var/tmp/diff_new_pack.aWtpVv/_new 2021-10-23 00:50:21.869121306 +0200 @@ -9,7 +9,7 @@ =================================================================== --- file-5.38.orig/configure.ac +++ file-5.38/configure.ac -@@ -115,6 +115,8 @@ if test "$enable_xzlib" != "no"; then +@@ -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>]) @@ -22,7 +22,7 @@ =================================================================== --- file-5.38.orig/src/file.h +++ file-5.38/src/file.h -@@ -691,4 +691,12 @@ static const char *rcsid(const char *p) +@@ -700,4 +700,12 @@ static const char *rcsid(const char *p) #define __RCSID(a) #endif @@ -39,7 +39,7 @@ =================================================================== --- file-5.38.orig/src/magic.c +++ file-5.38/src/magic.c -@@ -183,7 +183,7 @@ get_default_magic(void) +@@ -185,7 +185,7 @@ get_default_magic(void) free(default_magic); default_magic = NULL; } @@ -48,7 +48,7 @@ return MAGIC; if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0) -@@ -220,16 +220,16 @@ out: +@@ -222,16 +222,16 @@ out: } /* First, try to get a magic file from user-application data */ @@ -68,7 +68,7 @@ _w32_append_path(&hmagicpath, "%s%s", home, hmagic); /* Fourth, try to get magic file relative to exe location */ -@@ -250,7 +250,7 @@ magic_getpath(const char *magicfile, int +@@ -252,7 +252,7 @@ magic_getpath(const char *magicfile, int if (magicfile != NULL) return magicfile;
