rpms/file/devel file-4.17-bash.patch,NONE,1.1 file.spec,1.53,1.54

[fedora-cvs-commits at redhat.com]

Author: mbacovsk

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

Modified Files:
	file.spec 
Added Files:
	file-4.17-bash.patch 
Log Message:
* Fri Aug 18 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-7
- fix recognition of bash script with embed awk (#202185)


file-4.17-bash.patch:
 commands |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-4.17-bash.patch ---
--- file-4.17/magic/Magdir/commands.bash	2006-03-02 22:50:25.000000000 +0100
+++ file-4.17/magic/Magdir/commands	2006-08-17 16:38:39.000000000 +0200
@@ -28,7 +28,7 @@
 0	string/b	#!\ /bin/awk		awk script text executable
 0	string/b	#!\ /usr/bin/awk	awk script text executable
 # update to distinguish from *.vcf files
-0	regex		BEGIN[[:space:]]*[{]	awk script text
+0	regex		[^'"]BEGIN[[:space:]]*[{]	awk script text
 
 # AT&T Bell Labs' Plan 9 shell
 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- file.spec	3 Aug 2006 13:43:36 -0000	1.53
+++ file.spec	18 Aug 2006 07:04:17 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 6
+Release: 7
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch17: file-4.17-clamav.patch
 Patch18: file-4.17-powerpoint.patch
 Patch19: file-4.17-empty.patch
+Patch20: file-4.17-bash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -50,6 +51,7 @@
 %patch17 -p1 -b .clamav
 %patch18 -p1 -b .powerpoint
 %patch19 -p1 -b .empty
+%patch20 -p1 -b .bash
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -95,6 +97,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Aug 18 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-7
+- fix recognition of bash script with embed awk (#202185)
+
 * Thu Aug 03 2006 Martin Bacovsky <mbacovsk at redhat.com> - 4.17-6
 - fix gziped empty file (#72986)