commit file for openSUSE:Factory
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-02-28 19:44:17 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1770 (New) Package is "file" Wed Feb 28 19:44:17 2024 rev:136 rq:1150751 version:5.45 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2023-08-02 16:47:49.140392315 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1770/file.changes 2024-02-28 19:44:20.415764670 +0100 @@ -1,0 +2,5 @@ +Mon Feb 26 09:11:40 UTC 2024 - Dr. Werner Fink + +- Prepare for RPM 4.20 + +--- Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.BojoGl/_old 2024-02-28 19:44:23.803886970 +0100 +++ /var/tmp/diff_new_pack.BojoGl/_new 2024-02-28 19:44:23.819887547 +0100 @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -109,26 +109,26 @@ %prep %setup -q -n file-%{version} -%patch42 -p0 -b .t_t -%patch1 -p0 -b .misc -%patch4 -p0 -b .conf -%patch5 -p0 -b .tex -%patch7 -p0 -b .ssd -%patch8 -p0 -b .xen -%patch9 -p0 -b .elf -%patch10 -p0 -b .prtf -%patch12 -p1 -b .opt -%patch13 -p0 -b .scri -%patch15 -p0 -b .xcur -%patch22 -p0 -b .cromfs -%patch25 -p0 -b .javacheck -%patch26 -p0 -b .solv -%patch27 -p0 -b .zip2.0 -%patch31 -p0 -b .biorad -%patch32 -p0 -b .clicfs -%patch37 -p1 -b .getenv -%patch39 -p1 -b .btrfs -%patch0 -b .0 +%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 +%patch -P 7 -p0 -b .ssd +%patch -P 8 -p0 -b .xen +%patch -P 9 -p0 -b .elf +%patch -P 10 -p0 -b .prtf +%patch -P 12 -p1 -b .opt +%patch -P 13 -p0 -b .scri +%patch -P 15 -p0 -b .xcur +%patch -P 22 -p0 -b .cromfs +%patch -P 25 -p0 -b .javacheck +%patch -P 26 -p0 -b .solv +%patch -P 27 -p0 -b .zip2.0 +%patch -P 31 -p0 -b .biorad +%patch -P 32 -p0 -b .clicfs +%patch -P 37 -p1 -b .getenv +%patch -P 39 -p1 -b .btrfs +%patch -P 0 -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.BojoGl/_old 2024-02-28 19:44:24.027895056 +0100 +++ /var/tmp/diff_new_pack.BojoGl/_new 2024-02-28 19:44:24.031895200 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit file for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2023-08-02 16:47:48 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.22712 (New) Package is "file" Wed Aug 2 16:47:48 2023 rev:135 rq:1101521 version:5.45 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2023-05-06 22:08:20.264431503 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.22712/file.changes 2023-08-02 16:47:49.140392315 +0200 @@ -1,0 +2,32 @@ +Mon Jul 31 09:44:14 UTC 2023 - Dr. Werner Fink + +- Add patch file-5.45-type_t.dif + * Partly upstream check of type_t is wide on 32bit systems + * Extend (auto)configure to enable wide type_t type if possible + +--- +Fri Jul 28 11:51:24 UTC 2023 - Dr. Werner Fink + +- On 32bit systems define _TIME_BITS=64 to make it build + +--- +Fri Jul 28 09:48:53 UTC 2023 - Dr. Werner Fink + +- Update to 5.45: + * PR/465: psrok1: Avoid muslc asctime_r crash + * add SIMH tape format support + * bump the max size of the elf section notes to be read to 128K +and make it configurable + * PR/415: Fix decompression with program returning empty + * PR/408: fix -p with seccomp + * PR/412: fix MinGW compilation +- Remove upstream patch dc71304b.patch +- Modify patches + * file-5.17-option.dif + * file-5.19-biorad.dif + * file-5.19-zip2.0.dif + * file-5.22-elf.dif + * file-secure_getenv.patch +- Port and rename patch file-5.44.dif now file-5.45.dif + +--- Old: dc71304b.patch file-5.44.dif file-5.44.tar.gz file-5.44.tar.gz.asc New: file-5.45-type_t.dif file-5.45.dif file-5.45.tar.gz file-5.45.tar.gz.asc Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.ddcggO/_old 2023-08-02 16:47:50.656401537 +0200 +++ /var/tmp/diff_new_pack.ddcggO/_new 2023-08-02 16:47:50.660401561 +0200 @@ -34,7 +34,7 @@ %endif # # Set Version also in python-magic.spec -Version:5.44 +Version:5.45 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.44.dif +Patch0: file-5.45.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,8 +63,8 @@ Patch32:file-5.19-clicfs.dif Patch37:file-secure_getenv.patch Patch39:file-5.28-btrfs-image.dif -# PATCH-FIX-UPSTREAM -Patch42:dc71304b.patch +# PATCH-FIX-UPSTREAM: Support max time_t on 32bit +Patch42:file-5.45-type_t.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global magicdir%{_datadir}/file @@ -109,7 +109,7 @@ %prep %setup -q -n file-%{version} -%patch42 -p0 +%patch42 -p0 -b .t_t %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex ++ python-magic.spec ++ --- /var/tmp/diff_new_pack.ddcggO/_old 2023-08-02 16:47:50.688401731 +0200 +++ /var/tmp/diff_new_pack.ddcggO/_new 2023-08-02 16:47:50.696401780 +0200 @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global _miscdir%{_datadir}/misc Name: python-magic -Version:5.44 +Version:5.45 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.ddcggO/_old 2023-08-02 16:47:50.768402218 +0200 +++ /var/tmp/diff_new_pack.ddcggO/_new 2023-08-02 16:47:50.772402242 +0200 @@ -2,7 +2,7 @@ === --- file-5.43.orig/src/file.c +++ file-5.43/src/file.c -@@ -260,6 +260,8 @@ main(int argc, char *argv[]) +@@ -263,6 +263,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; -@@ -272,7 +274,7 @@ main(int argc, char *argv[]) +@@ -275,7 +277,7 @@ main(int argc, char *argv[]) break; case 'f': @@ -20,7 +20,7 @@ usage(); if (magic == NULL) if
commit file for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2023-05-06 22:08:18 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1533 (New) Package is "file" Sat May 6 22:08:18 2023 rev:134 rq:1084807 version:5.44 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2023-01-12 22:42:34.700286132 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.1533/file.changes 2023-05-06 22:08:20.264431503 +0200 @@ -1,0 +2,7 @@ +Thu May 4 14:15:38 UTC 2023 - Frederic Crozat + +- Add _multibuild to define additional spec files as additional + flavors. + Eliminates the need for source package links in OBS. + +--- python-magic.changes: same change New: _multibuild Other differences: -- python-magic.spec: same change ++ _multibuild ++ python-magic
commit file for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2023-01-12 22:42:33 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.32243 (New) Package is "file" Thu Jan 12 22:42:33 2023 rev:133 rq:1057786 version:5.44 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-09-16 13:32:00.293203598 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.32243/file.changes 2023-01-12 22:42:34.700286132 +0100 @@ -1,0 +2,34 @@ +Wed Jan 11 13:06:56 UTC 2023 - Dr. Werner Fink + +- Add patch dc71304b.patch + * Handle script executable Zip archives + +--- +Tue Jan 10 13:28:51 UTC 2023 - Dr. Werner Fink + +- Use [Pp]atch0 explicit to avoid warning as python.magic build time + +--- +Mon Jan 9 14:30:30 UTC 2023 - Dr. Werner Fink + +- Modifying patches + * file-5.22-elf.dif + * file-5.19-printf.dif + * file-5.19-zip2.0.dif + * file-5.19-biorad.dif + * file-secure_getenv.patch + * file-5.28-btrfs-image.dif +- Remove patch file-zstd.patch now upstream +- Port patch file-5.42.dif and rename it to file-5.44.dif +- Update to 5.44: + * Handle nan's so that we don't get internal floating point exceptions +when they are enabled (Vincent Mihalkovic) + * PR/397: Restore the ability to process files from stdin immediately. + * fixed various clustefuzz issues + * Fix error detection for decompression code (Vincent Mihalkovic) + * Add MAGIC_NO_COMPRESS_FORK and use it to produce a more +meaningful error message if we are sandboxing. + * Add built-in lzip decompression support (Michal Gorny) + * Add built-in zstd decompression support (Martin Rodriguez Reboredo) + +--- --- /work/SRC/openSUSE:Factory/file/python-magic.changes2022-12-24 14:50:49.239116676 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.32243/python-magic.changes 2023-01-12 22:42:34.720286245 +0100 @@ -1,0 +2,15 @@ +Tue Jan 10 13:28:15 UTC 2023 - Dr. Werner Fink + +- Enable tests for python-magic (not python-python-magic) + +--- +Tue Jan 10 08:29:12 UTC 2023 - Dr. Werner Fink + +- Run pre_checkin.sh to get correct source tar ball + +--- +Mon Jan 9 14:29:09 UTC 2023 - Dr. Werner Fink + +- Update to 5.44 + +--- Old: file-5.42.dif file-5.43.tar.gz file-5.43.tar.gz.asc file-zstd.patch New: dc71304b.patch file-5.44.dif file-5.44.tar.gz file-5.44.tar.gz.asc Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.kippGx/_old 2023-01-12 22:42:37.052299462 +0100 +++ /var/tmp/diff_new_pack.kippGx/_new 2023-01-12 22:42:37.056299485 +0100 @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,17 +34,17 @@ %endif # # Set Version also in python-magic.spec -Version:5.43 +Version:5.44 Release:0 Summary:A Tool to Determine File Types License:BSD-2-Clause Group: Productivity/File utilities -Source0:ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz +Source0:https://www.astron.com/pub/file/file-%{version}.tar.gz Source2:baselibs.conf Source3:file-rpmlintrc -Source4:ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc +Source4:https://www.astron.com/pub/file/file-%{version}.tar.gz.asc Source5:file.keyring -Patch: file-5.42.dif +Patch0: file-5.44.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif @@ -63,8 +63,8 @@ Patch32:file-5.19-clicfs.dif Patch37:file-secure_getenv.patch Patch39:file-5.28-btrfs-image.dif -# Upstream mailing list -Patch42:file-zstd.patch +# PATCH-FIX-UPSTREAM +Patch42:dc71304b.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global magicdir%{_datadir}/file @@ -109,7 +109,7 @@ %prep %setup -q -n file-%{version} -%patch42 -p1 +%patch42 -p0 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex @@ -128,8 +128,7 @@ %patch32 -p0 -b .clicfs %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs - -%patch -b
commit file for openSUSE:Factory
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-12-24 14:50:47 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1563 (New) Package is "file" Sat Dec 24 14:50:47 2022 rev:132 rq:1044315 version:5.43 Changes: --- /work/SRC/openSUSE:Factory/file/python-magic.changes2022-09-16 13:32:00.317203675 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1563/python-magic.changes 2022-12-24 14:50:49.239116676 +0100 @@ -1,0 +2,6 @@ +Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller + +- switch to pkgconfig(zlib) so that alternative providers can be + used + +--- Other differences: -- ++ python-magic.spec ++ --- /var/tmp/diff_new_pack.pLDLxd/_old 2022-12-24 14:50:50.079121577 +0100 +++ /var/tmp/diff_new_pack.pLDLxd/_new 2022-12-24 14:50:50.083121600 +0100 @@ -32,7 +32,7 @@ BuildRequires: findutils BuildRequires: libtool BuildRequires: python-rpm-macros -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) Requires: libmagic1 Provides: python-file-magic = %{file_magic_version} %{expand:%(sed -n -e '/^Source0\?:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)}
commit file for openSUSE:Factory
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-09-16 13:31:51 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.2083 (New) Package is "file" Fri Sep 16 13:31:51 2022 rev:131 rq:1003495 version:5.43 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-08-28 13:12:09.676520020 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.2083/file.changes 2022-09-16 13:32:00.293203598 +0200 @@ -1,0 +2,21 @@ +Wed Sep 14 08:58:50 UTC 2022 - Dr. Werner Fink + +- Add patch file-zstd.patch from upstream mailing list + * Add zstd decompression support +- Run also upstream standard checks + +--- +Tue Sep 13 20:09:35 UTC 2022 - Dirk M??ller + +- update to 5.43: + * Add octal indirect magic + * avoid infinite loop in non-wide code + * Obey MAGIC_CONTINUE with multiple magic files + * Fix bug with large flist + * PR/364: Detect non-nul-terminated core filenames from QEMU + * PR/359: Add support for http://ndjson.org/ + * PR/362: Fix wide printing + * PR/358: Fix width for -f - +- drop file-boo1201350.patch (upstream) + +--- --- /work/SRC/openSUSE:Factory/file/python-magic.changes2022-03-29 18:13:45.139036145 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.2083/python-magic.changes 2022-09-16 13:32:00.317203675 +0200 @@ -1,0 +2,5 @@ +Wed Sep 14 09:00:26 UTC 2022 - Dr. Werner Fink + +- Update to 5.43 due to Dirk + +--- Old: file-5.42.tar.gz file-5.42.tar.gz.asc file-boo1201350.patch New: file-5.43.tar.gz file-5.43.tar.gz.asc file-zstd.patch Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.fBatoQ/_old 2022-09-16 13:32:02.041209245 +0200 +++ /var/tmp/diff_new_pack.fBatoQ/_new 2022-09-16 13:32:02.049209271 +0200 @@ -25,6 +25,7 @@ BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) URL:http://www.darwinsys.com/file/ # bug437293 @@ -33,7 +34,7 @@ %endif # # Set Version also in python-magic.spec -Version:5.42 +Version:5.43 Release:0 Summary:A Tool to Determine File Types License:BSD-2-Clause @@ -62,8 +63,8 @@ Patch32:file-5.19-clicfs.dif Patch37:file-secure_getenv.patch Patch39:file-5.28-btrfs-image.dif -# Upstream commits as patch -Patch42:file-boo1201350.patch +# Upstream mailing list +Patch42:file-zstd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global magicdir%{_datadir}/file @@ -108,7 +109,7 @@ %prep %setup -q -n file-%{version} -%patch42 -p0 +%patch42 -p1 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex @@ -162,6 +163,8 @@ rm -f %{buildroot}%{_libdir}/*.la %check +# Standard checks +make check # Check out that the binary does not bail out: LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH ++ python-magic.spec ++ --- /var/tmp/diff_new_pack.fBatoQ/_old 2022-09-16 13:32:02.073209348 +0200 +++ /var/tmp/diff_new_pack.fBatoQ/_new 2022-09-16 13:32:02.077209360 +0200 @@ -21,7 +21,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global _miscdir%{_datadir}/misc Name: python-magic -Version:5.42 +Version:5.43 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.fBatoQ/_old 2022-09-16 13:32:02.129209529 +0200 +++ /var/tmp/diff_new_pack.fBatoQ/_new 2022-09-16 13:32:02.133209542 +0200 @@ -1,6 +1,8 @@ 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 -@@ -254,6 +254,8 @@ +Index: file-5.43/src/file.c +=== +--- file-5.43.orig/src/file.c file-5.43/src/file.c +@@ -260,6 +260,8 @@ main(int argc, char *argv[]) break; case 'e': case OPT_EXCLUDE_QUIET: @@ -9,7 +11,7 @@ for (i = 0; i < __arraycount(nv); i++) if (strcmp(nv[i].name, optarg) == 0) break; -@@ -266,7 +268,7 @@ +@@ -272,7 +274,7 @@ main(int argc, char *argv[]) break;
commit file for openSUSE:Factory
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-08-28 13:12:08 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.2083 (New) Package is "file" Sun Aug 28 13:12:08 2022 rev:130 rq:999552 version:5.42 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-07-29 16:46:53.638485071 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.2083/file.changes 2022-08-28 13:12:09.676520020 +0200 @@ -1,0 +2,7 @@ +Thu Aug 25 19:31:39 UTC 2022 - Callum Farmer + +- Move magic files to /usr/share/file from /usr/share/misc, and + then create symlinks from /usr/share/misc back to /usr/share/file + as per FHS 3.0 + +--- Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.YEhQbS/_old 2022-08-28 13:12:10.524522184 +0200 +++ /var/tmp/diff_new_pack.YEhQbS/_new 2022-08-28 13:12:10.532522205 +0200 @@ -66,6 +66,7 @@ Patch42:file-boo1201350.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc +%global magicdir%{_datadir}/file %global _miscdir%{_datadir}/misc %description @@ -138,7 +139,7 @@ rm -f ltcf-c.sh ltconfig ltmain.sh autoreconf -fiv export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)" -%configure --disable-silent-rules --datadir=%{_miscdir} \ +%configure --disable-silent-rules --datadir=%{magicdir} \ --disable-static \ --enable-fsect-man5 make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie" @@ -150,8 +151,11 @@ make DESTDIR=%{buildroot} install pkgdatadir='$(datadir)' rm -vf %{buildroot}%{_sysconfdir}/magic echo '# Localstuff: file(1) magic(5) for locally observed files' > %{buildroot}%{_sysconfdir}/magic -echo '# global magic file is %{_miscdir}/magic(.mgc)' >> %{buildroot}%{_sysconfdir}/magic +echo '# global magic file is %{magicdir}/magic(.mgc)' >> %{buildroot}%{_sysconfdir}/magic # Does not build +mkdir -p %{buildroot}%{_miscdir} +ln -s %{magicdir}/magic %{buildroot}%{_miscdir}/magic +ln -s %{magicdir}/magic.mgc %{buildroot}%{_miscdir}/magic.mgc %if %{with decore} install -s dcore %{buildroot}%{_bindir} %endif @@ -182,6 +186,9 @@ %config(noreplace) %{_sysconfdir}/magic %{_miscdir}/magic %{_miscdir}/magic.mgc +%dir %{magicdir} +%{magicdir}/magic +%{magicdir}/magic.mgc %doc %{_mandir}/man5/magic.5.gz %files
commit file for openSUSE:Factory
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-07-29 16:46:51 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1533 (New) Package is "file" Fri Jul 29 16:46:51 2022 rev:129 rq:990574 version:5.42 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-06-16 18:19:39.668032948 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1533/file.changes 2022-07-29 16:46:53.638485071 +0200 @@ -1,0 +2,11 @@ +Wed Jul 13 11:01:16 UTC 2022 - Dr. Werner Fink + +- Add upstream patch to fix boo#1201350 + * file-boo1201350.patch which combines the commits +c80065fe6900be5e794941e29b32440e9969b1c3 +7e59d34206d7c962e093d4239e5367a2cd8b7623 +f042050f59bfc037677871c4d1037c33273f5213 +d471022b2772071877895759f209f2c346757a4c +441ac2b15508909e82ad467960df4ac0adf9644c + +--- New: file-boo1201350.patch Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.PRHx7E/_old 2022-07-29 16:46:55.230489498 +0200 +++ /var/tmp/diff_new_pack.PRHx7E/_new 2022-07-29 16:46:55.234489509 +0200 @@ -62,7 +62,8 @@ Patch32:file-5.19-clicfs.dif Patch37:file-secure_getenv.patch Patch39:file-5.28-btrfs-image.dif -# Upstream commits as patches +# Upstream commits as patch +Patch42:file-boo1201350.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir%{_datadir}/misc @@ -106,6 +107,7 @@ %prep %setup -q -n file-%{version} +%patch42 -p0 %patch1 -p0 -b .misc %patch4 -p0 -b .conf %patch5 -p0 -b .tex @@ -124,6 +126,7 @@ %patch32 -p0 -b .clicfs %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs + %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h ++ file-boo1201350.patch ++ >From c80065fe6900be5e794941e29b32440e9969b1c3 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Mon, 4 Jul 2022 19:44:35 + Subject: [PATCH 1/5] PR/362: ro-ee: fix wide char printing --- src/file.c | 97 +++- src/file.h |4 +- src/funcs.c |4 +- 3 files changed, 81 insertions(+), 24 deletions(-) --- src/file.c +++ src/file.c 2022-07-21 13:56:33.280169243 + @@ -60,6 +60,12 @@ FILE_RCSID("@(#)$File: file.c,v 1.195 20 #ifdef HAVE_WCTYPE_H #include #endif +#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \ + defined(HAVE_WCTYPE_H) +#define FILE_WIDE_SUPPORT +#else +#include +#endif #if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION) # include @@ -544,6 +550,58 @@ unwrap(struct magic_set *ms, const char return e; } +private void +file_octal(unsigned char c) +{ + putc('\\', stdout); + putc(((c >> 6) & 7) + '0', stdout); + putc(((c >> 3) & 7) + '0', stdout); + putc(((c >> 0) & 7) + '0', stdout); +} + +private void +fname_print(const char *inname) +{ + size_t n = strlen(inname); +#ifdef FILE_WIDE_SUPPORT + mbstate_t state; + wchar_t nextchar; + size_t bytesconsumed; + + + (void)memset(, 0, sizeof(state)); + while (n > 0) { + bytesconsumed = mbrtowc(, inname, n, ); + if (bytesconsumed == CAST(size_t, -1) || + bytesconsumed == CAST(size_t, -2)) { + nextchar = *inname++; + n--; + (void)memset(, 0, sizeof(state)); + file_octal(CAST(unsigned char, nextchar)); + continue; + } + inname += bytesconsumed; + n -= bytesconsumed; + if (iswprint(nextchar)) { + printf("%lc", nextchar); + continue; + } + /* XXX: What if it is > 255? */ + file_octal(CAST(unsigned char, nextchar)); + } +#else + size_t i; + for (i = 0; i < n; i++) { + unsigned char c = CAST(unsigned char, inname[i]); + if (isprint(c)) { + putc(c); + continue; + } + file_octal(c); + } +#endif +} + /* * Called for each input file on the command line (or in a list of files) */ @@ -553,15 +611,13 @@ process(struct magic_set *ms, const char const char *type, c = nulsep > 1 ? '\0' : '\n'; int std_in = strcmp(inname, "-") == 0; int haderror = 0; - size_t plen = 4 * wid + 1; - char *pbuf, *pname; - - if ((pbuf = CAST(char
commit file for openSUSE:Factory
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.changes2022-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 + +- 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 @@
commit file for openSUSE:Factory
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-04-30 22:51:57 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1538 (New) Package is "file" Sat Apr 30 22:51:57 2022 rev:127 rq:972801 version:5.41 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-04-19 09:57:55.839538227 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1538/file.changes 2022-04-30 22:52:03.188184907 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 09:03:32 UTC 2022 - Dr. Werner Fink + +- Try to solve 32bit import dependency problems (boo#1198788) + +--- Other differences: -- python-magic.spec: same change ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.mzYhJ9/_old 2022-04-30 22:52:04.104186146 +0200 +++ /var/tmp/diff_new_pack.mzYhJ9/_new 2022-04-30 22:52:04.104186146 +0200 @@ -1,5 +1,7 @@ libmagic1 requires "file-magic = " +targettype 32bit provides "file-:/usr/lib/libmagic.so.1" + file-devel requires -file- requires "libmagic1- = "
commit file for openSUSE:Factory
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-04-19 09:57:53 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1941 (New) Package is "file" Tue Apr 19 09:57:53 2022 rev:126 rq:969998 version:5.41 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-03-29 18:13:45.103036112 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1941/file.changes 2022-04-19 09:57:55.839538227 +0200 @@ -1,0 +2,6 @@ +Wed Apr 13 20:41:49 UTC 2022 - Dirk M??ller + +- update file-5.41-cache-regexps.patch to fix cache offset + miscalculation (bsc#1197780) + +--- Other differences: -- python-magic.spec: same change ++ file-5.41-cache-regexps.patch ++ --- /var/tmp/diff_new_pack.QemNNw/_old 2022-04-19 09:57:56.627539251 +0200 +++ /var/tmp/diff_new_pack.QemNNw/_new 2022-04-19 09:57:56.631539256 +0200 @@ -75,7 +75,7 @@ if (ma[j].cont_level == 0) break; v->nmagic = j - i; -+ v->magic_rxcomp = ml->magic_rxcomp; ++ v->magic_rxcomp = &(ml->magic_rxcomp[i]); return 0; } }
commit file for openSUSE:Factory
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-03-29 18:13:43 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1900 (New) Package is "file" Tue Mar 29 18:13:43 2022 rev:125 rq:964719 version:5.41 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2022-02-25 21:24:50.675635872 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.1900/file.changes 2022-03-29 18:13:45.103036112 +0200 @@ -1,0 +2,11 @@ +Wed Mar 23 09:02:37 UTC 2022 - Dirk M??ller + +- add file-5.41-cache-regexps-locale-restore.patch to restore + previous locale handling behavior + +--- +Sat Mar 19 18:00:32 UTC 2022 - Dirk M??ller + +- add file-5.41-cache-regexps.patch to cache regexp lookups + +--- --- /work/SRC/openSUSE:Factory/file/python-magic.changes2021-10-23 00:50:20.461120989 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1900/python-magic.changes 2022-03-29 18:13:45.139036145 +0200 @@ -1,0 +2,5 @@ +Sat Mar 19 18:01:52 UTC 2022 - Dirk M??ller + +- spec-cleaner run + +--- New: file-5.41-cache-regexps-locale-restore.patch file-5.41-cache-regexps.patch Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.rweeoo/_old 2022-03-29 18:13:46.423037327 +0200 +++ /var/tmp/diff_new_pack.rweeoo/_new 2022-03-29 18:13:46.431037334 +0200 @@ -62,7 +62,9 @@ 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,7 +127,9 @@ %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.rweeoo/_old 2022-03-29 18:13:46.455037356 +0200 +++ /var/tmp/diff_new_pack.rweeoo/_new 2022-03-29 18:13:46.459037360 +0200 @@ -19,25 +19,23 @@ # PyPI package name is file-magic. Version is taken from setup.py %define file_magic_version 0.3.0 %{?!python_module:%define python_module() python-%{**} python3-%{**}} - +%global _miscdir%{_datadir}/misc Name: python-magic -BuildRequires: %{python_module setuptools} -BuildRequires: findutils -BuildRequires: libtool -BuildRequires: python-rpm-macros -BuildRequires: zlib-devel -URL:http://www.darwinsys.com/file/ Version:5.41 Release:0 Summary:Python module to use libmagic License:BSD-3-Clause AND BSD-4-Clause Group: Development/Languages/Python -%{expand:%(sed -n -e '/^Source0\?:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)} +URL:https://www.darwinsys.com/file/ Source99: file.spec +BuildRequires: %{python_module setuptools} +BuildRequires: findutils +BuildRequires: libtool +BuildRequires: python-rpm-macros +BuildRequires: zlib-devel Requires: libmagic1 Provides: python-file-magic = %{file_magic_version} -%global _miscdir%{_datadir}/misc - +%{expand:%(sed -n -e '/^Source0\?:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)} %python_subpackages %description @@ -58,7 +56,6 @@ popd %files %{python_files} -%defattr(-,root,root) %doc python/README python/example.py %{python_sitelib}/magic.py* %pycache_only %{python_sitelib}/__pycache__ ++ file-5.41-cache-regexps-locale-restore.patch ++ >From 7d438e28c16773e28a3707935c8e5d9927a515a7 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Sat, 19 Mar 2022 19:52:09 + Subject: [PATCH] Now that we are cacheing regex's we cannot assume that we always do regcomp->regexec->regfree, so this causes memory corruption (and increased memory use with all the locale copies) in xlocale systems. Instead save and restore locales in regcomp and regexec as needed. --- src/apprentice.c | 13 +-- src/file.h | 18 +++ src/funcs.c | 57 +--- src/softmagic.c | 11 +- 4 files changed, 59 insertions(+), 40 deletions(-) Index: file-5.41/src/apprentice.c === --- file-5.41.orig/src/apprentice.c +++
commit file for openSUSE:Factory
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-02-25 21:24:48 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.1958 (New) Package is "file" Fri Feb 25 21:24:48 2022 rev:124 rq:957248 version:5.41 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2021-10-23 00:50:20.409120977 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.1958/file.changes 2022-02-25 21:24:50.675635872 +0100 @@ -1,0 +2,20 @@ +Thu Feb 24 10:05:17 UTC 2022 - Dr. Werner Fink + +- Reenable libseccomp sandboxing + +--- +Thu Feb 24 08:41:32 UTC 2022 - Dominique Leuenberger + +- Fix previous entry: remove stray pkg-config call in CFLAGS (as it + was called without parameters, it only made output on stderr, + which did not impact CFLAGS; so de facto only a cleanup change). + +--- +Mon Feb 21 17:09:56 UTC 2022 - Dominique Leuenberger + +- Drop pkgconfig(libseccomp) BuildRequires and stop injecting + libseccomp cflags into CFLAGS: libseccomp has been disabled for a + long time already. +- Move the special 'check' part from install to %check. + +--- @@ -4 +24 @@ -- Remove file-5.38-allow-readlinkat.dif as already doen in latest +- Remove file-5.38-allow-readlinkat.dif as already done in latest Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.iscKJX/_old 2022-02-25 21:24:51.591636036 +0100 +++ /var/tmp/diff_new_pack.iscKJX/_new 2022-02-25 21:24:51.595636036 +0100 @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,10 +22,10 @@ Name: file BuildRequires: bash >= 4.0 BuildRequires: libtool -BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(zlib) URL:http://www.darwinsys.com/file/ # bug437293 %ifarch ppc64 @@ -139,7 +139,6 @@ export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)" %configure --disable-silent-rules --datadir=%{_miscdir} \ --disable-static \ - --disable-libseccomp \ --enable-fsect-man5 make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie" @@ -155,7 +154,9 @@ %if %{with decore} install -s dcore %{buildroot}%{_bindir} %endif +rm -f %{buildroot}%{_libdir}/*.la +%check # Check out that the binary does not bail out: LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH @@ -166,7 +167,6 @@ xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic done unset LD_LIBRARY_PATH -rm -f %{buildroot}%{_libdir}/*.la %post -n %libname -p /sbin/ldconfig ++ python-magic.spec ++ --- /var/tmp/diff_new_pack.iscKJX/_old 2022-02-25 21:24:51.619636040 +0100 +++ /var/tmp/diff_new_pack.iscKJX/_new 2022-02-25 21:24:51.627636042 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ file-rpmlintrc ++ --- /var/tmp/diff_new_pack.iscKJX/_old 2022-02-25 21:24:51.747636063 +0100 +++ /var/tmp/diff_new_pack.iscKJX/_new 2022-02-25 21:24:51.751636064 +0100 @@ -1,4 +1,3 @@ -addFilter(".*W:.*no-dependency-on file.*/file-libs/libfile.*") addFilter(".*W:.*name-repeated-in-summary.*") addFilter(".*:.*shlib-fixed-dependency.*")
commit file for openSUSE:Factory
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.changes2021-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 + +- 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 + +- 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.changes2021-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 + +- 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
commit file for openSUSE:Factory
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-04-29 01:36:27 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.12324 (New) Package is "file" Thu Apr 29 01:36:27 2021 rev:122 rq:888046 version:5.40 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2021-03-12 13:30:45.922110871 +0100 +++ /work/SRC/openSUSE:Factory/.file.new.12324/file.changes 2021-04-29 01:36:34.118422658 +0200 @@ -1,0 +2,62 @@ +Fri Apr 23 10:26:49 UTC 2021 - Dr. Werner Fink + +- Add patch file-5.40-ascii.patch + * fix regressions on dection of smaller ASCII files (boo#1184899) + +--- +Thu Apr 22 13:42:49 UTC 2021 - Dr. Werner Fink + +- Add upstream comitts as patches + * file-5.40-9b0459af.patch +put attributes inside the xz magic. (boo#1184888, boo#1184891) + * file-5.40-749e1ecf.patch +If the file is less than 3 bytes, use the file length to determine type + * file-5.40-f0601504.patch +Fix regression after unsigned/signed printing changes + * file-5.40-f7705dca.patch + fix previous (cast >>) + * file-5.40-3096f87f.patch +Correct return values to exptexted + * file-5.40-4c5fe1ad.patch +Add missing parens +- Port patch + * file-5.28-btrfs-image.dif +due patch file-5.40-f0601504.patch + +--- +Tue Apr 6 07:39:00 UTC 2021 - Dr. Werner Fink + +- Add upstream commits as patches + * file-5.40-1c677c04.patch +Don't count each byte encounter as 1, count the total number +of bytes found (Anatol Belski). This makes it behave like 5.39 + * file-5.40-6b34436a.patch +remove "u" from the pattern (Joerg Jenderek) + * file-5.40-9e2becec.patch +Encoding bug fix +- Fix offsets of patches + * file-5.17-option.dif + * file-5.19-biorad.dif + * file-5.19-printf.dif + * file-5.19-zip2.0.dif + * file-5.22-elf.dif + * file-5.23-endian.patch + * file-5.28-btrfs-image.dif + * file-5.38-allow-readlinkat.dif + * file-secure_getenv.patch + +--- +Sat Apr 3 07:32:11 UTC 2021 - Andreas Stieger + +- update to 5.40: + * Add limit to the number of bytes to scan for encoding + * Fix /T (trim flag) for regex + * Trim trailing separator. + * Convert system read errors from corrupt ELF +files into human readable error messages + * Exclude surrogate pairs from utf-8 detection +- drop upstreamed patches: + * file-5.16-ocloexec.patch + * file-5.39-alternate_format.dif + +--- --- /work/SRC/openSUSE:Factory/file/python-magic.changes2020-07-05 01:10:06.239391693 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.12324/python-magic.changes 2021-04-29 01:36:34.138422686 +0200 @@ -1,0 +2,6 @@ +Sat Apr 3 07:32:11 UTC 2021 - Andreas Stieger + +- update to 5.40: + * file 5.40, no changes specific to python-magic + +--- Old: file-5.16-ocloexec.patch file-5.39-alternate_format.dif file-5.39.tar.gz file-5.39.tar.gz.asc New: 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 Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.5cIfZr/_old 2021-04-29 01:36:35.238424245 +0200 +++ /var/tmp/diff_new_pack.5cIfZr/_new 2021-04-29 01:36:35.242424251 +0200 @@ -33,7 +33,7 @@ %endif # # Set Version also in python-magic.spec -Version:5.39 +Version:5.40 Release:0 Summary:A Tool to Determine File Types License:BSD-2-Clause @@ -60,12 +60,22 @@ Patch27:file-5.19-zip2.0.dif Patch31:file-5.19-biorad.dif Patch32:file-5.19-clicfs.dif -Patch33:file-5.16-ocloexec.patch 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 -Patch42:file-5.39-alternate_format.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:
commit file for openSUSE:Factory
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-03-12 13:30:32 Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.2401 (New) Package is "file" Fri Mar 12 13:30:32 2021 rev:121 rq:878177 version:5.39 Changes: --- /work/SRC/openSUSE:Factory/file/file.changes2020-07-05 01:10:03.859383846 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.2401/file.changes 2021-03-12 13:30:45.922110871 +0100 @@ -1,0 +2,5 @@ +Wed Mar 10 13:41:42 UTC 2021 - Dr. Werner Fink + +- Remove patch file-5.12-zip.dif as it is upstream solved (boo#1183143) + +--- Old: file-5.12-zip.dif Other differences: -- ++ file.spec ++ --- /var/tmp/diff_new_pack.tdwMKw/_old 2021-03-12 13:30:47.342112862 +0100 +++ /var/tmp/diff_new_pack.tdwMKw/_new 2021-03-12 13:30:47.346112868 +0100 @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -51,7 +51,6 @@ Patch8: file-4.20-xen.dif Patch9: file-5.22-elf.dif Patch10:file-5.19-printf.dif -Patch11:file-5.12-zip.dif Patch12:file-5.17-option.dif Patch13:file-4.21-scribus.dif Patch15:file-4.21-xcursor.dif @@ -117,7 +116,6 @@ %patch8 -p0 -b .xen %patch9 -p0 -b .elf %patch10 -p0 -b .prtf -%patch11 -p0 -b .zip %patch12 -p1 -b .opt %patch13 -p0 -b .scri %patch15 -p0 -b .xcur ++ python-magic.spec ++ --- /var/tmp/diff_new_pack.tdwMKw/_old 2021-03-12 13:30:47.370112901 +0100 +++ /var/tmp/diff_new_pack.tdwMKw/_new 2021-03-12 13:30:47.374112907 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed