[or-cvs] r22141: {torbrowser} - firefox loses it (via libxml2) when there is more than one (in torbrowser/trunk: . build-scripts src/RelativeLink)
Erinn Clark
erinn at torproject.org
Thu Apr 8 02:21:22 UTC 2010
Author: erinn
Date: 2010-04-08 02:21:22 +0000 (Thu, 08 Apr 2010)
New Revision: 22141
Modified:
torbrowser/trunk/README.Linux
torbrowser/trunk/build-scripts/Makefile.linux
torbrowser/trunk/src/RelativeLink/RelativeLink.sh
Log:
- firefox loses it (via libxml2) when there is more than one libz on the system, so only use our libz if no system libz is present.
- clean up shell script formatting.
- remove duplicate build targets.
Modified: torbrowser/trunk/README.Linux
===================================================================
--- torbrowser/trunk/README.Linux 2010-04-08 01:33:11 UTC (rev 22140)
+++ torbrowser/trunk/README.Linux 2010-04-08 02:21:22 UTC (rev 22141)
@@ -9,13 +9,15 @@
Polipo 1.0.4.1
Firefox 3.5.8
\_ Torbutton 1.2.4
+ |_ NoScript 1.9.9.57
+ |_ BetterPrivacy 1.4.7
Usage
-----
Extract the bundle with:
-tar -xvzf tor-browser-gnu-linux-0.0.1.tar.gz
+tar -xvzf tor-browser-gnu-linux*.tar.gz
This will create a directory named tor-browser_LANG. Click on this directory or
cd into it and execute the 'start-tor-browser' script. This will start Vidalia.
@@ -27,4 +29,4 @@
Changelog
---------
-0.0.1: Initial release (2010-03-25)
+1.0.0: Initial release (2010-03-25)
Modified: torbrowser/trunk/build-scripts/Makefile.linux
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.linux 2010-04-08 01:33:11 UTC (rev 22140)
+++ torbrowser/trunk/build-scripts/Makefile.linux 2010-04-08 02:21:22 UTC (rev 22141)
@@ -208,7 +208,7 @@
DISTDIR=tbbl-dist
## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.0-dev
+VERSION=1.0.1-dev
DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(VERSION)-
IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -263,6 +263,7 @@
compressed-bundle_fa \
compressed-bundle_fr \
compressed-bundle_nl \
+ compressed-bundle_pl \
compressed-bundle_pt-PT \
compressed-bundle_ru \
compressed-bundle_zh-CN \
@@ -302,6 +303,7 @@
rm -fr $(DEST)
mkdir -p $(APPDIR)
mkdir -p $(LIBSDIR)
+ mkdir -p $(LIBSDIR)/libz
mkdir -p $(DATADIR)/Tor
mkdir -p $(DATADIR)/Vidalia
mkdir -p $(DATADIR)/Polipo
@@ -319,7 +321,7 @@
$(QT)/libQtNetwork.so.4.5.3 $(LIBSDIR)
cp -d $(QT)/libQtXml.so $(QT)/libQtXml.so.4 $(QT)/libQtXml.so.4.5 $(QT)/libQtXml.so.4.5.3 $(LIBSDIR)
# zlib
- cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)
+ cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)/libz
# Libevent
cp -d $(LIBEVENT)/libevent-1.4.so.2 $(LIBEVENT)/libevent-1.4.so.2.1.3 $(LIBEVENT)/libevent_core.so \
$(LIBEVENT)/libevent_core-1.4.so.2 $(LIBEVENT)/libevent_core-1.4.so.2.1.3 \
@@ -395,7 +397,8 @@
strip $(APPDIR)/tor
strip $(APPDIR)/polipo
strip $(APPDIR)/vidalia
- strip $(LIBSDIR)/*
+ strip $(LIBSDIR)/*.so*
+ strip $(LIBSDIR)/libz/*.so*
##
## How to create required extensions
@@ -470,11 +473,6 @@
(cd $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org && unzip *.zip && rm *.zip)
endif
-## Fix prefs.js since extensions.checkCompatibility, false doesn't work
-update-extension-pref:
- ext_ver=$$(sed -n '/em:version/{s,.*="\(.*\)".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/install.rdf); \
- sed -i -e "s/BUNDLELOCALE/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js
-
## Set the language for Vidalia
patch-vidalia-language:
## Patch Vidalia
@@ -502,5 +500,5 @@
## Fix prefs.js since extensions.checkCompatibility, false doesn't work
update-extension-pref:
ext_ver=$$(sed -n '/em:version/{s,.*="\(.*\)".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/install.rdf); \
- sed -i -e "s/LOCALE/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js
+ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js
Modified: torbrowser/trunk/src/RelativeLink/RelativeLink.sh
===================================================================
--- torbrowser/trunk/src/RelativeLink/RelativeLink.sh 2010-04-08 01:33:11 UTC (rev 22140)
+++ torbrowser/trunk/src/RelativeLink/RelativeLink.sh 2010-04-08 02:21:22 UTC (rev 22141)
@@ -9,15 +9,13 @@
#
# Copyright 2010 Erinn Clark <erinn at torproject.org>
-if [ $1 ]
- then
+if [ $1 ]; then
debug=$1
printf "\nDebug enabled.\n\n"
fi
# If ${PWD} results in a zero length HOME, we can try something else...
-if [ ! "${PWD}" ]
- then
+if [ ! "${PWD}" ]; then
# "hacking around some braindamage"
HOME=`pwd`
export HOME
@@ -27,9 +25,14 @@
export HOME
fi
+if ldd ./App/Firefox/firefox-bin | grep -q "libz\.so\.1.*not found"; then
+ LD_LIBRARY_PATH=${HOME}/Lib:${HOME}/Lib/libz
+else
+ LD_LIBRARY_PATH=${HOME}/Lib
+fi
+
LDPATH=${HOME}/Lib/
export LDPATH
-LD_LIBRARY_PATH=${HOME}/Lib/
export LD_LIBRARY_PATH
DYLD_PRINT_LIBRARIES=1
export DYLD_PRINT_LIBRARIES
@@ -38,33 +41,28 @@
RUNNING=0
for process in tor vidalia polipo privoxy
do pid=`pidof $process`
- if [ -n "$pid" ]
- then
- printf "\n$process is already running as PID $pid\n\n"
- RUNNING=1
- fi
- done
+ if [ -n "$pid" ]; then
+ printf "\n$process is already running as PID $pid\n\n"
+ RUNNING=1
+ fi
+ done
-if [ $RUNNING -eq 1 ]
- then
- printf "Please shut down the above process(es) before running Tor Browser Bundle.\n\n"
- exit 0
+if [ $RUNNING -eq 1 ]; then
+ printf "Please shut down the above process(es) before running Tor Browser Bundle.\n\n"
+ exit 0
fi
-if [ "${debug}" ]
- then
- if [ -n "${surveysays}" ]
- then
+if [ "${debug}" ]; then
+ if [ -n "${surveysays}" ]; then
printf "\nSurvey says: $surveysays\n\n"
- fi
+ fi
- # this is likely unportable to Mac OS X or other non gnu netstat binaries
+ # this is likely unportable to Mac OS X or other netstat binaries
for port in "8118" "9050"
do
BOUND=`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`
- if [ "${BOUND}" ]
- then
+ if [ "${BOUND}" ]; then
printf "\nLikely problem detected: It appears that you have something listening on ${port}\n"
printf "\nWe think this because of the following: ${BOUND}\n"
fi
More information about the tor-commits
mailing list