Commit 5933f591 authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 25485: replace firefox by a wrapper script

In a previous patch for bug 25485 we changed how we set LD_LIBRARY_PATH
in start-tor-browser. However this change is not taken into account when
the browser is restarted by the updater. To avoid this issue we replace
the firefox binary by a wrapper setting LD_LIBRARY_PATH.
parent 8a863c42
...@@ -165,6 +165,10 @@ rm -f js/src/configure ...@@ -165,6 +165,10 @@ rm -f js/src/configure
# subsequent builds could test to see if they've been uploaded before... # subsequent builds could test to see if they've been uploaded before...
# But let's find out if it actually matters first.. # But let's find out if it actually matters first..
rm -f $distdir/Browser/*.chk rm -f $distdir/Browser/*.chk
# Replace firefox by a wrapper script (#25485)
mv $distdir/Browser/firefox $distdir/Browser/firefox.real
mv $rootdir/start-firefox $distdir/Browser/firefox
chmod 755 $distdir/Browser/firefox
[% END %] [% END %]
[% IF c("var/windows-x86_64") -%] [% IF c("var/windows-x86_64") -%]
...@@ -203,7 +207,7 @@ cd $distdir ...@@ -203,7 +207,7 @@ cd $distdir
[% IF c("var/linux-x86_64") %] [% IF c("var/linux-x86_64") %]
# Strip and generate debuginfo for the firefox binary that we keep, all *.so # Strip and generate debuginfo for the firefox binary that we keep, all *.so
# files, the plugin-container, and the updater (see ticket #10126) # files, the plugin-container, and the updater (see ticket #10126)
for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/updater for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater
do do
objcopy --only-keep-debug $LIB Debug/$LIB objcopy --only-keep-debug $LIB Debug/$LIB
strip $LIB strip $LIB
......
...@@ -118,3 +118,5 @@ input_files: ...@@ -118,3 +118,5 @@ input_files:
enable: '[% c("var/windows") %]' enable: '[% c("var/windows") %]'
- filename: abicheck.cc - filename: abicheck.cc
enable: '[% c("var/linux") %]' enable: '[% c("var/linux") %]'
- filename: start-firefox
enable: '[% c("var/linux") %]'
#!/bin/sh
basedir=$(dirname "$0")
LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/"
# Check if the system has a more recent version of libstdc++.so.6; if yes, use
# that instead of the bundled version.
"$basedir/abicheck" >/dev/null 2>&1
if [ $? -ne 0 ]; then
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/"
fi
export LD_LIBRARY_PATH
exec "$basedir/firefox.real" "$@"
...@@ -273,15 +273,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then ...@@ -273,15 +273,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
exit 1 exit 1
fi fi
LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/"
# Check if the system has a more recent version of libstdc++.so.6; if yes, use
# that instead of the bundled version.
./abicheck >/dev/null 2>&1
if [ $? -ne 0 ]; then
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${HOME}/TorBrowser/Tor/libstdc++/"
fi
export LD_LIBRARY_PATH
[% IF ! c("var/release") %] [% IF ! c("var/release") %]
export SELFRANDO_write_layout_file= export SELFRANDO_write_layout_file=
[% END %] [% END %]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment