patches for upstream pacman