Revert "buildsystem: rework patching. prepare to remove patches.upstream/"

This reverts (part of) commit f920a33507852a9af865a399c877073bf52d3f8b.

patch --dry-run fails with patches generated with git format-patch --stdout..

closes #2856