From 4f1f1596af06d628dbc13947f1de528ad6ec9890 Mon Sep 17 00:00:00 2001 From: Martin Bacovsky Date: Aug 18 2006 07:04:17 +0000 Subject: - fix recognition of bash script with embed awk (#202185) --- diff --git a/file-4.17-bash.patch b/file-4.17-bash.patch new file mode 100644 index 0000000..a8f2cd7 --- /dev/null +++ b/file-4.17-bash.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/file.spec b/file.spec index fe5e595..4be5341 100644 --- a/file.spec +++ b/file.spec @@ -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 @@ Patch16: file-4.17-oracle.patch 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 @@ useful utility. %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libmagic.* %changelog +* Fri Aug 18 2006 Martin Bacovsky - 4.17-7 +- fix recognition of bash script with embed awk (#202185) + * Thu Aug 03 2006 Martin Bacovsky - 4.17-6 - fix gziped empty file (#72986)