Fix for [oCERT-2008-004] multiple speex implementations insufficient boundary checks...

[vlc] / modules / genmf

diff --git a/modules/genmf b/modules/genmf
index c4a6624c2c0f6d427d9359f85f39abfa8d3c7f9b..156b8862b69f044e87266ad34c1f45c471438e7c 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -46,14 +46,14 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
 include Modules.am
 
 if HAVE_PLUGINS
-LTLIBVLC = -L\$(top_builddir)/src -lvlc
+LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
 AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
        -module -no-undefined -shrext \$(LIBEXT) 
 if HAVE_COMPILER_EXPORT
 AM_LDFLAGS += -export-dynamic
 else
-AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$
+AM_LDFLAGS += -export-symbol-regex ^vlc_entry
 endif
 AM_LIBADD = \$(LTLIBVLC)
 endif
@@ -95,7 +95,7 @@ mostlyclean-local:
 install-exec-local: all-modules
        @if test -z "\$(libvlc_LTLIBRARIES)"; then \
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
-         m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
+         m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) printf " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
            \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \
        fi
@@ -103,7 +103,7 @@ install-exec-local: all-modules
 uninstall-local:
        @if test -z "\$(libvlc_LTLIBRARIES)"; then \
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
-         m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
+         m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) printf " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
            \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \
        fi
@@ -141,8 +141,12 @@ EOF
 lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
 lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \$(AM_LDFLAGS)
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \\
+       \`\$(VLC_CONFIG) --ldflags plugin ${mod}\`
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \\
+       \`\$(VLC_CONFIG) -libs plugin ${mod}\` 
+# Automake does not understand \`...\` very well inside LIBADD...
+lib${mod}_plugin_la_DEPENDENCIES = \$(AM_LIBADD)
 EOF
   done