rpms/file/devel file-4.16-readelf.patch, NONE, 1.1 file.spec, 1.37, 1.38

[fedora-cvs-commits redhat com]

Author: rvokal

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

Modified Files:
	file.spec 
Added Files:
	file-4.16-readelf.patch 
Log Message:
- fix core files output, show from (#172015)

file-4.16-readelf.patch:
 readelf.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE file-4.16-readelf.patch ---
--- file-4.16/src/readelf.c.old	2005-10-17 20:41:44.000000000 +0200
+++ file-4.16/src/readelf.c	2005-10-31 08:39:18.000000000 +0100
@@ -549,8 +549,8 @@ donote(struct magic_set *ms, unsigned ch
 			    os_style_names[os_style]) == -1)
 				return size;
 			*flags |= FLAGS_DID_CORE;
-		} else
-			return size;
+		} /* else
+			return size;*/
 	}
 
 	switch (os_style) {


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- file.spec	18 Oct 2005 07:35:07 -0000	1.37
+++ file.spec	31 Oct 2005 07:45:02 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.16
-Release: 1
+Release: 2
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch5: file-4.13-fsdump.patch
 Patch6: file-4.13-quick.patch
 Patch8: file-4.15-berkeley.patch
+Patch9: file-4.16-readelf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -33,6 +34,7 @@
 %patch5 -p1 -b .fsdump
 %patch6 -p1 -b .quick
 %patch8 -p1 -b .berkeley
+%patch9 -p1 -b .corefile
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -77,6 +79,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Mon Oct 31 2005 Radek Vokal <rvokal redhat com> - 4.16-2
+- fix core files output, show "from" (#172015)
+
 * Tue Oct 18 2005 Radek Vokal <rvokal redhat com> - 4.16-1
 - upgrade to upstream