diff --git a/.cvsignore b/.cvsignore index 8da3fd1..79d4157 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-4.19.tar.gz +file-4.20.tar.gz diff --git a/file-4.19-magic.patch b/file-4.19-magic.patch index e4baf1b..66aa13f 100644 --- a/file-4.19-magic.patch +++ b/file-4.19-magic.patch @@ -53,15 +53,6 @@ 0 string package0 Newton package, NOS 1.x, --- file-4.19/magic/magic.mime.magic 2007-01-09 17:49:55.000000000 +0100 +++ file-4.19/magic/magic.mime 2007-01-09 18:08:43.000000000 +0100 -@@ -193,7 +193,7 @@ - 0 beshort 0x4De1 audio/MP4A-LATM - - # MPEG Layer 3 sound files --0 beshort &0xffe0 audio/mpeg -+0 beshort&0xfffe =0xfffa audio/mpeg - #MP3 with ID3 tag - 0 string ID3 audio/mpeg - # Ogg/Vorbis @@ -397,16 +397,14 @@ # # from Daniel Quinlan diff --git a/file-4.20-REG_STARTEND.patch b/file-4.20-REG_STARTEND.patch new file mode 100644 index 0000000..e0b0052 --- /dev/null +++ b/file-4.20-REG_STARTEND.patch @@ -0,0 +1,32 @@ +--- file-4.20/src/softmagic.c 18 Jan 2007 05:29:33 -0000 1.91 ++++ file-4.20/src/softmagic.c 3 Mar 2007 19:09:25 -0000 1.95 +@@ -38,7 +38,7 @@ + + + #ifndef lint +-FILE_RCSID("@(#)$File: softmagic.c,v 1.91 2007/01/18 05:29:33 ljt Exp $") ++FILE_RCSID("@(#)$File: softmagic.c,v 1.95 2007/03/03 19:09:25 christos Exp $") + #endif /* lint */ + + private int match(struct magic_set *, struct magic *, uint32_t, +@@ -1523,10 +1523,20 @@ + } + else { + regmatch_t pmatch[1]; ++#ifndef REG_STARTEND ++#define REG_STARTEND 0 ++ size_t l = ms->search.s_len - 1; ++ char c = ms->search.s[l]; ++ ((char *)(intptr_t)ms->search.s)[l] = '\0'; ++#else + pmatch[0].rm_so = 0; + pmatch[0].rm_eo = ms->search.s_len; ++#endif + rc = regexec(&rx, (const char *)ms->search.s, + 1, pmatch, REG_STARTEND); ++#if REG_STARTEND == 0 ++ ((char *)(intptr_t)ms->search.s)[l] = c; ++#endif + switch (rc) { + case 0: + ms->search.s += (int)pmatch[0].rm_so; diff --git a/file.spec b/file.spec index 82a4a0e..bfbf332 100644 --- a/file.spec +++ b/file.spec @@ -2,8 +2,8 @@ Summary: A utility for determining file types Name: file -Version: 4.19 -Release: 4%{?dist} +Version: 4.20 +Release: 1%{?dist} License: Distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -21,8 +21,7 @@ Patch18: file-4.17-powerpoint.patch Patch20: file-4.17-bash.patch Patch21: file-4.19-ELF.patch Patch22: file-4.19-ooffice.patch - -#Patch19: file-4.17-empty.patch +Patch23: file-4.20-REG_STARTEND.patch Requires: file-libs = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -70,6 +69,7 @@ necessary for developing programs using libmagic. %patch20 -p1 -b .bash %patch21 -p1 -b .ELF %patch22 -p1 -b .ooffice +%patch23 -p1 -b .REG_STARTEND iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -127,17 +127,20 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Feb 20 2007 Martin Bacovsky - 4.19-4.fc7 +* Wed Mar 7 2007 Martin Bacovsky - 4.20-1 +- upgrade to new upstream 4.20 + +* Tue Feb 20 2007 Martin Bacovsky - 4.19-4 - rpath in file removal -* Mon Feb 19 2007 Martin Bacovsky - 4.19-3.fc7 +* Mon Feb 19 2007 Martin Bacovsky - 4.19-3 - Resolves: #225750 - Merge Review: file -* Thu Jan 25 2007 Martin Bacovsky - 4.19-2.fc7 +* Thu Jan 25 2007 Martin Bacovsky - 4.19-2 - Resolves: #223297 - file does not recognize OpenOffice "native" formats - Resolves: #224344 - Magic rules should be in file-libs -* Tue Jan 9 2007 Martin Bacovsky - 4.19-1.fc7 +* Tue Jan 9 2007 Martin Bacovsky - 4.19-1 - Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file thanks to for patch - Resolves: #214992 - file-devel should own %%_includedir/* %%_libdir/lib*.so diff --git a/sources b/sources index a7623d9..6e25834 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a61ef3aa8339d5987148089afde25f60 file-4.19.tar.gz +402bdb26356791bd5d277099adacc006 file-4.20.tar.gz