[packaging] based on latest upstream git