upstream from seccheck-2.0