Remove patches merged upstream, add patch to fix the build from https://github.com/collectd/collectd/issues/1674