From b90e8cafc8cb8bc8ca31a2f7ed03a87b0259e9d44e7f7d590a6b95852cf0d0aa Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Jan 2015 08:00:50 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=113 --- file-5.14-tex.dif | 2 +- file-5.21.tar.gz | 3 --- file-5.18-elf.dif => file-5.22-elf.dif | 12 ++++++---- file-5.20.dif => file-5.22.dif | 32 +++++++++++++------------- file-5.22.tar.gz | 3 +++ file.changes | 15 ++++++++++++ file.spec | 8 +++---- python-magic.spec | 2 +- 8 files changed, 48 insertions(+), 29 deletions(-) delete mode 100644 file-5.21.tar.gz rename file-5.18-elf.dif => file-5.22-elf.dif (58%) rename file-5.20.dif => file-5.22.dif (95%) create mode 100644 file-5.22.tar.gz diff --git a/file-5.14-tex.dif b/file-5.14-tex.dif index 663b0ed..ea28be6 100644 --- a/file-5.14-tex.dif +++ b/file-5.14-tex.dif @@ -1,7 +1,7 @@ --- magic/Localstuff +++ magic/Localstuff 2013-09-30 00:00:00.000000000 +0000 @@ -5,3 +5,12 @@ - # $File: Localstuff,v 1.5 2007/01/12 17:38:27 christos Exp $ + # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. + diff --git a/file-5.21.tar.gz b/file-5.21.tar.gz deleted file mode 100644 index 79000c1..0000000 --- a/file-5.21.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a48741d3923c4cc73267109b8a396c0ce3aebe004181f3efb1b0a228d230bb6 -size 732138 diff --git a/file-5.18-elf.dif b/file-5.22-elf.dif similarity index 58% rename from file-5.18-elf.dif rename to file-5.22-elf.dif index ed2d9e4..7dea262 100644 --- a/file-5.18-elf.dif +++ b/file-5.22-elf.dif @@ -1,15 +1,19 @@ +--- + src/readelf.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + --- src/readelf.c -+++ src/readelf.c 2014-03-28 10:12:22.094878811 +0000 -@@ -737,7 +737,7 @@ core: ++++ src/readelf.c 2015-01-19 10:25:08.749519408 +0000 +@@ -706,7 +706,7 @@ do_core_note(struct magic_set *ms, unsig default: - if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { + if (type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) { - size_t i, j; + size_t i, j, m = 0; unsigned char c; /* * Extract the program name. We assume -@@ -749,7 +749,9 @@ core: +@@ -718,7 +718,9 @@ do_core_note(struct magic_set *ms, unsig * If the characters aren't all printable, * reject it. */ diff --git a/file-5.20.dif b/file-5.22.dif similarity index 95% rename from file-5.20.dif rename to file-5.22.dif index 3eb6fbf..a95c889 100644 --- a/file-5.20.dif +++ b/file-5.22.dif @@ -89,7 +89,7 @@ # hooray, there's a DOS extender using the PE format, with a valid PE # executable inside (which just prints a message and exits if run in win) --- magic/Makefile.am -+++ magic/Makefile.am 2014-10-13 11:06:01.852337743 +0000 ++++ magic/Makefile.am 2015-01-19 10:35:16.594852944 +0000 @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) @@ -124,7 +124,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -121,7 +121,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -122,7 +122,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -132,7 +132,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -129,7 +128,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -130,7 +129,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -140,7 +140,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -150,10 +148,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -151,10 +149,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -152,8 +152,8 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -199,6 +197,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ - $(MAGIC_FRAGMENT_DIR)/python \ +@@ -201,6 +199,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ +$(MAGIC_FRAGMENT_DIR)/apple \ @@ -161,7 +161,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -268,8 +268,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -270,8 +270,20 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -183,7 +183,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 -@@ -281,19 +293,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ +@@ -283,19 +295,22 @@ FILE_COMPILE = $(top_builddir)/src/file$ FILE_COMPILE_DEP = $(FILE_COMPILE) endif @@ -223,7 +223,7 @@ +# $(FILE_COMPILE) -C -m magic +# @rm -fr magic --- magic/Makefile.in -+++ magic/Makefile.in 2014-10-13 11:09:03.820337523 +0000 ++++ magic/Makefile.in 2015-01-19 10:35:01.869520761 +0000 @@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@ MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -258,7 +258,7 @@ $(MAGIC_FRAGMENT_DIR)/karma \ $(MAGIC_FRAGMENT_DIR)/kde \ $(MAGIC_FRAGMENT_DIR)/keepass \ -@@ -382,7 +382,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ +@@ -383,7 +383,6 @@ $(MAGIC_FRAGMENT_DIR)/kml \ $(MAGIC_FRAGMENT_DIR)/lecter \ $(MAGIC_FRAGMENT_DIR)/lex \ $(MAGIC_FRAGMENT_DIR)/lif \ @@ -266,7 +266,7 @@ $(MAGIC_FRAGMENT_DIR)/lisp \ $(MAGIC_FRAGMENT_DIR)/llvm \ $(MAGIC_FRAGMENT_DIR)/lua \ -@@ -390,7 +389,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ +@@ -391,7 +390,6 @@ $(MAGIC_FRAGMENT_DIR)/luks \ $(MAGIC_FRAGMENT_DIR)/m4 \ $(MAGIC_FRAGMENT_DIR)/mach \ $(MAGIC_FRAGMENT_DIR)/macos \ @@ -274,7 +274,7 @@ $(MAGIC_FRAGMENT_DIR)/magic \ $(MAGIC_FRAGMENT_DIR)/mail.news \ $(MAGIC_FRAGMENT_DIR)/make \ -@@ -411,10 +409,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ +@@ -412,10 +410,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ $(MAGIC_FRAGMENT_DIR)/mkid \ $(MAGIC_FRAGMENT_DIR)/mlssa \ $(MAGIC_FRAGMENT_DIR)/mmdf \ @@ -286,8 +286,8 @@ $(MAGIC_FRAGMENT_DIR)/msooxml \ $(MAGIC_FRAGMENT_DIR)/msx \ $(MAGIC_FRAGMENT_DIR)/msvc \ -@@ -460,6 +458,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ - $(MAGIC_FRAGMENT_DIR)/python \ +@@ -462,6 +460,8 @@ $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/qt \ $(MAGIC_FRAGMENT_DIR)/revision \ $(MAGIC_FRAGMENT_DIR)/riff \ +$(MAGIC_FRAGMENT_DIR)/apple \ @@ -295,7 +295,7 @@ $(MAGIC_FRAGMENT_DIR)/rpm \ $(MAGIC_FRAGMENT_DIR)/rtf \ $(MAGIC_FRAGMENT_DIR)/ruby \ -@@ -529,10 +529,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ +@@ -531,10 +531,22 @@ $(MAGIC_FRAGMENT_DIR)/zfs \ $(MAGIC_FRAGMENT_DIR)/zilog \ $(MAGIC_FRAGMENT_DIR)/zyxel @@ -319,7 +319,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} -@@ -753,23 +765,25 @@ uninstall-am: uninstall-pkgdataDATA +@@ -755,23 +767,25 @@ uninstall-am: uninstall-pkgdataDATA mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA diff --git a/file-5.22.tar.gz b/file-5.22.tar.gz new file mode 100644 index 0000000..1e37ec5 --- /dev/null +++ b/file-5.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b +size 732556 diff --git a/file.changes b/file.changes index 721895a..d6cca71 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jan 19 10:48:12 UTC 2015 - werner@suse.de + +- Update to file version 5.22 (also related to bsc#913650 and bsc#913651) + * add indirect relative for TIFF/Exif + * restructure elf note printing to avoid repeated messages + * add note limit, suggested by Alexander Cherepanov + * Bail out on partial pread()'s (Alexander Cherepanov) + * Fix incorrect bounds check in file_printable (Alexander Cherepanov) + * PR/405: ignore SIGPIPE from uncompress programs + * change printable -> file_printable and use it in + more places for safety + * in ELF, instead of "(uses dynamic libraries)" when PT_INTERP + is present print the interpreter name. + ------------------------------------------------------------------- Sat Dec 20 08:57:15 UTC 2014 - meissner@suse.com diff --git a/file.spec b/file.spec index 488c38c..4eedaa1 100644 --- a/file.spec +++ b/file.spec @@ -1,7 +1,7 @@ # # spec file for package file # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ Obsoletes: file-64bit %endif # # Set Version also in python-magic.spec -Version: 5.21 +Version: 5.22 Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause @@ -38,13 +38,13 @@ Group: Productivity/File utilities Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf Source3: file-rpmlintrc -Patch: file-5.20.dif +Patch: file-5.22.dif Patch1: file-5.19-misc.dif Patch4: file-4.24-autoconf.dif Patch5: file-5.14-tex.dif Patch7: file-4.20-ssd.dif Patch8: file-4.20-xen.dif -Patch9: file-5.18-elf.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 diff --git a/python-magic.spec b/python-magic.spec index c10e66b..917c020 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -1,7 +1,7 @@ # # spec file for package python-magic # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 08ce6caa2c26533be8f20832e24f587520662be5b914f568698eb4ae6a72458c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Jan 2015 08:47:08 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=114 --- file.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file.changes b/file.changes index d6cca71..1a5a455 100644 --- a/file.changes +++ b/file.changes @@ -12,6 +12,8 @@ Mon Jan 19 10:48:12 UTC 2015 - werner@suse.de more places for safety * in ELF, instead of "(uses dynamic libraries)" when PT_INTERP is present print the interpreter name. +- Patch file-5.18-elf.dif is modified and renamed to file-5.22-elf.dif +- Patch file-5.20.dif s modified and renamed to file-5.22.dif ------------------------------------------------------------------- Sat Dec 20 08:57:15 UTC 2014 - meissner@suse.com From d07bd8b89c2af9a7e2589febe6576bc9f245ace7daadaff643066609bb5983c8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Jan 2015 11:12:01 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=115 --- python-magic.changes | 5 +++++ python-magic.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-magic.changes b/python-magic.changes index 9540068..d6e609c 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 20 11:11:43 UTC 2015 - werner@suse.de + +- adapt version in specfile to 5.22 + ------------------------------------------------------------------- Wed Dec 17 13:13:59 UTC 2014 - werner@suse.de diff --git a/python-magic.spec b/python-magic.spec index 917c020..f3cdd4a 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -23,7 +23,7 @@ BuildRequires: libtool BuildRequires: python-devel BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ -Version: 5.21 +Version: 5.22 Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause and BSD-4-Clause