[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/file/devel file-4.14-magic.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 file-4.10-debian.patch, 1.1, 1.2 file.spec, 1.26, 1.27 sources, 1.12, 1.13 file-4.13-howmany.patch, 1.1, NONE file-4.13-magic.patch, 1.1, NONE



Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27589

Modified Files:
	.cvsignore file-4.10-debian.patch file.spec sources 
Added Files:
	file-4.14-magic.patch 
Removed Files:
	file-4.13-howmany.patch file-4.13-magic.patch 
Log Message:
- sync with upstream, patch clean-up

file-4.14-magic.patch:
 magic/Magdir/apple    |   17 +++++++++++++++++
 magic/Magdir/images   |    6 ++++++
 magic/Magdir/revision |    6 ++++++
 magic/magic.mime      |   29 +++++++++++++++--------------
 src/file.c            |    3 ++-
 src/fsmagic.c         |    3 ++-
 6 files changed, 48 insertions(+), 16 deletions(-)

--- NEW FILE file-4.14-magic.patch ---
--- file-4.14/src/fsmagic.c.magic	2005-06-25 17:52:14.000000000 +0200
+++ file-4.14/src/fsmagic.c	2005-07-14 09:47:08.000000000 +0200
@@ -92,7 +92,8 @@
 		if (file_printf(ms, "cannot open `%s' (%s)",
 		    fn, strerror(errno)) == -1)
 			return -1;
-		return 1;
+		ms->haderr++;
+		return -1;
 	}
 
 	if ((ms->flags & MAGIC_MIME) != 0) {
--- file-4.14/src/file.c.magic	2005-03-06 06:58:22.000000000 +0100
+++ file-4.14/src/file.c	2005-07-14 09:47:08.000000000 +0200
@@ -362,7 +362,8 @@
 	}
 
 	while (fgets(buf, MAXPATHLEN, f) != NULL) {
-		buf[file_mbswidth(buf)-1] = '\0';
+	        // cut off CR, we _need_ bytes here, not characters
+		buf[strlen(buf)-1] = '\0';
 		process(buf, wid);
 		if(nobuffer)
 			(void) fflush(stdout);
--- file-4.14/magic/Magdir/apple.magic	2005-06-25 17:33:02.000000000 +0200
+++ file-4.14/magic/Magdir/apple	2005-07-14 09:47:08.000000000 +0200
@@ -10,6 +10,23 @@
 0	belong		0x00051600		AppleSingle encoded Macintosh file
 0	belong		0x00051607		AppleDouble encoded Macintosh file
 
+# Apple Emulator 2IMG format
+#
+0	string		2IMG		Apple ][ 2IMG Disk Image
+>4	string		XGS!		\b, XGS
+>4	string		CTKG		\b, Catakig
+>4	string		ShIm		\b, Sheppy's ImageMaker
+>4	string		WOOF		\b, Sweet 16
+>4	string		B2TR		\b, Bernie ][ the Rescue
+>4	string		!nfc		\b, ASIMOV2
+>4	string		x		\b, Unknown Format
+>0xc	byte		00		\b, DOS 3.3 sector order
+>>0x10	byte		00		\b, Volume 254
+>>0x10	byte&0x7f	x		\b, Volume %u
+>0xc	byte		01		\b, ProDOS sector order
+>>0x14	short		x		\b, %u Blocks
+>0xc	byte		02		\b, NIB data
+
 # magic for Newton PDA package formats
 # from Ruda Moura <ruda helllabs org>
 0	string	package0	Newton package, NOS 1.x,
--- file-4.14/magic/Magdir/images.magic	2005-03-06 06:11:56.000000000 +0100
+++ file-4.14/magic/Magdir/images	2005-07-14 09:47:08.000000000 +0200
@@ -526,3 +526,9 @@
 # specifications at http://hdf.ncsa.uiuc.edu/
 0	belong	0x0e031301	Hierarchical Data Format (version 4) data
 0	string	\211HDF\r\n\032	Hierarchical Data Format (version 5) data
+
+# The boot loaders syslinux and isolinux use a RLE based image format
+# called SLL16 to store splash screens.
+0	lelong		0x1413f33d	Syslinux SLL16 image data,
+>4	leshort		>0		%hd x
+>6	leshort		>0		%hd
--- file-4.14/magic/Magdir/revision.magic	2003-05-26 01:04:55.000000000 +0200
+++ file-4.14/magic/Magdir/revision	2005-07-14 09:47:08.000000000 +0200
@@ -3,3 +3,9 @@
 # file(1) magic for revision control files
 # From Hendrik Scholz <hendrik scholz net>
 0   string /1\ :pserver:    cvs password text file
+
+
+# Subversion (SVN) dumps
+# Uwe Zeisberger <zeisberg informatik uni-freiburg de>
+0       string  SVN-fs-dump-format-version:     Subversion dumpfile
+>28     string  >\0                             (version: %s)
--- file-4.14/magic/magic.mime.magic	2005-06-25 17:39:18.000000000 +0200
+++ file-4.14/magic/magic.mime	2005-07-14 09:49:16.000000000 +0200
@@ -195,7 +195,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
@@ -398,19 +398,14 @@
 #
 # from Daniel Quinlan <quinlan yggdrasil com>
 #
-0	string		\<HEAD	text/html
-0	string		\<head	text/html
-0	string		\<TITLE	text/html
-0	string		\<title	text/html
-0       string          \<html	text/html
-0       string          \<HTML	text/html
+0	string/cB	\<!DOCTYPE\ html	text/html
+0	string/cb	\<head	text/html
+0	string/cb	\<title	text/html
+0       string/bc	\<html	text/html
 0	string		\<!--	text/html
-0	string		\<h1	text/html
-0	string		\<H1	text/html
-0	string		\<!doctype\ HTML	text/html
-0	string		\<!DOCTYPE\ HTML	text/html
-0	string		\<!doctype\ html	text/html
-0	string		\<!doctype\ HTML	text/html
+0	string/c	\<h1	text/html
+
+0	string		\<?xml			text/xml
 
 #------------------------------------------------------------------------------
 # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
@@ -473,7 +468,7 @@
 0	beshort		0xffd8		image/jpeg
 
 # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt uchicago edu)
-0	string		BM		image/bmp
+0	string		BM		image/x-ms-bmp
 #>14	byte		12		(OS/2 1.x format)
 #>14	byte		64		(OS/2 2.x format)
 #>14	byte		40		(Windows 3.x format)
@@ -919,3 +914,9 @@
 # EET archive
 # From: Tilman Sauerbeck <tilman code-monkey de>
 0	belong	0x1ee7ff00	application/x-eet
+
+# Gnumeric spreadsheet
+# This entry is only semi-helpful, as Gnumeric compresses its files, so
+# they will ordinarily reported as "compressed", but at least -z helps
+39      string          =<gmr:Workbook           application/x-gnumeric
+


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Feb 2005 09:08:43 -0000	1.12
+++ .cvsignore	14 Jul 2005 07:55:51 -0000	1.13
@@ -1 +1 @@
-file-4.13.tar.gz
+file-4.14.tar.gz

file-4.10-debian.patch:
 magic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: file-4.10-debian.patch
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file-4.10-debian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file-4.10-debian.patch	9 Sep 2004 04:45:07 -0000	1.1
+++ file-4.10-debian.patch	14 Jul 2005 07:55:51 -0000	1.2
@@ -1,19 +1,20 @@
---- file-4.07/src/magic.c.debian	2003-12-23 12:32:30.000000000 -0500
-+++ file-4.07/src/magic.c	2004-01-19 15:13:44.465097506 -0500
-@@ -212,13 +212,13 @@
- {
+--- file-4.14/src/magic.c.debian	2005-06-25 17:52:14.000000000 +0200
++++ file-4.14/src/magic.c	2005-07-14 09:43:18.000000000 +0200
+@@ -213,7 +213,7 @@
  	int	fd = 0;
- 	unsigned char buf[HOWMANY+1];	/* one extra for terminating '\0' */
+ 	int	rv = -1;
+ 	unsigned char *buf;
 -	struct stat	sb;
-+	struct stat	sb, * st = &sb;
++	struct stat	sb, *st = &sb;
  	ssize_t nbytes = 0;	/* number of bytes read from a datafile */
  
+ 	/*
+@@ -227,7 +227,7 @@
  	if (file_reset(ms) == -1)
- 		return NULL;
+ 		goto done;
  
 -	switch (file_fsmagic(ms, inname, &sb)) {
 +	switch (file_fsmagic(ms, inname, st)) {
  	case -1:
- 		return NULL;
+ 		goto done;
  	case 0:
- 


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- file.spec	4 Jul 2005 07:08:28 -0000	1.26
+++ file.spec	14 Jul 2005 07:55:51 -0000	1.27
@@ -2,19 +2,17 @@
 
 Summary: A utility for determining file types.
 Name: file
-Version: 4.13
-Release: 5
+Version: 4.14
+Release: 1
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 Patch0: file-4.10-rh.patch
 Patch1: file-4.10-debian.patch
 Patch2: file-selinux.patch
-Patch3: file-4.13-magic.patch
-Patch4: file-4.12-core64.patch
+Patch3: file-4.14-magic.patch
 Patch5: file-4.13-fsdump.patch
 Patch6: file-4.13-quick.patch
-Patch7: file-4.13-howmany.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -33,10 +31,8 @@
 %patch1 -p1 -b .debian
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .magic
-%patch4 -p1 -b .core64
 %patch5 -p1 -b .fsdump
 %patch6 -p1 -b .quick
-%patch7 -p1 -b .howmany
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -81,7 +77,10 @@
 %{_libdir}/libmagic.*
 
 %changelog
-* Mon Jul 04 2005 Radek Vokal <rvokal redhat com> - 4.14-5
+* Thu Jul 14 2005 Radek Vokal <rvokal redhat com> - 4.14-1
+- sync with upstream, patch clean-up
+
+* Mon Jul 04 2005 Radek Vokal <rvokal redhat com> - 4.13-5
 - fixed reiserfs check (#162378)
 
 * Mon Apr 11 2005 Radek Vokal <rvokal redhat com> - 4.13-4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Feb 2005 09:08:43 -0000	1.12
+++ sources	14 Jul 2005 07:55:52 -0000	1.13
@@ -1 +1 @@
-2bfc0f878ee22e50441b68df2ccbb984  file-4.13.tar.gz
+66983e60087e8bcd588c8ab38a861af0  file-4.14.tar.gz


--- file-4.13-howmany.patch DELETED ---


--- file-4.13-magic.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]