Update libmagic to 5.21; remove patches

this patch does not seem to have actually been merged (yet again).