Merge branch 'core-updates' Conflicts: gnu/packages/bootstrap.scm
gnu: file: Update to 5.20. * gnu/packages/file.scm (file): Update to 5.20. (file-5.20): Remove. * gnu/packages/patches/file-CVE-2014-3587.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/patchutils.scm (quilt): Use FILE instead of FILE-5.20. * gnu/packages/version-control.scm (aegis): Ditto.
gnu: aegis, quilt: Use file-5.20. Suggested by Mark H Weaver. * gnu/packages/version-control.scm (aegis): Use FILE-5.20 instead of FILE. * gnu/packages/patchutils.scm (quilt): Likewise.
gnu: Add patchutils and quilt * gnu/packages/patchutils.scm: New file * gnu/packages/patches/patchutils-xfail-gendiff-tests.patch: New patch * gnu-system.am (GNU_SYSTEM_MODULES): Add patchutils. (dist_patch_DATA): Add patch.