From 73c2708820309209168101543c14f5093a98a38ed1029fb02affb7bb6f54695c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 28 Oct 2009 00:34:16 +0000 Subject: [PATCH] Accepting request 23284 from Base:System Copy from Base:System/file based on submit request 23284 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/23284 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=31 --- file-5.03-iso9660.dif | 10 ++ file.changes | 10 ++ file.spec | 299 +----------------------------------------- python-magic.spec | 6 +- 4 files changed, 25 insertions(+), 300 deletions(-) create mode 100644 file-5.03-iso9660.dif diff --git a/file-5.03-iso9660.dif b/file-5.03-iso9660.dif new file mode 100644 index 0000000..05d15a5 --- /dev/null +++ b/file-5.03-iso9660.dif @@ -0,0 +1,10 @@ +--- magic/Magdir/filesystems ++++ magic/Magdir/filesystems 2009-10-27 16:55:38.087429836 +0100 +@@ -1198,6 +1198,7 @@ + 32769 string CD001 + !:mime application/x-iso9660-image + >38913 string !NSR0 ISO 9660 CD-ROM filesystem data ++!:mime application/x-iso9660-image + >38913 string NSR0 UDF filesystem data + >>38917 string 1 (version 1.0) + >>38917 string 2 (version 1.5) diff --git a/file.changes b/file.changes index 7896beb..e8d27a6 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 27 17:04:51 CET 2009 - werner@suse.de + +- Make ISO9660 magic entry working with file 5.xx (bnc#547683) + +------------------------------------------------------------------- +Wed Sep 30 21:15:33 UTC 2009 - crrodriguez@opensuse.org + +- file-devel only requires glibc-devel + ------------------------------------------------------------------- Tue Jun 9 12:51:31 CEST 2009 - werner@suse.de diff --git a/file.spec b/file.spec index 22156a7..9ecb06b 100644 --- a/file.spec +++ b/file.spec @@ -31,7 +31,7 @@ Obsoletes: file-64bit # # Set Version also in python-magic.spec Version: 5.03 -Release: 1 +Release: 2 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -56,6 +56,7 @@ Patch24: file-4.24-warn.dif Patch25: file-5.02-javacheck.dif Patch26: file-4.24-solv.dif Patch27: file-5.02-zip2.0.dif +Patch28: file-5.03-iso9660.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -78,7 +79,7 @@ License: Other uncritical OpenSource License Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/Other Provides: file:/usr/include/magic.h -Requires: file = %{version}-%{release}, zlib-devel +Requires: file = %{version} glibc-devel AutoReqProv: on %description -n file-devel @@ -119,6 +120,7 @@ Authors: %patch25 -p0 -b .javacheck %patch26 -p0 -b .solv %patch27 -p0 -b .zip2.0 +%patch28 -p0 -b .iso9600 %patch %build @@ -175,296 +177,3 @@ unset LD_LIBRARY_PATH %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog -* Tue Jun 09 2009 werner@suse.de -- Do _not_ touch change log of python-magic -- Update to file version 5.03 - * Avoid null dereference in cdf code (Drew Yao) - * More cdf bounds checks and overflow checks -* Tue Jun 02 2009 coolo@novell.com -- sync Version using pre_checkin.sh -* Thu May 07 2009 werner@suse.de -- Add support for special zip archives (bnc#500511) -* Wed May 06 2009 werner@suse.de -- Update to file version 5.02 - * Read ~/.magic in addition to the default magic file not instead - of, as documented in the man page. - * filesystem and msdos patches (Joerg Jenderek) - * Added CDF parsing - * Add text/x-lua MIME type for Lua scripts. - * >= <= is not supported, so fix the magic and warn about it. - reported by: Thien-Thi Nguyen - * use memchr instead of strchr because the string - might not be NUL terminated (Scott MacVicar) - * Fix --mime, --mime-type and --mime-encoding under new scheme. - * add loop limits to avoid DoS attacks by constructing - looping sector references. - * Allow escaping of relation characters, so that we can say \^[A-Z] - and the ^ is not eaten as a relation char. -* Mon Jan 26 2009 crrodriguez@suse.de -- remove "la" files and static libraries -* Wed Dec 10 2008 olh@suse.de -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) -* Thu Nov 27 2008 werner@suse.de -- Add libsatsolver file magic -- Re-enable detection of old LZW (.Z) format (bnc#448984) -* Thu Oct 30 2008 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Tue Aug 19 2008 ro@suse.de -- fix detection for java bytecode -* Tue May 06 2008 aj@suse.de -- Do not return random data. -* Thu Apr 24 2008 werner@suse.de -- Don't slip into Mp3 channel for ext file systems (bnc#383431) -* Mon Apr 14 2008 werner@suse.de -- Add CROM File System to Localstuff (bnc#379027) -- Update to file bugfix version 4.24 - * ELF core file command name/line bug fixes and enhancements - * Change strength of ! from MULT to 0, as it matches almost anything (Reuben Thomas) - * Clarify UTF-8 BOM message (Reuben Thomas) - * Add HTML comment to token list in names.h - * !:mime annotations in magic files (Reuben Thomas) - * zero out utime/utimes structs (Gavin Atkinson) - * reduce writable data from Diego "Flameeyes" Petten - * strtof detection - * remove bogus regex magic that could cause a DoS - * better mismatch version message - * bring back some fixes from OpenBSD - * treat ELF dynamic objects as executables - * fix gcc warnings - * make sure we have zlib.h and libz to compile the builtin - decompress code - * float and double magic support (Behan Webster) - * Convert fortran to a soft test (Reuben Thomas) - * Add --with-filename, and --no-filename (Reuben Thomas) - * Rest of the mime split (Reuben Thomas) - * Make usage message generated from the flags so that - they stay consistent (Reuben Thomas) - * typo in comment, missing ifdef QUICK, remove unneeded code - * Fix problem printing -\012 in some entries - * Separate magic type and encoding flags (Reuben Thomas) - * configure fix for int64 and strndup (Reuben Thomas) - * Add magic_descriptor() function. - * Fix regression in elf reading code where the core name was - not being printed. - * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson) - * Make mime format consistent so that it can - Remove 7/8bit classifications, since they were arbitrary - and not based on the file data. -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Thu Mar 13 2008 werner@suse.de -- Remember ReiserFS V3.6.19 (bnc#370535) -* Mon Jan 28 2008 rguenther@suse.de -- Split python-magic off to separate spec file to avoid pulling - python into the base build cycle -* Tue Jan 15 2008 werner@suse.de -- Move python-base to python -* Wed Dec 05 2007 werner@suse.de -- Add X11 cursor magic to Localstuff (bug #346132) -- New package python-magic, the python API for the libmagic -* Fri Aug 31 2007 werner@suse.de -- Make regex for awk more robust to avoid conflict with PostScript, - thanks goes to Werner Lemberg for the report -* Wed Aug 29 2007 werner@suse.de -- Add Scribus to local magic (bug #298009) -* Wed Jun 06 2007 werner@suse.de -- Update to file version 4.21 including the last three bug fixes -* Thu May 24 2007 werner@suse.de -- Fix of the fix for bug #256290 with CVE-2007-2799 -* Mon May 21 2007 werner@suse.de -- Expand search area used before regex (also bug #263754) -* Mon May 14 2007 werner@suse.de -- More on DoS attack with regex (bug #263754) -- Avoid crash on unknown option and enable option `-e' -* Mon Apr 16 2007 werner@suse.de -- Avoid DoS attack with regex (bug #263754) -* Thu Apr 05 2007 werner@suse.de -- Avoid trouble with variable/macro on ppc64 -* Mon Mar 26 2007 rguenther@suse.de -- Add zlib-devel BuildRequires -* Wed Mar 21 2007 werner@suse.de -- Update to file 4.20 due security reason CVE-2007-1536 (#256290) -* Wed Mar 07 2007 rguenther@suse.de -- Fix order of changelog entries -* Thu Nov 23 2006 werner@suse.de -- Initialize variable in elf patch -* Wed Nov 22 2006 werner@suse.de -- Update to new file 4.18 - * Includes most of our extensions (elf, fifo, softmagic) -* Mon Jun 12 2006 werner@suse.de -- Reenable file to display process name from a core dump (#183685) -* Mon Mar 27 2006 werner@suse.de -- Add Mono/.Net identfiers to msdos magics (bug #159708) -* Fri Mar 24 2006 werner@suse.de -- Update to file version 4.17 - * This version supports new key like `search' and `regex' - * Port our patches to this version -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jan 16 2006 werner@suse.de -- Add Xen magics -* Tue Dec 06 2005 werner@suse.de -- Add Structured Storage Entry for PageMaker to local (bug #134895) -* Thu Oct 20 2005 werner@suse.de -- Update to file version 4.16 -* Tue Aug 23 2005 werner@suse.de -- Fix broken cracklib magic (bug #106007) -* Mon Jul 25 2005 werner@suse.de -- Update to new file 4.14 -- Split of the development version as own package -* Fri Jul 01 2005 werner@suse.de -- Even for netware the columns in the magic entry are seperated - by tabs -- Add cracklib magics (bug #93673) -* Mon Jun 13 2005 mmj@suse.de -- Add primitive magic for detecting netware loadable modules (NLMs) -- Don't remove buildroot before install -- Don't strip binaries explicitly -- %%doc is implied by %%man -* Thu Mar 17 2005 werner@suse.de -- Be sure that the pipe/fifo patch works (bug #73644) -* Thu Mar 10 2005 werner@suse.de -- Be able to use the -s option even on pipes (bug #71074) -- Do not hang on sockets or pipes not opened on the write side -* Fri Feb 18 2005 werner@suse.de -- Update to file 4.13 for fixes in handling of bzip2 and DOS files -- Do not be fooled by minix filesystems magics on jpeg files -* Fri Nov 26 2004 werner@suse.de -- Update to file 4.12, this may fix a security issue (bug #48576) -* Tue Sep 28 2004 werner@suse.de -- Correct PCP entries (bug #46111) -* Thu Sep 16 2004 werner@suse.de -- Read HOWMANY bytes even from a pipe (reported by max) -* Thu Aug 26 2004 werner@suse.de -- Update to bugfix release 4.09 -* Tue Aug 24 2004 lmuelle@suse.de -- Add -fPIC to the CFLAGS. -* Wed May 26 2004 werner@suse.de -- Don't trap into string formats if integers are provided (#41209) -* Mon May 24 2004 werner@suse.de -- Check for random data within ELF header (bug #40909) -* Thu Feb 12 2004 werner@suse.de -- Add name offsets for CORE dumps even for 64bit ELF (bug #34461) -* Tue Jan 20 2004 werner@suse.de -- Update to 4.07 -* Mon Dec 15 2003 werner@suse.de -- Add workaround for new automake `feature' of ignoring man pages -- Ensure that the correct break condition is returned if readelf - past the end of the buffer (bug #33644). -* Mon Dec 08 2003 werner@suse.de -- Update to 4.06 -- Use /etc/magic:/usr/share/misc/magic as magic and move /etc/magic - to a real configuration file for _local_ settings (bug #32725). -* Sat Oct 18 2003 kukuk@suse.de -- Add patch to detect policy file for SE Linux -- Build as normal user -- Clean up build root -* Mon Sep 29 2003 werner@suse.de -- Avoid endless loop due wrong alignment in old ELF binaries -* Tue Sep 16 2003 werner@suse.de -- Extend buffer from 64kb upto 68kB to find ReiserFS (bug #30736) -* Wed Jul 02 2003 werner@suse.de -- Use _libdir -* Tue Jul 01 2003 werner@suse.de -- Update to file 4.03 -* Thu Apr 17 2003 coolo@suse.de -- use BuildRoot -* Tue Mar 04 2003 werner@suse.de -- Fix buffer overflow in elf detection -* Tue Dec 17 2002 olh@suse.de -- use RPM_BUILD_ROOT, not BUILD_ROOT in testsuite -* Mon Nov 11 2002 ro@suse.de -- fix deprecated multiline string literal (from longopt patch) -* Tue Sep 17 2002 ro@suse.de -- removed bogus self-provides -* Tue Jul 23 2002 werner@suse.de -- Add mySQL bytes to magic (bug #16138) -* Fri Jun 07 2002 olh@suse.de -- don't change the union u in readelf.c:tryelf() on ppc64 -* Mon Feb 04 2002 werner@suse.de -- Fix looking of manual page -* Mon Feb 04 2002 werner@suse.de -- Add some magics for METAFONT format files -- Add inofficial long options for LSB -* Thu Dec 27 2001 adrian@suse.de -- fix file output for mips binaries. The old output broke several - ltconfig scripts in other packages and was wrong anyway. -- recompress tar ball with bz2 -* Wed Dec 19 2001 werner@suse.de -- update to version 3.37 -* Sat Jun 30 2001 bk@suse.de -- update to version 3.33 -- don't change the union u in readelf.c:tryelf() on s390x. -- option i: fix one-byte memory underallocation - strcat adds '\0' -* Thu Jun 07 2001 werner@suse.de -- Autoconf and Elf header: make it work again -* Fri May 04 2001 werner@suse.de -- Make symlink /etc/magic a relative one -* Tue Jan 16 2001 werner@suse.de -- Change order to find WAVE and TTF data before G3, apple and - macintosh data. -- Change string detection of PFM data to bit comparision masking - out the third bit to make raw G3 work. -* Sun Dec 03 2000 schwab@suse.de -- Don't match against artificial null byte. -- Fix resource leaks. -* Tue Nov 28 2000 aj@suse.de -- Add LFS support. -* Tue Nov 14 2000 werner@suse.de -- Correct version handling of Linux/i386 Kernel setup header -* Mon Nov 13 2000 werner@suse.de -- Fix handling of Microsoft Access Database in comparision - with Digifax-G3-File. -* Tue Oct 03 2000 kukuk@suse.de -- fix inclusion of config.h -- Add group tag -* Thu Sep 28 2000 werner@suse.de -- Move Magdir changes into misc dif -- Remove exectuable from text scripts -* Fri Sep 15 2000 werner@suse.de -- Update to version 3.32 -* Tue Jun 20 2000 werner@suse.de -- /usr/lib/magic -> /usr/share/misc/magic -* Thu Feb 03 2000 schwab@suse.de -- Ignore SHT_DYNSYM sections when deciding whether object is stripped. -* Fri Jan 28 2000 schwab@suse.de -- Fix int32 vs long problem. -* Thu Jan 27 2000 schwab@suse.de -- Fix non-ascii literal characters in string -- Specfile cleanup, get rid of Makefile.Linux -- /usr/man -> /usr/share/man -* Thu Nov 25 1999 schwab@suse.de -- Fix location of magic file. -* Tue Nov 23 1999 kukuk@suse.de -- Update to version 3.27 -- Add patches for SPARC -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Tue Aug 24 1999 uli@suse.de -- added -fsigned-char to CFLAGS (PPC) -* Thu Nov 05 1998 ro@suse.de -- disabled dcore (won't build with glibc-2.0) -* Thu Oct 01 1998 ro@suse.de -- update to 3.26 -- hacked dcore.c to build with glibc-2.1 -* Fri Oct 10 1997 florian@suse.de -- add some more entries to magic -* Wed Jun 25 1997 florian@suse.de -- add additional entries to recognize LaTeX files -* Tue May 27 1997 florian@suse.de -- add some additional entries from mgetty/vgetty -- add additional entries for CLISP and GNU gettext from Bruno Haible -* Wed Jan 22 1997 florian@suse.de -- update to version 3.22 -* Thu Jan 02 1997 florian@suse.de -- recognise german umlauts as text: dirty hack, but also call "setlocale" - for correctly installed systems... -- add "dcore"-program to show some information about core-files -* Thu Jan 02 1997 florian@suse.de -- update to version 3.21 -- mv /etc/magic /usr/lib/magic (/etc/magic is still a symlink to new - location) -* Thu Jan 02 1997 florian@suse.de -- added missing entries for G3-fax (from mgetty source) diff --git a/python-magic.spec b/python-magic.spec index c9277bc..4b5afe1 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -27,7 +27,7 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on Version: 5.03 -Release: 1 +Release: 2 Summary: Python module to use libmagic %py_requires Source99: file.spec @@ -61,7 +61,3 @@ popd %doc python/README python/example.py %changelog -* Tue Apr 15 2008 werner@suse.de -- Also change version number in python-magic.spec -* Mon Jan 28 2008 rguenther@suse.de -- Split off from file.