[upstream] Update to dhcpcd-6.4.2.
[upstream] Update to cups-1.7.4.
Merge branch 'master' of https://github.com/igzivkov/blfs-book

Conflicts:
	general.ent