Package cleanup
Fix upstream to support hardening

Upstream was not using appropriate make variables for dpkg-buildflags.