Bug 1080450 - file: incorrectly applied magic/Magdir patch
Summary: file: incorrectly applied magic/Magdir patch
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: file
Version: 20
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Jan Kaluža
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2014-03-25 13:09 UTC by Tomas Hoger
Modified: 2014-07-05 14:53 UTC (History)
1 user (show)

Fixed In Version: file-5.19-1.fc20
Doc Type: Bug Fix
Doc Text:
Clone Of:
: 1080452 1080453 (view as bug list)
Environment:
Last Closed: 2014-07-05 14:53:16 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)

Description Tomas Hoger 2014-03-25 13:09:56 UTC
Description of problem:
The way patches are applied to files in magic/Magdir is rather fragile.  While %patch is run without -b (as also noted in .spec: Don't use -b -- it will lead to poblems when compiling magic file!), for any patch that fails to apply cleanly, .orig backup file is still created.  This leads to having both patched and unpatched rules in resulting /usr/share/magic file.

Currently, file-5.04-generic-msdos.patch is misapplied:

http://kojipkgs.fedoraproject.org/packages/file/5.14/20.fc20/data/logs/x86_64/build.log

+ echo 'Patch #6 (file-5.04-generic-msdos.patch):'
Patch #6 (file-5.04-generic-msdos.patch):
+ /usr/bin/cat /builddir/build/SOURCES/file-5.04-generic-msdos.patch
+ /usr/bin/patch -p1 --fuzz=0
patching file magic/Magdir/msdos
Hunk #1 succeeded at 320 (offset 1 line).
Hunk #2 succeeded at 397 (offset 1 line).
Hunk #3 succeeded at 438 (offset 1 line).

Resulting /usr/share/magic contains both patched and unpatched rules.

Version-Release number of selected component (if applicable):
file-5.14-20.fc20

Comment 1 Jan Kaluža 2014-06-27 12:07:47 UTC
This is fixed in file-5.19 in rawhide.

Comment 2 Fedora Update System 2014-07-01 13:45:12 UTC
file-5.19-1.fc20 has been submitted as an update for Fedora 20.
https://admin.fedoraproject.org/updates/file-5.19-1.fc20

Comment 3 Fedora Update System 2014-07-01 23:32:52 UTC
Package file-5.19-1.fc20:
* should fix your issue,
* was pushed to the Fedora 20 testing repository,
* should be available at your local mirror within two days.
Update it with:
# su -c 'yum update --enablerepo=updates-testing file-5.19-1.fc20'
as soon as you are able to.
Please go to the following url:
https://admin.fedoraproject.org/updates/FEDORA-2014-7992/file-5.19-1.fc20
then log in and leave karma (feedback).

Comment 4 Fedora Update System 2014-07-05 14:53:16 UTC
file-5.19-1.fc20 has been pushed to the Fedora 20 stable repository.  If problems still persist, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.