e264d12b1e
Marcus Meissner discovered that imlib's BMP decoder would crash when loading the test BMP file created by Chris Evans for testing a previous Qt vulnerability. It is believed that this bug could be exploited for arbitrary code execution. also some port fixes, added missing dependencies, etc.
76 lines
2.8 KiB
Plaintext
76 lines
2.8 KiB
Plaintext
$OpenBSD: patch-ltmain_sh,v 1.1 2004/09/21 22:40:36 brad Exp $
|
|
--- ltmain.sh.orig Tue Jul 6 13:48:00 2004
|
|
+++ ltmain.sh Sat Sep 18 23:12:40 2004
|
|
@@ -2154,10 +2154,17 @@ EOF
|
|
absdir="$libdir"
|
|
fi
|
|
else
|
|
- dir="$ladir/$objdir"
|
|
- absdir="$abs_ladir/$objdir"
|
|
- # Remove this search path later
|
|
- notinst_path="$notinst_path $abs_ladir"
|
|
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
+ dir="$ladir"
|
|
+ absdir="$abs_ladir"
|
|
+ # Remove this search path later
|
|
+ notinst_path="$notinst_path $abs_ladir"
|
|
+ else
|
|
+ dir="$ladir/$objdir"
|
|
+ absdir="$abs_ladir/$objdir"
|
|
+ # Remove this search path later
|
|
+ notinst_path="$notinst_path $abs_ladir"
|
|
+ fi
|
|
fi # $installed = yes
|
|
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
|
|
|
@@ -2471,7 +2478,7 @@ EOF
|
|
add_dir=
|
|
add=
|
|
# Finalize command for both is simple: just hardcode it.
|
|
- if test "$hardcode_direct" = yes; then
|
|
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
|
|
add="$libdir/$linklib"
|
|
elif test "$hardcode_minus_L" = yes; then
|
|
add_dir="-L$libdir"
|
|
@@ -5832,40 +5839,6 @@ relink_command=\"$relink_command\""
|
|
# Exit here if they wanted silent mode.
|
|
test "$show" = : && exit $EXIT_SUCCESS
|
|
|
|
- $echo "----------------------------------------------------------------------"
|
|
- $echo "Libraries have been installed in:"
|
|
- for libdir in $libdirs; do
|
|
- $echo " $libdir"
|
|
- done
|
|
- $echo
|
|
- $echo "If you ever happen to want to link against installed libraries"
|
|
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
- $echo "flag during linking and do at least one of the following:"
|
|
- if test -n "$shlibpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
- $echo " during execution"
|
|
- fi
|
|
- if test -n "$runpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
- $echo " during linking"
|
|
- fi
|
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
|
- libdir=LIBDIR
|
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
-
|
|
- $echo " - use the \`$flag' linker flag"
|
|
- fi
|
|
- if test -n "$admincmds"; then
|
|
- $echo " - have your system administrator run these commands:$admincmds"
|
|
- fi
|
|
- if test -f /etc/ld.so.conf; then
|
|
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
- fi
|
|
- $echo
|
|
- $echo "See any operating system documentation about shared libraries for"
|
|
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
- $echo "----------------------------------------------------------------------"
|
|
exit $EXIT_SUCCESS
|
|
;;
|
|
|