rpms/file/devel file-4.21-core_from.patch, NONE, 1.1 file-4.21-msoffice.patch, NONE, 1.1 file.spec, 1.64, 1.65

[Martin Bacovsky (mbacovsk)]

Author: mbacovsk

Update of /cvs/pkgs/rpms/file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6064

Modified Files:
	file.spec 
Added Files:
	file-4.21-core_from.patch file-4.21-msoffice.patch 
Log Message:
* Wed Aug 15 2007 Martin Bacovsky <mbacovsk at redhat.com> - 4.21-3
- resolves: #172015: no longer reports filename of crashed app when run on core files.
- resolves: #249578: Weird output from "file -i"
- resolves: #234817: file reports wrong filetype for microsoft word file


file-4.21-core_from.patch:

--- NEW FILE file-4.21-core_from.patch ---
--- file-4.21/src/readelf.c.core_from	2007-08-15 12:11:37.000000000 +0200
+++ file-4.21/src/readelf.c	2007-08-15 12:11:53.000000000 +0200
@@ -569,8 +569,8 @@
 	 * doesn't include the terminating null in the
 	 * name....
 	 */
-	if ((namesz == 4 && strncmp((char *)&nbuf[noff], "CORE", 4) == 0) ||
-	    (namesz == 5 && strcmp((char *)&nbuf[noff], "CORE") == 0)) {
+	if ((namesz == 4 && strncmp((char *)&nbuf[noff], "CORE", 4) == 0 && xnh_type == NT_PRPSINFO) ||
+	    (namesz == 5 && strcmp((char *)&nbuf[noff], "CORE") == 0 && xnh_type == NT_PRPSINFO)) {
 		os_style = OS_STYLE_SVR4;
 	} 
 
@@ -617,6 +617,7 @@
 				return size;
 			return size;
 		}
+	    *flags |= FLAGS_DID_CORE;
 		break;
 
 	default:
@@ -689,11 +690,11 @@
 			tryanother:
 				;
 			}
+	        *flags |= FLAGS_DID_CORE;
 		}
 		break;
 	}
 #endif
-	*flags |= FLAGS_DID_CORE;
 	return offset;
 }
 

file-4.21-msoffice.patch:

--- NEW FILE file-4.21-msoffice.patch ---
--- file-4.21/magic/Magdir/msdos.msoffice	2007-08-20 15:06:19.000000000 +0200
+++ file-4.21/magic/Magdir/msdos	2007-08-20 15:06:24.000000000 +0200
@@ -624,5 +624,5 @@
 0	lelong	0x02468ace			Bochs Sparse disk image
 
 # from http://filext.com by Derek M Jones <derek at knosof.co.uk>
-0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
+#0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
 0	string	\320\317\021\340\241\261\032\341	Microsoft Office Document
--- file-4.21/magic/magic.mime.msoffice	2007-08-17 11:17:19.000000000 +0200
+++ file-4.21/magic/magic.mime	2007-08-17 15:01:58.000000000 +0200
@@ -851,6 +851,7 @@
 0	string	\320\317\021\340\241\261\032\341
 >546	string	bjbj			application/msword
 >546	string	jbjb			application/msword
+>546    default x               application/msword
 
 512	string	R\0o\0o\0t\0\ \0E\0n\0t\0r\0y	application/msword
 
@@ -859,7 +860,6 @@
 2112	string	MSWordDoc			application/msword
 
 #0	string	\320\317\021\340\241\261\032\341	application/powerpoint
-0	string	\320\317\021\340\241\261\032\341	application/msword
 
 0       string  #\ PaCkAgE\ DaTaStReAm  application/x-svr4-package
 


Index: file.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file/devel/file.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- file.spec	4 Jul 2007 10:16:40 -0000	1.64
+++ file.spec	20 Aug 2007 13:31:14 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,10 +17,11 @@
 Patch12: file-4.16-xen.patch
 Patch16: file-4.21-oracle.patch
 Patch17: file-4.17-clamav.patch
-Patch18: file-4.17-powerpoint.patch
 Patch20: file-4.17-bash.patch
 Patch21: file-4.19-ELF.patch
 Patch22: file-4.19-ooffice.patch
+patch23: file-4.21-core_from.patch
+patch24: file-4.21-msoffice.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,10 +65,11 @@
 %patch12 -p1 -b .xen
 %patch16 -p1 -b .oracle
 %patch17 -p1 -b .clamav
-%patch18 -p1 -b .powerpoint
 %patch20 -p1 -b .bash
 %patch21 -p1 -b .ELF
 %patch22 -p1 -b .ooffice
+%patch23 -p1 -b .core_from
+%patch24 -p1 -b .msoffice
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -125,6 +127,11 @@
 
 
 %changelog
+* Wed Aug 15 2007 Martin Bacovsky <mbacovsk at redhat.com> - 4.21-3
+- resolves: #172015: no longer reports filename of crashed app when run on core files.
+- resolves: #249578: Weird output from "file -i"
+- resolves: #234817: file reports wrong filetype for microsoft word file
+
 * Wed Jul  4 2007 Martin Bacovsky <mbacovsk at redhat.com> - 4.21-2
 - resolves: #246700: RPM description isn't related to product
 - resolves: #238789: file-devel depends on %{version} but not on %{version}-%{release}