From 355e2bcc2e8bf1e18b0de0a995d104acf886c2e8b562717bf7d6fefac53f9dad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 21 May 2007 10:44:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=8 --- file-4.20-reg_dos.dif | 4 ++-- file.changes | 5 +++++ file.spec | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/file-4.20-reg_dos.dif b/file-4.20-reg_dos.dif index 43a7c00..c24ae2c 100644 --- a/file-4.20-reg_dos.dif +++ b/file-4.20-reg_dos.dif @@ -8,9 +8,9 @@ -100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text +#100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text +#100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text -+100 search/0x200 rxfuncadd ++100 search/0xffff rxfuncadd +>100 regex/c =^\\s{0,255}call\\s{1,99}rxfuncadd OS/2 REXX batch file text -+100 search/0x200 say ++100 search/0xffff say +>100 regex/c =^\\s{0,255}say\ ['"] OS/2 REXX batch file text 0 leshort 0x14c MS Windows COFF Intel 80386 object file diff --git a/file.changes b/file.changes index d053b52..a28eb44 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 21 11:49:45 CEST 2007 - werner@suse.de + +- Expand search area used before regex (also bug #263754) + ------------------------------------------------------------------- Mon May 14 13:19:00 CEST 2007 - werner@suse.de diff --git a/file.spec b/file.spec index bd730a8..408daf9 100644 --- a/file.spec +++ b/file.spec @@ -17,7 +17,7 @@ License: Other uncritical OpenSource License Group: Productivity/File utilities Autoreqprov: on Version: 4.20 -Release: 13 +Release: 15 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -147,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Mon May 21 2007 - werner@suse.de +- Expand search area used before regex (also bug #263754) * Mon May 14 2007 - werner@suse.de - More on DoS attack with regex (bug #263754) - Avoid crash on unknown option and enable option `-e'