[patch] Removed COMPLETE_LD_LIBRARY_PATH - Added DIR_MASK

revdep-rebuild-1.3.patch (text/plain), 2.60 KB, created by yuk on 2005-04-28 01:44:03 UTC

--- /usr/bin/revdep-rebuild	2005-04-27 12:33:50.000000000 +0200
+++ revdep-rebuild	2005-04-28 10:10:55.000000000 +0200
@@ -21,6 +21,9 @@
 
 # Mask of specially evaluated libraries (exactly one space separated).
 LD_LIBRARY_MASK="libodbcinst.so libodbc.so libjava.so libjvm.so"
+# Mask of specially evaluated directory (exactly one space separated).
+DIR_FIND_MASK="/opt/Acrobat7/Reader/intellinux /usr/share/fonts /usr/local/fonts /opt/OpenOffice.org"
+DIR_MASK=$(echo "$DIR_FIND_MASK" | sed 's/ / -e /g')
 
 # List of directories to be searched (feel free to edit it)
 # Note /usr/libexec and /usr/local/subprefix cotradicts FHS, but are present
@@ -146,27 +149,10 @@
 	echo " using existing $LIST.1_files."
 else
 	set_trap "$LIST.1_files"
-	find $SEARCH_DIRS -type f \( -perm +u+x -o -name '*.so' -o -name '*.so.*' \) 2>/dev/null >$LIST.1_files
+	find $SEARCH_DIRS -type f \( -perm +u+x -o -name '*.so' -o -name '*.so.*' \) 2>/dev/null | grep -v -e $DIR_MASK >$LIST.1_files
 	echo -e " done.\n  ($LIST.1_files)"
 fi
 
-if $SEARCH_BROKEN ; then
-	echo
-	echo -n -e "${GR}Collecting complete LD_LIBRARY_PATH...${NO}"
-	if [ -f $LIST.2_ldpath ] ; then
-	echo " using existing $LIST.2_ldpath."
-	else
-	set_trap "$LIST.2_ldpath"
-	(
-		grep '.*\.so\(\|\..*\)$' <$LIST.1_files | sed 's:/[^/]*$::'
-		sed '/^#/d;s/#.*$//' </etc/ld.so.conf
-	) | sort -u |
-	tr '\n' : | tr -d '\r' | sed 's/:$//' >$LIST.2_ldpath
-	echo -e " done.\n  ($LIST.2_ldpath)"
-	fi
-	export COMPLETE_LD_LIBRARY_PATH="$(cat $LIST.2_ldpath)"
-fi
-
 echo
 echo -n -e "${GR}Checking dynamic linking$WORKING_TEXT...${NO}"
 if [ -f $LLIST.3_rebuild ] ; then
@@ -177,21 +163,14 @@
 	LD_MASK="\\(	$(echo "$LD_LIBRARY_MASK" | sed 's/\./\\./g;s/ / \\|	/g') \\)"
 	echo -n >$LLIST.3_rebuild
 	cat $LIST.1_files | while read FILE ; do
-	# Note: double checking seems to be faster than single
-	# with complete path (special add ons are rare).
 	if ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" |
 		$SONAME_GREP -q "$SONAME_SEARCH" ; then
 		if $SEARCH_BROKEN ; then
-		if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" \
-		ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" |
-			$SONAME_GREP -q "$SONAME_SEARCH" ; then
-			echo "$FILE" >>$LLIST.3_rebuild
-			echo_v "  broken $FILE (requires $(ldd "$FILE" | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))"
-		fi
+			echo_v "  broken $FILE (requires $(ldd "$FILE" 2>/dev/null | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))"
 		else
-		echo "$FILE" >>$LLIST.3_rebuild
-		echo_v "  found $FILE"
+			echo_v "  found $FILE"
 		fi
+		echo "$FILE" >>$LLIST.3_rebuild
 	fi
 	done
 	echo -e " done.\n  ($LLIST.3_rebuild)"