[packaging] disable patch already applied upstream, and update packaging for new version