Author: glen Date: Wed May 25 17:12:29 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- drop php-wsdl-cache.magic, applied upstream
---- Files affected:
packages/file:
file.spec (1.177 -> 1.178) , git.patch (NONE -> 1.1) (NEW),
php-wsdl-cache.magic (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/file/file.spec
diff -u packages/file/file.spec:1.177 packages/file/file.spec:1.178
--- packages/file/file.spec:1.177 Fri May 13 14:56:02 2011
+++ packages/file/file.spec Wed May 25 19:12:24 2011
@@ -40,7 +40,6 @@
Source2: %{name}-zisofs.magic
Source3: %{name}-mscompress.magic
Source4: %{name}-magic.mime-gen.awk
-Source5: php-wsdl-cache.magic
Patch1: %{name}-sparc.patch
Patch3: %{name}-greedy-dump.patch
Patch4: %{name}-selinux.patch
@@ -307,7 +306,7 @@
install -D magic/Localstuff $RPM_BUILD_ROOT%{_sysconfdir}/magic
-cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} %{SOURCE5}
>$RPM_BUILD_ROOT%{_datadir}/misc/magic
+cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3}
>$RPM_BUILD_ROOT%{_datadir}/misc/magic
awk -f %{SOURCE4} < $RPM_BUILD_ROOT%{_datadir}/misc/magic >
$RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -396,6 +395,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.178 2011/05/25 17:12:24 glen
+- drop php-wsdl-cache.magic, applied upstream
+
Revision 1.177 2011/05/13 12:56:02 glen
- up to 5.07
================================================================
Index: packages/file/git.patch
diff -u /dev/null packages/file/git.patch:1.1
--- /dev/null Wed May 25 19:12:29 2011
+++ packages/file/git.patch Wed May 25 19:12:24 2011
@@ -0,0 +1,250 @@
+diff --git a/doc/file.man b/doc/file.man
+index 7ce1cfb..e652faa 100644
+diff --git a/doc/libmagic.man b/doc/libmagic.man
+index ad4bcf5..88b11e4 100644
+diff --git a/doc/magic.man b/doc/magic.man
+index 37b950e..0278027 100644
+diff --git a/magic/Magdir/archive b/magic/Magdir/archive
+index e84c8e3..5ad1ce3 100644
+--- a/magic/Magdir/archive
++++ b/magic/Magdir/archive
+@@ -1,5 +1,5 @@
+
#------------------------------------------------------------------------------
+-# $File: archive,v 1.62 2011/01/07 20:24:25 christos Exp $
++# $File: archive,v 1.64 2011/05/14 02:29:14 christos Exp $
+ # archive: file(1) magic for archive formats (see also "msdos" for self-
+ # extracting compressed archives)
+ #
+@@ -654,6 +654,9 @@
+ >>>>78 string -template Template
+ !:mime application/vnd.oasis.opendocument.image-template
+
++>26 byte x Zip archive data
++
++
+ # StarView Metafile
+ # From Pierre Ducroquet <[email protected]>
+ 0 string VCLMTF StarView MetaFile
+diff --git a/magic/Magdir/macintosh b/magic/Magdir/macintosh
+index de54240..b184c02 100644
+--- a/magic/Magdir/macintosh
++++ b/magic/Magdir/macintosh
+@@ -1,6 +1,6 @@
+
+
#------------------------------------------------------------------------------
+-# $File: macintosh,v 1.20 2009/09/19 16:28:10 christos Exp $
++# $File: macintosh,v 1.21 2010/09/20 19:19:17 rrt Exp $
+ # macintosh description
+ #
+ # BinHex is the Macintosh ASCII-encoded file format (see also "apple")
+@@ -285,7 +285,7 @@
+ >0x412 beshort x number of blocks: %d,
+ >0x424 pstring x volume name: %s
+
+-# "BD" is has many false positives
++# "BD" gives many false positives
+ #0x400 beshort 0x4244 Macintosh HFS data
+ #>0 beshort 0x4C4B (bootable)
+ #>0x40a beshort &0x8000 (locked)
+diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
+index 731d50b..f8852cb 100644
+--- a/magic/Magdir/msdos
++++ b/magic/Magdir/msdos
+@@ -1,6 +1,6 @@
+
+
#------------------------------------------------------------------------------
+-# $File: msdos,v 1.71 2011/01/10 14:01:10 christos Exp $
++# $File: msdos,v 1.72 2011/05/08 01:21:41 christos Exp $
+ # msdos: file(1) magic for MS-DOS files
+ #
+
+@@ -389,10 +389,11 @@
+ >>4 uleshort&0x4842 >0 \bsupport
+ >0 ubyte x \b)
+ # DOS driver cmd640x.sys has 0x12 instead of 0xffffffff for pointer field to
next device header
+-0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable (
+->4 uleshort&0x8000 0x8000 \bcharacter
device driver
+->>10 string x %-.8s
+->4 uleshort&0x4000 0x4000 \b,control
strings-support)
++# Too weak, matches files that only contain 0's
++#0 ulequad&0x000007a0ffffffed 0x0000000000000000 DOS-executable (
++#>4 uleshort&0x8000 0x8000 \bcharacter
device driver
++#>>10 string x %-.8s
++#>4 uleshort&0x4000 0x4000 \b,control
strings-support)
+
+ # test too generic ?
+ 0 byte 0x8c DOS executable (COM)
+diff --git a/magic/Magdir/os9 b/magic/Magdir/os9
+index a155c8b..3445a6d 100644
+--- a/magic/Magdir/os9
++++ b/magic/Magdir/os9
+@@ -1,6 +1,6 @@
+
+
#------------------------------------------------------------------------------
+-# $File$
++# $File: os9,v 1.6 2009/09/19 16:28:11 christos Exp $
+ #
+ # Copyright (c) 1996 Ignatios Souvatzis. All rights reserved.
+ #
+@@ -12,13 +12,6 @@
+ # 2. Redistributions in binary form must reproduce the above copyright
+ # notice, this list of conditions and the following disclaimer in the
+ # documentation and/or other materials provided with the distribution.
+-# 3. All advertising materials mentioning features or use of this software
+-# must display the following acknowledgement:
+-# This product includes software developed by Ignatios Souvatzis for
+-# the NetBSD project.
+-# 4. The name of the author may not be used to endorse or promote products
+-# derived from this software without specific prior written permission.
+-#
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+diff --git a/magic/Magdir/printer b/magic/Magdir/printer
+index e9182f7..342dd28 100644
+--- a/magic/Magdir/printer
++++ b/magic/Magdir/printer
+@@ -1,11 +1,11 @@
+
+
#------------------------------------------------------------------------------
+-# $File: printer,v 1.23 2010/11/25 15:00:12 christos Exp $
++# $File: printer,v 1.24 2011/05/08 16:34:51 christos Exp $
+ # printer: file(1) magic for printer-formatted files
+ #
+
+ # PostScript, updated by Daniel Quinlan ([email protected])
+-0 string/t %! PostScript document text
++0 string %! PostScript document text
+ !:mime application/postscript
+ !:apple ASPSTEXT
+ >2 string PS-Adobe- conforming
+diff --git a/magic/Magdir/sniffer b/magic/Magdir/sniffer
+index 7982e90..3415047 100644
+--- a/magic/Magdir/sniffer
++++ b/magic/Magdir/sniffer
+@@ -1,6 +1,6 @@
+
+
#------------------------------------------------------------------------------
+-# $File$
++# $File: sniffer,v 1.14 2009/09/19 16:28:12 christos Exp $
+ # sniffer: file(1) magic for packet capture files
+ #
+ # From: [email protected] (Guy Harris)
+@@ -74,6 +74,7 @@
+ # that use "libpcap", or that use the same capture file format.)
+ #
+ 0 ubelong 0xa1b2c3d4 tcpdump capture file (big-endian)
++!:mime application/vnd.tcpdump.pcap
+ >4 beshort x - version %d
+ >6 beshort x \b.%d
+ >20 belong 0 (No link-layer encapsulation
+@@ -138,6 +139,7 @@
+ >20 belong 163 (802.11 with AVS header
+ >16 belong x \b, capture length %d)
+ 0 ulelong 0xa1b2c3d4 tcpdump capture file (little-endian)
++!:mime application/vnd.tcpdump.pcap
+ >4 leshort x - version %d
+ >6 leshort x \b.%d
+ >20 lelong 0 (No link-layer encapsulation
+diff --git a/src/file.h b/src/file.h
+index 6b0ad95..fad9efc 100644
+--- a/src/file.h
++++ b/src/file.h
+@@ -27,7 +27,7 @@
+ */
+ /*
+ * file.h - definitions for file(1) program
+- * @(#)$File: file.h,v 1.131 2011/02/03 01:43:33 christos Exp $
++ * @(#)$File: file.h,v 1.132 2011/03/20 20:36:52 christos Exp $
+ */
+
+ #ifndef __file_h__
+@@ -333,8 +333,10 @@ struct mlist {
+
+ #ifdef __cplusplus
+ #define CAST(T, b) static_cast<T>(b)
++#define RCAST(T, b) reinterpret_cast<T>(b)
+ #else
+ #define CAST(T, b) (T)(b)
++#define RCAST(T, b) (T)(b)
+ #endif
+
+ struct level_info {
+diff --git a/src/readelf.c b/src/readelf.c
+index 38382b7..6518fef 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: readelf.c,v 1.85 2010/07/19 14:56:53 christos Exp $")
++FILE_RCSID("@(#)$File: readelf.c,v 1.86 2010/07/21 16:47:18 christos Exp $")
+ #endif
+
+ #ifdef BUILTIN_ELF
+@@ -694,6 +694,7 @@ core:
+ unsigned char *cname, *cp;
+ size_t reloffset = prpsoffsets(i);
+ size_t noffset = doff + reloffset;
++ size_t k;
+ for (j = 0; j < 16; j++, noffset++,
+ reloffset++) {
+ /*
+@@ -744,12 +745,11 @@ core:
+ * Try next offsets, in case this match is
+ * in the middle of a string.
+ */
+- size_t k;
+ for (k = i + 1 ; k < NOFFSETS ; k++) {
+- if (prpsoffsets(k) >= prpsoffsets(i))
+- continue;
+ size_t no;
+ int adjust = 1;
++ if (prpsoffsets(k) >= prpsoffsets(i))
++ continue;
+ for (no = doff + prpsoffsets(k);
+ no < doff + prpsoffsets(i); no++)
+ adjust = adjust
+diff --git a/src/softmagic.c b/src/softmagic.c
+index 47b15cc..f25f2e5 100644
+--- a/src/softmagic.c
++++ b/src/softmagic.c
+@@ -32,7 +32,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: softmagic.c,v 1.143 2010/12/22 18:14:06 christos Exp
$")
++FILE_RCSID("@(#)$File: softmagic.c,v 1.144 2011/01/07 23:22:28 rrt Exp $")
+ #endif /* lint */
+
+ #include "magic.h"
+@@ -912,7 +912,7 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type,
int indir,
+ if (indir == 0) {
+ switch (type) {
+ case FILE_SEARCH:
+- ms->search.s = (const char *)s + offset;
++ ms->search.s = RCAST(const char *, s) + offset;
+ ms->search.s_len = nbytes - offset;
+ ms->search.offset = offset;
+ return 0;
+@@ -930,8 +930,8 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type,
int indir,
+ ms->search.s = NULL;
+ return 0;
+ }
+- buf = (const char *)s + offset;
+- end = last = (const char *)s + nbytes;
++ buf = RCAST(const char *, s) + offset;
++ end = last = RCAST(const char *, s) + nbytes;
+ /* mget() guarantees buf <= last */
+ for (lines = linecnt, b = buf; lines && b < end &&
+ ((b = CAST(const char *,
+@@ -944,7 +944,7 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type,
int indir,
+ b++;
+ }
+ if (lines)
+- last = (const char *)s + nbytes;
++ last = RCAST(const char *, s) + nbytes;
+
+ ms->search.s = buf;
+ ms->search.s_len = last - buf;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.177&r2=1.178&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
