From 369081687ac5731490ef7e809ec58f4d2ac32222 Mon Sep 17 00:00:00 2001 From: Christoph Dwertmann Date: Tue, 21 May 2013 07:32:52 -0400 Subject: [PATCH] Padding with zeroes broke the LOAD_PATH in libruby, therefore prepend path with harmless slashes --- rpm/rvm-ruby.spec | 74 ++++------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec index d4417f2..6db60eb 100644 --- a/rpm/rvm-ruby.spec +++ b/rpm/rvm-ruby.spec @@ -124,6 +124,7 @@ $gemi bundler #ruby_tag=ruby-1.8.7-p352 #rvm install $ruby_tag #rvm use $ruby_tag +rvm cleanup all ) export br=%{buildroot} @@ -150,74 +151,11 @@ done find $br -type f \( -name \*.log -o -name \*.la \) -print0 |xargs -0 -r sed -i "s,$br,,g" find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep ': .* text' |cut -f1 -d: |xargs -r sed -i "s,$br,,g" -# courtesy http://everydaywithlinux.blogspot.com.au/2012/11/patch-strings-in-binary-files-with-sed.html -function patch_strings_in_file() { - local FILE="$1" - local PATTERN="$2" - local REPLACEMENT="$3" - - # Find all unique strings in FILE that contain the pattern - STRINGS=$(strings ${FILE} | grep ${PATTERN} | sort -u -r) - - if [ "${STRINGS}" != "" ] ; then - echo "File '${FILE}' contain strings with '${PATTERN}' in them:" - - for OLD_STRING in ${STRINGS} ; do - # Create the new string with a simple bash-replacement - NEW_STRING=${OLD_STRING//${PATTERN}/${REPLACEMENT}} - - # Create null terminated ASCII HEX representations of the strings - OLD_STRING_HEX="$(echo -n ${OLD_STRING} | xxd -g 0 -u -ps -c 256)00" - NEW_STRING_HEX="$(echo -n ${NEW_STRING} | xxd -g 0 -u -ps -c 256)00" - - if [ ${#NEW_STRING_HEX} -le ${#OLD_STRING_HEX} ] ; then - # Pad the replacement string with null terminations so the - # length matches the original string - while [ ${#NEW_STRING_HEX} -lt ${#OLD_STRING_HEX} ] ; do - NEW_STRING_HEX="${NEW_STRING_HEX}00" - done - - # Now, replace every occurrence of OLD_STRING with NEW_STRING - echo -n "Replacing ${OLD_STRING} with ${NEW_STRING}... " - hexdump -ve '1/1 "%.2X"' ${FILE} | \ - sed "s/${OLD_STRING_HEX}/${NEW_STRING_HEX}/g" | \ - xxd -r -p > ${FILE}.tmp - mv ${FILE}.tmp ${FILE} - echo "Done!" - else - echo "New string '${NEW_STRING}' is longer than old" \ - "string '${OLD_STRING}'. Skipping." - fi - done - fi -} - -# Strip object files in ar archives from bad path strings -for f in `find $br -type f -name \*.a`; do - td=`mktemp -d` - pushd $td - ar x $f - - for g in `find . -type f -print0 |xargs -0 file --no-dereference --no-pad |grep ': ELF' |cut -f1 -d:`; do - strip $g - grep "$br" $g || continue - - # Replace the bad path with the good one, padded by nulls - patch_strings_in_file $g "$br" - done - - ar r $f * - popd - rm -rf $td -done - -# Replace paths in libraries strings -for f in `find $br/usr/lib/rvm/rubies -type f -print0 |xargs -0 file --no-dereference --no-pad |grep ': ELF' |cut -f1 -d:`; do - grep "$br" $f || continue - - # Replace the bad path with the good one, padded by nulls - patch_strings_in_file $f "$br" -done +# Replace bad paths in all remaining files +# Padding with zeroes broke the LOAD_PATH in libruby, therefore prepend path with harmless slashes +printf -vch "%${#br}s" "" +slashes=$(printf "%s" "${ch// //}") +find $br -type f -print0 | xargs -0 sed -i "s,$br,$slashes,g" # Fix symlinks with bad path for f in `find $br -type l |grep "$br"`; do -- 2.43.0