php-pecl-zip: refresh our merged patches from upstream git