[arch-dev-public] [signoff] file-5.07-4

This fixes issues with detection of zip files with "file" and "file -i" (FS#24571). Uses an upstream patch which reverts the previous upstream patch we were applying and actually fixes the issue this time... Signoff both, Allan