apply upstream changes and rename patchelf