March 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Make windows-4.0.js more like no-polipo-4.0.js
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 16d8869d1a8a6585037d669cd997b5c755b0d84c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 22:25:16 2012 +0100 Make windows-4.0.js more like no-polipo-4.0.js --- build-scripts/config/windows-4.0.js | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index c06f9e9..da7a878 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -69,13 +69,8 @@ user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6f user_pref("extensions.enabledScopes", 1); user_pref("extensions.pendingOperations", false); user_pref("extensions.torbutton.fresh_install", false); -user_pref("extensions.torbutton.http_port", 8118); -user_pref("extensions.torbutton.http_proxy", "127.0.0.1"); -user_pref("extensions.torbutton.https_port", 8118); -user_pref("extensions.torbutton.https_proxy", "127.0.0.1"); user_pref("extensions.torbutton.locked_mode", true); user_pref("extensions.torbutton.normal_exit", true); -user_pref("extensions.torbutton.proxies_applied", true); user_pref("extensions.torbutton.restore_tor", true); user_pref("extensions.torbutton.saved.auto_update", false); user_pref("extensions.torbutton.saved.share_proxy_settings", false); @@ -93,10 +88,10 @@ user_pref("extensions.update.notifyUser", true); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0"); +user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.oscpu.override", "Windows NT 6.1"); user_pref("general.platform.override", "Win32"); user_pref("general.productSub.override", "20100401"); -user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"); user_pref("general.useragent.vendor", ""); user_pref("general.useragent.vendorSub", ""); @@ -121,14 +116,9 @@ user_pref("network.protocol-handler.warn-external.mailto", true); user_pref("network.protocol-handler.warn-external.news", true); user_pref("network.protocol-handler.warn-external.nntp", true); user_pref("network.protocol-handler.warn-external.snews", true); -user_pref("network.proxy.http", "127.0.0.1"); -user_pref("network.proxy.http_port", 8118); -user_pref("network.proxy.no_proxies_on", "127.0.0.1"); user_pref("network.proxy.socks", "127.0.0.1"); user_pref("network.proxy.socks_port", 9050); user_pref("network.proxy.socks_remote_dns", true); -user_pref("network.proxy.ssl", "127.0.0.1"); -user_pref("network.proxy.ssl_port", 8118); user_pref("network.proxy.type", 1); user_pref("network.security.ports.banned", "8118,8123,9050,9051"); user_pref("noscript.ABE.enabled", false); @@ -138,10 +128,10 @@ user_pref("noscript.autoReload", false); user_pref("noscript.contentBlocker", true); user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); user_pref("noscript.firstRunRedirection", false); -user_pref("noscript.forbidWebGL", true); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); user_pref("noscript.policynames", ""); user_pref("noscript.secureCookies", true);

1 0

[torbrowser/maint-2.2] Remove all occurences of CONFIG_SRC
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 21e3c22670f0ceb1760b3403ff1a217301112e9d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 23 17:49:50 2012 +0100 Remove all occurences of CONFIG_SRC We don't need the variable, as this is a hardcoded path inside the TBB directory structure. By getting rid of it we make our lives easier down the road when we add dependencies --- build-scripts/linux.mk | 33 +++++++++++++++------------------ build-scripts/osx.mk | 31 ++++++++++++++----------------- build-scripts/windows.mk | 31 ++++++++++++++----------------- 3 files changed, 43 insertions(+), 52 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8f25015..fb5c7c2 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -106,7 +106,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) ## Polipo doesn't use autoconf, so we just have to hack their Makefile ## This probably needs to be updated if Polipo ever updates their Makefile POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile +POLIPO_MAKEFILE=config/polipo-Makefile build-polipo: cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary @@ -114,8 +114,8 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -build-firefox: $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR) - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/dot_mozconfig $(FIREFOX_DIR) + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build touch build-firefox @@ -156,9 +156,6 @@ WGET:=$(shell which wget) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST=generic-bundle @@ -329,24 +326,24 @@ endif configure-apps: ## Configure Firefox preferences mkdir -p $(DEST)/Data/profile/extensions - cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Data/profiles.ini - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Data/profile + cp config/no-polipo-4.0.js $(DEST)/Data/profile/prefs.js ## Configure Pidgin ifeq ($(USE_PIDGIN),1) mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple endif ## Configure Vidalia ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff+pidgin-linux $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Polipo - #cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf + #cp config/polipo.conf $(DEST)/Data/Polipo/polipo.conf ## Configure Tor - cp $(CONFIG_SRC)/torrc-linux $(DEST)/Data/Tor/torrc + cp config/torrc-linux $(DEST)/Data/Tor/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip chmod 700 $(DEST)/Data/Tor @@ -433,10 +430,10 @@ patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. mkdir -p $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/App/Firefox/defaults/profile/ + cp config/no-polipo-4.0.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/Data/profile + cp config/no-polipo-4.0.js $(BUNDLE)/Data/profile/prefs.js ./patch-firefox-language.sh $(BUNDLE)/App/Firefox/defaults/profile/prefs.js $(LANGCODE) -e ./patch-firefox-language.sh $(BUNDLE)/Data/profile/prefs.js $(LANGCODE) -e diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 947c04e..8050092 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -126,8 +126,8 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && make install touch build-tor -build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) - cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) + cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build touch build-firefox @@ -162,9 +162,6 @@ WGET:=$(shell which wget) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST=generic-bundle @@ -301,24 +298,24 @@ install-firefox: configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R $(CONFIG_SRC)/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile - cp $(CONFIG_SRC)/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js - cp $(CONFIG_SRC)/Info.plist $(DEST)/Contents - cp $(CONFIG_SRC)/PkgInfo $(DEST)/Contents - cp $(CONFIG_SRC)/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources - cp $(CONFIG_SRC)/vidalia.icns $(DEST)/Contents/Resources + cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile + cp config/no-polipo-4.0.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp config/Info.plist $(DEST)/Contents + cp config/PkgInfo $(DEST)/Contents + cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources + cp config/vidalia.icns $(DEST)/Contents/Resources ## Configure Vidalia mkdir -p $(DEST)/Library/Vidalia ifeq ($(USE_SANDBOX),1) - cp $(CONFIG_SRC)/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-osx-sandbox $(DEST)/Library/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf + cp config/vidalia.conf.ff-osx $(DEST)/Library/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/torrc-osx $(DEST)/Library/Vidalia/torrc + cp config/torrc-osx $(DEST)/Library/Vidalia/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip chmod 700 $(DATADIR)/Tor @@ -407,8 +404,8 @@ endif patch-firefox-language: ## Patch the default Firefox prefs.js ## Don't use {} because they aren't always interpreted correctly. Thanks, sh. - cp $(CONFIG_SRC)/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile + cp config/no-polipo-4.0.js $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + cp config/bookmarks.html $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile ./patch-firefox-language.sh $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js $(LANGCODE) -e ## Fix prefs.js since extensions.checkCompatibility, false doesn't work diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 046baa4..ccb7354 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -120,8 +120,8 @@ patch-mozbuild: cp patch-mozilla-build.sh $(MOZ_BUILD) cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) -build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/dot_mozconfig $(MOZ_BUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat - cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat + cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" touch build-firefox @@ -150,9 +150,6 @@ LIBEVENT=$(COMPILED_LIBS) ## Size of split archive volumes for WinRAR SPLITSIZE=1440k -## Location of config files -CONFIG_SRC=config - ## Destination for the generic bundle DEST="Generic Bundle" @@ -321,32 +318,32 @@ configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile ## Configure Firefox preferences - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js - cp $(CONFIG_SRC)/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js - cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ + cp config/windows-4.0.js $(DEST)/FirefoxPortable/App/DefaultData/profile/prefs.js + cp config/windows-4.0.js $(DEST)/FirefoxPortable/Data/profile/prefs.js + cp config/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/ ## Set up alternate launcher mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe ## Configure FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable - cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings + cp config/FirefoxPortable.ini $(DEST)/FirefoxPortable + cp config/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings ## Configure PidginPortable ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable + cp config/PidginPortable.ini $(DEST)/PidginPortable mkdir -p $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple - cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings + cp config/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple + cp config/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings endif ## Configure Vidalia ifeq ($(USE_PIDGIN),1) - cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf else - cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf + cp config/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif ## Configure Tor - cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor + cp config/torrc $(DEST)/Data/Tor cp $(TOR)/src/config/geoip $(DEST)/Data/Tor launcher: @@ -440,7 +437,7 @@ patch-firefox-language: ## Copy Firefox preferences from a run of FirefoxPortable to be the default apply-prefs: - cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) + cp $(DEST)/FirefoxPortable/Data/profile/prefs.js config print-version: @echo $(RELEASE_VER)-$(BUILD_NUM)

1 0

[torbrowser/maint-2.2] Remove everything pointing to polipo
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit cf36a69e207ba169e34995afd17d9994665f30d5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 21:00:47 2012 +0100 Remove everything pointing to polipo --- build-scripts/INSTALL | 47 +------ build-scripts/config/polipo-Makefile | 144 ------------------ build-scripts/config/polipo.conf | 161 --------------------- build-scripts/config/vidalia.conf.ff+pidgin | 2 - build-scripts/config/vidalia.conf.ff+pidgin-linux | 2 - build-scripts/linux.mk | 14 +-- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 1 - docs/traces.txt | 2 +- src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb | 70 --------- src/osx-sandboxes/polipo-sandbox/polipo-wrapper | 70 --------- src/osx-sandboxes/polipo-sandbox/polipo.sb | 71 --------- 12 files changed, 4 insertions(+), 582 deletions(-) diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL index a73bfa8..d54ced1 100644 --- a/build-scripts/INSTALL +++ b/build-scripts/INSTALL @@ -21,7 +21,6 @@ Contents - Install Qt - Install msysDTK - Install WinRAR -- Building Polipo - Building zlib - Building OpenSSL - Building libevent @@ -38,11 +37,10 @@ An Introduction to Building Tor Browser Bundle To build Tor Browser Bundle, you need to have built: Vidalia (in /c/build/vidalia-<version> by default) Tor (in /c/build/tor-<version> by default) - Polipo (in /c/build/polipo-<version> by default) and have uncompressed Firefox Portable or produce a custom build Firefox FirefoxPortable (in /c/build/FirefoxPortable by default) -Instructions for building Vidalia, Polipo and Tor are included below. +Instructions for building Vidalia, and Tor are included below. As a prerequisite for all builds, we'll need a build directory: @@ -247,49 +245,6 @@ Extract the .tar.gz like so in your MSYS console: tar -C / -xvjf /c/Documents\ and\ Settings/Administrator/Desktop/msys-autoconf-2.59.tar.bz2 -Building Polipo -=============== - -In order to enable the forbiddenFile functionality, the GNU Regex -library is required. Download the -bin and -dev tarballs from: - - http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=73286… - -Extract them both into you MinGW directory, e.g. - - tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-bin.tar.gz - tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-dev.tar.gz - -Download Polipo sources: - - http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz - http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz.… - -Verify the PGP signature of the above files by following the developer directions: - - http://www.pps.jussieu.fr/~jch/software/pgp-validating.html - -Unpack the Polipo source code into /c/build/polipo-1.0.4.1/ : - - cd /c/build/ - tar -C . -vxzf /c/Documents\ and\ Settings/Administrator/Desktop/polipo-1.0.4.1.tar.gz - -Download a Tor contributed Polipo specific Makefile: - - https://svn.torproject.org/svn/tor/trunk/contrib/polipo/Makefile.mingw - -Replace the stock Polipo Makefile with the one above: - - mv Makefile Makefile-dist-unused - mv /c/Documents\ and\ Settings/Administrator/Desktop/Makefile.mingw Makefile - -Now build Polipo: - - make - -You should have a working binary. If you don't have gcc, it means your path is -broken. Ensure you applied the aforementioned /etc/fstab suggestion. - Building zlib ============= diff --git a/build-scripts/config/polipo-Makefile b/build-scripts/config/polipo-Makefile deleted file mode 100644 index 82e01fe..0000000 --- a/build-scripts/config/polipo-Makefile +++ /dev/null @@ -1,144 +0,0 @@ -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/man -INFODIR = $(PREFIX)/info -LOCAL_ROOT = $(PREFIX)/usr/share/polipo/www -DISK_CACHE_ROOT = $(PREFIX)/var/cache/polipo - -# To compile with Unix CC: - -# CDEBUGFLAGS=-O - -# To compile with GCC: - -# CC = gcc -# CDEBUGFLAGS = -Os -g -Wall -std=gnu99 -CDEBUGFLAGS = -Os -g -Wall -# CDEBUGFLAGS = -Os -Wall -# CDEBUGFLAGS = -g -Wall - -# To compile on a pure POSIX system: - -# CC = c89 -# CC = c99 -# CDEBUGFLAGS=-O - -# To compile with icc 7, you need -restrict. (Their bug.) - -# CC=icc -# CDEBUGFLAGS = -O -restrict - -# On System V (Solaris, HP/UX) you need the following: - -# PLATFORM_DEFINES = -DSVR4 - -# On Solaris, you need the following: - -# LDLIBS = -lsocket -lnsl -lresolv - -# On mingw, you need - -# EXE=.exe -# LDLIBS = -lwsock32 - -FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ - -DNO_DISK_CACHE - -# You may optionally also add any of the following to DEFINES: -# -# -DNO_DISK_CACHE to compile out the on-disk cache and local web server; -# -DNO_IPv6 to avoid using the RFC 3493 API and stick to stock -# Berkeley sockets; -# -DHAVE_IPv6 to force the use of the RFC 3493 API on systems other -# than GNU/Linux and BSD (let me know if it works); -# -DNO_FANCY_RESOLVER to compile out the asynchronous name resolution -# code; -# -DNO_STANDARD_RESOLVER to compile out the code that falls back to -# gethostbyname/getaddrinfo when DNS requests fail; -# -DNO_TUNNEL to compile out the code that handles CONNECT requests; -# -DNO_SOCKS to compile out the SOCKS gateway code. -# -DNO_FORBIDDEN to compile out the all of the forbidden URL code -# -DNO_REDIRECTOR to compile out the Squid-style redirector code -# -DNO_SYSLOG to compile out logging to syslog - -DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) - -CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) - -SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ - config.c local.c http.c client.c server.c auth.c tunnel.c \ - http_parse.c parse_time.c dns.c forbidden.c \ - md5import.c md5.c ftsimport.c fts_compat.c socks.c mingw.c - -OBJS = util.o event.o io.o chunk.o atom.o object.o log.o diskcache.o main.o \ - config.o local.o http.o client.o server.o auth.o tunnel.o \ - http_parse.o parse_time.o dns.o forbidden.o \ - md5import.o ftsimport.o socks.o mingw.o - -polipo$(EXE): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o polipo$(EXE) $(OBJS) $(MD5LIBS) $(LDLIBS) - -ftsimport.o: ftsimport.c fts_compat.c - -md5import.o: md5import.c md5.c - -.PHONY: all install install.binary install.man - -all: polipo$(EXE) polipo.info html/index.html localindex.html - -install: install.binary install.man - -install.binary: all - mkdir -p $(TARGET)$(BINDIR) - mkdir -p $(TARGET)$(LOCAL_ROOT) - mkdir -p $(TARGET)$(LOCAL_ROOT)/doc - rm -f $(TARGET)$(BINDIR)/polipo - cp -f polipo $(TARGET)$(BINDIR)/ - cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc - cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html - -install.man: all - mkdir -p $(TARGET)$(MANDIR)/man1 - mkdir -p $(TARGET)$(INFODIR) - cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1 - cp polipo.info $(TARGET)$(INFODIR)/ - install-info --info-dir=$(TARGET)$(INFODIR) polipo.info - - -polipo.info: polipo.texi - makeinfo polipo.texi - -html/index.html: polipo.texi - mkdir -p html - makeinfo --html -o html polipo.texi - -polipo.html: polipo.texi - makeinfo --html --no-split --no-headers -o polipo.html polipo.texi - -polipo.pdf: polipo.texi - texi2pdf polipo.texi - -polipo.ps.gz: polipo.ps - gzip -c polipo.ps > polipo.ps.gz - -polipo.ps: polipo.dvi - dvips -Pwww -o polipo.ps polipo.dvi - -polipo.dvi: polipo.texi - texi2dvi polipo.texi - -polipo.man.html: polipo.man - groff -man -Thtml polipo.man > polipo.man.html - -TAGS: $(SRCS) - etags $(SRCS) - -.PHONY: clean - -clean: - -rm -f polipo$(EXE) *.o *~ core TAGS gmon.out - -rm -f polipo.cp polipo.fn polipo.log polipo.vr - -rm -f polipo.cps polipo.info* polipo.pg polipo.toc polipo.vrs - -rm -f polipo.aux polipo.dvi polipo.ky polipo.ps polipo.tp - -rm -f polipo.dvi polipo.ps polipo.ps.gz polipo.pdf polipo.html - -rm -rf ./html/ - -rm -f polipo.man.html diff --git a/build-scripts/config/polipo.conf b/build-scripts/config/polipo.conf deleted file mode 100644 index 32850f6..0000000 --- a/build-scripts/config/polipo.conf +++ /dev/null @@ -1,161 +0,0 @@ -### Basic configuration -### ******************* - -# Uncomment one of these if you want to allow remote clients to -# connect: - -# proxyAddress = "::0" # both IPv4 and IPv6 -# proxyAddress = "0.0.0.0" # IPv4 only - -proxyAddress = "127.0.0.1" -proxyPort = 8118 - -# If you do that, you'll want to restrict the set of hosts allowed to -# connect: - -# allowedClients = "127.0.0.1, 134.157.168.57" -# allowedClients = "127.0.0.1, 134.157.168.0/24" - -allowedClients = 127.0.0.1 -allowedPorts = 1-65535 - -# Uncomment this if you want your Polipo to identify itself by -# something else than the host name: - -proxyName = "localhost" - -# Uncomment this if there's only one user using this instance of Polipo: - -cacheIsShared = false - -# Uncomment this if you want to use a parent proxy: - -# parentProxy = "squid.example.org:3128" - -# Uncomment this if you want to use a parent SOCKS proxy: - -socksParentProxy = "localhost:9050" -socksProxyType = socks5 - - -### Memory -### ****** - -# Uncomment this if you want Polipo to use a ridiculously small amount -# of memory (a hundred C-64 worth or so): - -# chunkHighMark = 819200 -# objectHighMark = 128 - -# Uncomment this if you've got plenty of memory: - -# chunkHighMark = 50331648 -# objectHighMark = 16384 - -chunkHighMark = 67108864 - -### On-disk data -### ************ - -# Uncomment this if you want to disable the on-disk cache: - -diskCacheRoot = "" - -# Uncomment this if you want to put the on-disk cache in a -# non-standard location: - -# diskCacheRoot = "~/.polipo-cache/" - -# Uncomment this if you want to disable the local web server: - -localDocumentRoot = "" - -# Uncomment this if you want to enable the pages under /polipo/index? -# and /polipo/servers?. This is a serious privacy leak if your proxy -# is shared. - -# disableIndexing = false -# disableServersList = false - -disableLocalInterface = true -disableConfiguration = true - -### Domain Name System -### ****************** - -# Uncomment this if you want to contact IPv4 hosts only (and make DNS -# queries somewhat faster): -# -# dnsQueryIPv6 = no - -# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for -# double-stack hosts: -# -# dnsQueryIPv6 = reluctantly - -# Uncomment this to disable Polipo's DNS resolver and use the system's -# default resolver instead. If you do that, Polipo will freeze during -# every DNS query: - -dnsUseGethostbyname = yes - - -### HTTP -### **** - -# Uncomment this if you want to enable detection of proxy loops. -# This will cause your hostname (or whatever you put into proxyName -# above) to be included in every request: - -disableVia = true - -# Uncomment this if you want to slightly reduce the amount of -# information that you leak about yourself: - -# censoredHeaders = from, accept-language -# censorReferer = maybe - -censoredHeaders = from,accept-language,x-pad,link -censorReferer = maybe - -# Uncomment this if you're paranoid. This will break a lot of sites, -# though: - -# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language -# censorReferer = true - -# Uncomment this if you want to use Poor Man's Multiplexing; increase -# the sizes if you're on a fast line. They should each amount to a few -# seconds' worth of transfer; if pmmSize is small, you'll want -# pmmFirstSize to be larger. - -# Note that PMM is somewhat unreliable. - -# pmmFirstSize = 16384 -# pmmSize = 8192 - -# Uncomment this if your user-agent does something reasonable with -# Warning headers (most don't): - -# relaxTransparency = maybe - -# Uncomment this if you never want to revalidate instances for which -# data is available (this is not a good idea): - -# relaxTransparency = yes - -# Uncomment this if you have no network: - -# proxyOffline = yes - -# Uncomment this if you want to avoid revalidating instances with a -# Vary header (this is not a good idea): - -# mindlesslyCacheVary = true - -# Suggestions from Incognito configuration -maxConnectionAge = 5m -maxConnectionRequests = 120 -serverMaxSlots = 8 -serverSlots = 2 -tunnelAllowedPorts = 1-65535 diff --git a/build-scripts/config/vidalia.conf.ff+pidgin b/build-scripts/config/vidalia.conf.ff+pidgin index d5d4a9b..43cb0f2 100644 --- a/build-scripts/config/vidalia.conf.ff+pidgin +++ b/build-scripts/config/vidalia.conf.ff+pidgin @@ -3,8 +3,6 @@ BrowserDirectory=FirefoxPortable BrowserExecutable=tbb-firefox.exe IMExecutable=PidginPortable\\PidginPortable.exe LanguageCode=en -ProxyExecutable=.\\App\\polipo.exe -ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf RunProxyAtStart=true [Tor] diff --git a/build-scripts/config/vidalia.conf.ff+pidgin-linux b/build-scripts/config/vidalia.conf.ff+pidgin-linux index 8354f0b..59d81bd 100644 --- a/build-scripts/config/vidalia.conf.ff+pidgin-linux +++ b/build-scripts/config/vidalia.conf.ff+pidgin-linux @@ -3,8 +3,6 @@ BrowserDirectory=. BrowserExecutable=firefox LanguageCode=en IMExecutable=./App/pidgin -ProxyExecutable=./App/polipo -ProxyExecutableArguments=-c Data/Polipo/polipo.conf RunProxyAtStart=true [Tor] diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index fb5c7c2..18ce2ba 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -103,14 +103,6 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && make install touch build-tor -## Polipo doesn't use autoconf, so we just have to hack their Makefile -## This probably needs to be updated if Polipo ever updates their Makefile -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=config/polipo-Makefile -build-polipo: - cp $(POLIPO_MAKEFILE) $(POLIPO_DIR)/Makefile - cd $(POLIPO_DIR) && make && PREFIX=$(FETCH_DIR)/built/ make install.binary - build-pidgin: echo "We're not building pidgin yet!" @@ -143,7 +135,6 @@ QT=$(COMPILED_LIBS) ZLIB=$(COMPILED_LIBS) ## Location of binary bundle components -POLIPO=$(COMPILED_BINS)/polipo TOR=$(COMPILED_BINS)/tor VIDALIA=$(BUILT_DIR)/usr/local/bin/vidalia ## Someday, this will be our custom Firefox @@ -322,7 +313,7 @@ ifeq ($(USE_PIDGIN),1) cp -R $(PIDGIN) $(APPDIR) endif -## Configure Firefox, Vidalia, Polipo and Tor +## Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences mkdir -p $(DEST)/Data/profile/extensions @@ -340,8 +331,6 @@ ifeq ($(USE_PIDGIN),1) else cp config/vidalia.conf.ff-linux $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - #cp config/polipo.conf $(DEST)/Data/Polipo/polipo.conf ## Configure Tor cp config/torrc-linux $(DEST)/Data/Tor/torrc cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip @@ -354,7 +343,6 @@ launcher: strip-it-stripper: strip $(APPDIR)/tor - #strip $(APPDIR)/polipo strip $(APPDIR)/vidalia strip $(LIBSDIR)/*.so* strip $(LIBSDIR)/libz/*.so* diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8050092..82e0a1b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -294,7 +294,7 @@ install-docs: install-firefox: cp -R $(FIREFOX) $(APPDIR) -## Configure Firefox, Vidalia, Polipo and Tor +## Configure Firefox, Vidalia, and Tor configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index ccb7354..28521f0 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -282,7 +282,6 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) - cp $(MING)/libgnurx-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) diff --git a/docs/traces.txt b/docs/traces.txt index 1a9b9ca..f81c0cf 100644 --- a/docs/traces.txt +++ b/docs/traces.txt @@ -62,7 +62,7 @@ modified by Tor Browser Bundle. On a Windows XP installation, with Firefox installed, only one registry key is modified: HKLM\Software\Microsoft\Cryptography\RNG\Seed (by vidalia.exe, -tor.exe, FirefoxPortable.exe, firefox.exe, polipo.exe) +tor.exe, FirefoxPortable.exe, firefox.exe) Without Firefox installed, there appears to be no difference, although it is difficult to be certain since Windows makes changes to a large diff --git a/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb b/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb deleted file mode 100755 index a1bf44e..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb +++ /dev/null @@ -1,70 +0,0 @@ -;; MacOSX Sandbox profile for bundled polipo -;; -;; Copyright 2010 Robert Malmgren AB. All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without modification, are -;; permitted provided that the following conditions are met: -;; -;; 1. Redistributions of source code must retain the above copyright notice, this list of -;; conditions and the following disclaimer. -;; -;; 2. Redistributions in binary form must reproduce the above copyright notice, this list -;; of conditions and the following disclaimer in the documentation and/or other materials -;; provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -;; FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -;; ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;; -;; The views and conclusions contained in the software and documentation are those of the -;; authors and should not be interpreted as representing official policies, either expressed -;; or implied, of Robert Malmgren AB. -;; -;; Written by andreas(a)romab.com -(version 1) - -(deny default) -(debug deny) - -(allow file-read-data - (literal "POLIPODIR/Contents/Resources/Data/Polipo/polipo.conf") - (literal "/dev/dtracehelper") - (literal "/dev/null") - (literal "/dev/urandom") - (literal "/private/var/run/resolv.conf") - (regex "^/usr/share/.*")) - -(allow file-read-metadata - (literal "/etc") - (literal "/private/etc/localtime") - (literal "/private/etc/resolv.conf") - (literal "/var") - (regex "^/usr/lib/*")) - -(allow file-write-data - (literal "/dev/dtracehelper")) - -(allow ipc-posix-shm) - -(allow mach-lookup - (global-name "com.apple.system.DirectoryService.libinfo_v1") - (global-name "com.apple.system.DirectoryService.membership_v1") - (global-name "com.apple.system.notification_center")) - -(allow network-inbound) - ; doesnt work for some reason. - ;(to tcp "localhost:8118")) - -(allow network-outbound - (to tcp "localhost:9050")) - -(allow process-exec - (literal "POLIPODIR/Contents/MacOS/polipo-bin")) - -(allow sysctl-read) diff --git a/src/osx-sandboxes/polipo-sandbox/polipo-wrapper b/src/osx-sandboxes/polipo-sandbox/polipo-wrapper deleted file mode 100755 index 8ae61dc..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo-wrapper +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# Startup script, MacOSX Sandbox profile for tor -# -# Copyright 2010 Robert Malmgren AB. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this list of -# conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this list -# of conditions and the following disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those of the -# authors and should not be interpreted as representing official policies, either expressed -# or implied, of Robert Malmgren AB. -# written by andreas(a)romab.com - -# tbb launchit script. -# this script launches polipo within the macosx sandbox. -# as we do not know where the user will install the tbb, we need -# to do some search and replace. -# -# Also, we will need to accept arguments comming from vidalia. -# -SW_VERS=/usr/bin/sw_vers -CUT=/usr/bin/cut -LSOF=/usr/sbin/lsof -AWK=/usr/bin/awk -TAIL=/usr/bin/tail -SED=/usr/bin/sed - -#find out osx version. - -VERSION=`$SW_VERS -productVersion| $CUT -f1,2 -d .` -DIR=`$LSOF -p $$|$TAIL -1| $AWK '{ print $NF }' | $SED s/[^/]*$//` -TDIR=`echo $DIR| $SED -e 's=Contents/MacOS/==g'` -TORAPPDIR=`echo $TDIR | $SED -e 's/\/$//g'` - -if [ "$VERSION"x = "10.6"x ]; then - #we know we use 10.6 fix the sandbox, do some search and replace - #and find current dir and the rebuild the sandbox - - #determine current dir. - #nuke the old sandbox - echo > $DIR/polipo-sandbox/polipo-bin.sb - #fix some stuff in the sandbox - $SED -e "s=POLIPODIR=$TORAPPDIR=g" $DIR/polipo-sandbox/polipo.sb >> $DIR/polipo-sandbox/polipo-bin.sb - /usr/bin/sandbox-exec -f $DIR/polipo-sandbox/polipo-bin.sb ${DIR}/polipo-bin $@ -fi - -if [ "$VERSION"x = "10.5"x ]; then - #10.5 use the policy written for 10.5 - #nuke the old sandbox - echo > $DIR/polipo-sandbox/polipo-bin.sb - $SED -e "s=POLIPODIR=$TORAPPDIR=g" $DIR/polipo-sandbox/polipo-10.5.sb >> $DIR/polipo-sandbox/polipo-bin.sb - /usr/bin/sandbox-exec -f $DIR/polipo-sandbox/polipo-bin.sb ${DIR}/polipo-bin $@ -fi diff --git a/src/osx-sandboxes/polipo-sandbox/polipo.sb b/src/osx-sandboxes/polipo-sandbox/polipo.sb deleted file mode 100644 index 3676c8e..0000000 --- a/src/osx-sandboxes/polipo-sandbox/polipo.sb +++ /dev/null @@ -1,71 +0,0 @@ -;; MacOSX Sandbox profile for bundled polipo -;; -;; Copyright 2010 Robert Malmgren AB. All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without modification, are -;; permitted provided that the following conditions are met: -;; -;; 1. Redistributions of source code must retain the above copyright notice, this list of -;; conditions and the following disclaimer. -;; -;; 2. Redistributions in binary form must reproduce the above copyright notice, this list -;; of conditions and the following disclaimer in the documentation and/or other materials -;; provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY Robert Malmgren AB ``AS IS'' AND ANY EXPRESS OR IMPLIED -;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -;; FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -;; ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;; -;; The views and conclusions contained in the software and documentation are those of the -;; authors and should not be interpreted as representing official policies, either expressed -;; or implied, of Robert Malmgren AB. -;; -;; Written by andreas(a)romab.com -(version 1) - -(deny default) - -(allow file-ioctl - (literal "/dev/dtracehelper")) - -(allow file-read-data - (literal "POLIPODIR/Contents/Resources/Data/Polipo/polipo.conf") - (literal "/dev/dtracehelper") - (literal "/dev/null") - (literal "/dev/urandom") - (literal "/private/var/run/resolv.conf") - (subpath "/usr/share")) - -(allow file-read-metadata - (literal "/etc") - (literal "/private/etc/localtime") - (literal "/private/etc/resolv.conf") - (literal "/var") - (subpath "/usr/lib")) - -(allow file-write-data - (literal "/dev/dtracehelper")) - -(allow ipc-posix-shm) - -(allow mach-lookup - (global-name "com.apple.system.DirectoryService.libinfo_v1") - (global-name "com.apple.system.DirectoryService.membership_v1") - (global-name "com.apple.system.notification_center")) - -(allow network-inbound - (local tcp "localhost:8118")) - -(allow network-outbound - (remote tcp "localhost:9050")) - -(allow process-exec - (literal "POLIPODIR/Contents/MacOS/polipo-bin")) - -(allow sysctl-read)

1 0

[torbrowser/maint-2.2] add 2.3.12-alpha-1 to recommended-versions
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 762ad1d062e3a7bfd815a1e89ff81a813bad748f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 16:38:26 2012 -0300 add 2.3.12-alpha-1 to recommended-versions --- build-scripts/recommended-versions | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index e85e602..329bd03 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,9 @@ "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows", "2.2.35-7.2-Linux-i686", -"2.2.35-7.2-Linux-x86_64" +"2.2.35-7.2-Linux-x86_64", +"2.3.12-alpha-1-MacOS-i386", +"2.3.12-alpha-1-Windows", +"2.3.12-alpha-1-Linux-i386", +"2.3.12-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/maint-2.3] add 2.3.12-alpha-1 to recommended-versions
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 762ad1d062e3a7bfd815a1e89ff81a813bad748f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 16:38:26 2012 -0300 add 2.3.12-alpha-1 to recommended-versions --- build-scripts/recommended-versions | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index e85e602..329bd03 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,9 @@ "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows", "2.2.35-7.2-Linux-i686", -"2.2.35-7.2-Linux-x86_64" +"2.2.35-7.2-Linux-x86_64", +"2.3.12-alpha-1-MacOS-i386", +"2.3.12-alpha-1-Windows", +"2.3.12-alpha-1-Linux-i386", +"2.3.12-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 33a8fe28e62911af38917184206313d957b7e804 Merge: 34bbc64 762ad1d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 16:38:46 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] add 2.3.12-alpha-1 to recommended-versions
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 762ad1d062e3a7bfd815a1e89ff81a813bad748f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 16:38:26 2012 -0300 add 2.3.12-alpha-1 to recommended-versions --- build-scripts/recommended-versions | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index e85e602..329bd03 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -3,5 +3,9 @@ "2.2.35-7.1-MacOS-x86_64", "2.2.35-7.1-Windows", "2.2.35-7.2-Linux-i686", -"2.2.35-7.2-Linux-x86_64" +"2.2.35-7.2-Linux-x86_64", +"2.3.12-alpha-1-MacOS-i386", +"2.3.12-alpha-1-Windows", +"2.3.12-alpha-1-Linux-i386", +"2.3.12-alpha-1-Linux-x86_64" ]

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 09 Mar '12

09 Mar '12

commit 33a8fe28e62911af38917184206313d957b7e804 Merge: 34bbc64 762ad1d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 16:38:46 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[torspec/master] Update spec to match correct v3 handshake with fix for bug 4361.
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit afcbbacedfddfbb8520a44003c6b81f6aee8743a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 14:29:34 2012 -0500 Update spec to match correct v3 handshake with fix for bug 4361. Partial revert of 075e215564c76bba --- tor-spec.txt | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 7443644..28a51c9 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -393,13 +393,11 @@ see tor-design.pdf. initiator the certificates it needs to learn the responder's identity, an AUTH_CHALLENGE cell (4.3) that the initiator must include as part of its answer if it chooses to authenticate, and a NETINFO - cell (4.5). The initiator can use the CERTS cell to confirm whether - the responder is correctly authenticated. If the initiator does not wish - to authenticate, it can send a NETINFO cell once it has received the - VERSIONS cell from the responder. If the initiator does wish to - authenticate, it waits until it gets the AUTH_CHALLENGE cell, and then - sends a CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO - cell. When this handshake is in use, the first cell must + cell (4.5). As soon as it gets the CERTS cell, the initiator knows + whether the responder is correctly authenticated. At this point the + initiator may send a NETINFO cell if it does not wish to + authenticate, or a CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO + cell if it does. When this handshake is in use, the first cell must be VERSIONS, VPADDING or AUTHORIZE, and no other cell type is allowed to intervene besides those specified, except for PADDING and VPADDING cells.

1 0

[tor/master] Do not send a NETINFO cell as a client until after we have got a CERT cell
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 3dd2f990a385caec99cad07b5cdcfa8abebcbf6c Author: frosty <frosty(a)rootedker.nl> Date: Thu Nov 3 12:03:05 2011 -0400 Do not send a NETINFO cell as a client until after we have got a CERT cell --- src/or/command.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index c02d353..808333e 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -688,8 +688,7 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn) const int send_chall = !started_here && public_server_mode(get_options()); /* If our certs cell will authenticate us, or if we have no intention of * authenticating, send a netinfo cell right now. */ - const int send_netinfo = - !(started_here && public_server_mode(get_options())); + const int send_netinfo = !started_here; const int send_any = send_versions || send_certs || send_chall || send_netinfo; tor_assert(conn->link_proto >= 3); @@ -1021,6 +1020,13 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) conn->handshake_state->id_cert = id_cert; id_cert = NULL; + if (!public_server_mode(get_options())) { + if (connection_or_send_netinfo(conn) < 0) { + log_warn(LD_OR, "Couldn't send netinfo cell"); + connection_mark_for_close(TO_CONN(conn)); + goto err; + } + } } else { if (! (id_cert && auth_cert)) ERR("The certs we wanted were missing");

1 0