- Drop the SHAREDIR patch and revert to upstream ways (#966445) - Fix an XFRM regression with FORTIFY_SOURCE