re-add apns_conf & update more patches