- tor-commits - lists.torproject.org

[torbrowser/master] add space to xauthority patch
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 6210d3c3ce1877db34f0aedbeb3910b90158f000 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 31 16:06:49 2011 +0200 add space to xauthority patch --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index c5b7b28..99e5255 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY]; then +if [ -z $XAUTHORITY ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0

[torbrowser/master] add changelog and readme for linux ff4 bundles
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 78f1b59a3ce9a28363df66a5c9f9f6d62bd78c76 Author: Erinn Clark <erinn(a)dixie.torproject.org> Date: Thu Mar 31 14:01:08 2011 +0000 add changelog and readme for linux ff4 bundles --- README.LINUX-0.2.2 | 30 ++++++++++++++++++++++++++++++ changelog.linux-0.2.2 | 11 +++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/README.LINUX-0.2.2 b/README.LINUX-0.2.2 new file mode 100644 index 0000000..060e8d4 --- /dev/null +++ b/README.LINUX-0.2.2 @@ -0,0 +1,30 @@ +Tor Browser Bundle for GNU/Linux +=============== + +Included applications +--------------------- + +Vidalia 0.2.10 (with Qt 4.6.2) +Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Minefield) 4.0 + \_ Torbutton 1.3.2-alpha + |_ NoScript 2.0.9.9 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.49 + +Usage +----- + +Extract the bundle with: + +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. +Once Tor has successfully opened a circuit, Firefox will automatically be +opened. + +To exit, close Firefox. Vidalia will automatically clean up and exit. + +For more information about bugfixes and other package changes, see the +changelog in tor-browser_LANG/Docs/changelog. diff --git a/changelog.linux-0.2.2 b/changelog.linux-0.2.2 new file mode 100644 index 0000000..60c5212 --- /dev/null +++ b/changelog.linux-0.2.2 @@ -0,0 +1,11 @@ +Tor Browser Bundle (2.2.23-1) alpha; suite=linux + + * Create new bundles for Firefox 4, both i386 and x86_64 + * Update Tor to 0.2.2.23-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Update NoScript to 2.0.9.9 + * Update BetterPrivacy to 1.49 + + -- Erinn Clark <erinn(a)torproject.org> Thu Mar 31 15:49:06 CEST 2011

1 0

[torbrowser/master] add back libssl options for vidalia
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c777b38fec397dc11eb257ec54f4b6d163495d10 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 1 02:12:06 2011 +0200 add back libssl options for vidalia --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4fc6be8..c2e4837 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -70,7 +70,7 @@ build-qt: cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. +VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make

1 0

[torbrowser/master] update the README and the vidalia configuration
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 65b7813605746ad5a54e6d95431d5d832462cbec Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 20 05:19:14 2011 +0100 update the README and the vidalia configuration --- README.Linux | 13 +++++++------ build-scripts/config/vidalia.conf.ff-linux | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.Linux b/README.Linux index c9366ce..6ce2244 100644 --- a/README.Linux +++ b/README.Linux @@ -4,12 +4,10 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.20-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) -Firefox 3.6.13 - \_ Torbutton 1.2.5 - |_ NoScript 2.0.7 - |_ BetterPrivacy 1.48.3 +Vidalia 0.2.11-svn (with Qt 4.7.1) +Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) +Firefox 4.0b8 + \_ Torbutton 1.3.1-alpha |_ HTTPS Everywhere 0.9.9.development.2 Usage @@ -29,6 +27,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +x.x.x: NOT FOR PUBLIC RELEASE + THIS IS A TEST BUNDLE + 1.1.2: Released 2011-01-09 Update Firefox preferences to be more secure and disable geolocation to address #2338 diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 998be98..94c5503 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -1,6 +1,7 @@ [General] BrowserDirectory=. BrowserExecutable=firefox +InterfaceStyle=Cleanlooks LanguageCode=en [Tor]

1 0

[torbrowser/master] test Firefox 4's enabledScopes pref
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit d09e21716a1fba552b2f5bb2fb385fa97bf4a04f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 20 05:19:38 2011 +0100 test Firefox 4's enabledScopes pref --- build-scripts/config/no-polipo.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js index 8e1e7b8..2514220 100644 --- a/build-scripts/config/no-polipo.js +++ b/build-scripts/config/no-polipo.js @@ -55,6 +55,7 @@ user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLE user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11"); user_pref("dom.storage.enabled", false); user_pref("extensions.enabledItems", "SHPONKA,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +user_pref("extensions.enabledScopes", 5); user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true);

1 0

[torbrowser/master] add preliminary linux makefile changes for the real alpha tor browser bundle
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 82ef40620dcbe7c591866ddd5433373832bb1412 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 20 05:18:38 2011 +0100 add preliminary linux makefile changes for the real alpha tor browser bundle --- build-scripts/linux.mk | 78 +++++++++++++++++++------------------ src/RelativeLink/RelativeLink.sh | 2 +- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index e1b2e8e..5a4b2e6 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -35,26 +35,26 @@ ARCH_TYPE=$(shell uname -m) ## Location of directory for source unpacking -FETCH_DIR=/build +FETCH_DIR=$(HOME)/build-alpha ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=0.9.9.development.2 -FIREFOX_VER=3.6.13 -LIBEVENT_VER=1.4.13-stable -LIBPNG_VER=1.4.3 +FIREFOX_VER=4.0b8 +LIBEVENT_VER=2.0.10-stable +LIBPNG_VER=1.5.1beta01 NOSCRIPT_VER=2.0.7 -OPENSSL_VER=0.9.8p +OPENSSL_VER=1.0.0c OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 -QT_VER=4.6.2 -TOR_VER=0.2.2.20-alpha -TORBUTTON_VER=1.2.5 +QT_VER=4.7.1 +TOR_VER=0.2.3.0-alpha +TORBUTTON_VER=1.3.1-alpha VIDALIA_VER=0.2.10 -ZLIB_VER=1.2.3 +ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -78,10 +78,10 @@ LIBPNG_URL=http://download.sourceforge.net/libpng/$(LIBPNG_PACKAGE).tar.gz OPENSSL_URL=https://www.openssl.org/source/$(OPENSSL_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… POLIPO_URL=http://freehaven.net/~chrisd/polipo/$(POLIPO_PACKAGE) -QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) +QT_URL=http://get.qt.nokia.com/qt/source/$(QT_PACKAGE) TOR_URL=https://www.torproject.org/dist/$(TOR_PACKAGE) VIDALIA_URL=https://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE) -ZLIB_URL=http://www.gzip.org/zlib/$(ZLIB_PACKAGE) +ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) fetch-source: -mkdir $(FETCH_DIR) @@ -116,12 +116,11 @@ build-zlib: cd $(ZLIB_DIR) && make install OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib -CFLAGS=-Wa, --noexecstack +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib -Wa,--noexecstack --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib build-openssl: - cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack ./config $(OPENSSL_OPTS) - cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack make depend - cd $(OPENSSL_DIR) && CFLAGS=-Wa,--noexecstack make + cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) + cd $(OPENSSL_DIR) && make depend + cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) @@ -132,8 +131,8 @@ build-qt: cd $(QT_DIR) && make cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DOPENSSL_LIBRARY_DIR=$(BUILT_DIR)/lib -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. +VIDALIA_DIR=$(FETCH_DIR)/vidalia.trunk +VIDALIA_OPTS=-DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make @@ -153,9 +152,10 @@ build-libpng: cd $(LIBPNG_DIR) && make cd $(LIBPNG_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) +TOR_DIR=$(FETCH_DIR)/tor.git TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: + cd $(TOR_DIR) && ./autogen.sh cd $(TOR_DIR) && ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j2 cd $(TOR_DIR) && make install @@ -175,7 +175,7 @@ build-firefox: # XXX: add directions ASAP # source-dance unpack-source -build-all-binaries: build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo echo "If we're here, we've done something right." ## Location of compiled libraries @@ -230,7 +230,7 @@ COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME) endif ## Extensions to install by default -DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi +DEFAULT_EXTENSIONS=torbutton.xpi httpseverywhere.xpi ## Where to download Torbutton from TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTT… @@ -325,20 +325,20 @@ directory-structure: ## Firefox and Pidgin are installed in their own targets install-binaries: # A minimal set of Qt libs and the proper symlinks - cp -d $(QT)/libQtCore.so $(QT)/libQtCore.so.4 $(QT)/libQtCore.so.4.6 $(QT)/libQtCore.so.4.6.2 $(LIBSDIR) - cp -d $(QT)/libQtGui.so $(QT)/libQtGui.so.4 $(QT)/libQtGui.so.4.6 $(QT)/libQtGui.so.4.6.2 $(LIBSDIR) - cp -d $(QT)/libQtNetwork.so $(QT)/libQtNetwork.so.4 $(QT)/libQtNetwork.so.4.6 \ - $(QT)/libQtNetwork.so.4.6.2 $(LIBSDIR) - cp -d $(QT)/libQtXml.so $(QT)/libQtXml.so.4 $(QT)/libQtXml.so.4.6 $(QT)/libQtXml.so.4.6.2 $(LIBSDIR) + cp -d $(QT)/libQtCore.so $(QT)/libQtCore.so.4 $(QT)/libQtCore.so.4.7 $(QT)/libQtCore.so.4.7.1 $(LIBSDIR) + cp -d $(QT)/libQtGui.so $(QT)/libQtGui.so.4 $(QT)/libQtGui.so.4.7 $(QT)/libQtGui.so.4.7.1 $(LIBSDIR) + cp -d $(QT)/libQtNetwork.so $(QT)/libQtNetwork.so.4 $(QT)/libQtNetwork.so.4.7 \ + $(QT)/libQtNetwork.so.4.7.1 $(LIBSDIR) + cp -d $(QT)/libQtXml.so $(QT)/libQtXml.so.4 $(QT)/libQtXml.so.4.7 $(QT)/libQtXml.so.4.7.1 $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(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 \ - $(LIBEVENT)/libevent_extra-1.4.so.2 $(LIBEVENT)/libevent_extra-1.4.so.2.1.3 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng - cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) + cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libcrypto.a $(OPENSSL)/libssl.a $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) # Vidalia @@ -417,16 +417,16 @@ strip-it-stripper: ## ## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) +#torbutton.xpi: +# $(WGET) -O $@ $(TORBUTTON) ## NoScript development version -noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) +#noscript.xpi: +# $(WGET) -O $@ $(NOSCRIPT) ## BetterPrivacy -betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) +#betterprivacy.xpi: +# $(WGET) -O $@ $(BETTERPRIVACY) ## HTTPS Everywhere httpseverywhere.xpi: @@ -450,7 +450,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -460,6 +460,7 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); rm *.zip *.xpi + cp torbutton/torbutton.xpi . copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* @@ -511,6 +512,7 @@ endif 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.js $(BUNDLE)/App/Firefox/defaults/profile/prefs.js cp $(CONFIG_SRC)/bookmarks.html $(BUNDLE)/Data/profile diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e7b7be4..5b83305 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -44,7 +44,7 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 -for process in tor vidalia polipo privoxy +for process in tor vidalia do pid=`pidof $process` if [ -n "$pid" ]; then printf "\n$process is already running as PID $pid\n\n"

1 0

[torsocks/master] Issue 30: libtorsocks.so sanity check
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 845c4a02d095bde6b4e5446dc8c95adfe86ae264 Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Oct 23 22:12:53 2011 +0100 Issue 30: libtorsocks.so sanity check "Currently if libtorsocks.so doesn't exist, torsocks will happily proceed without it, and not use tor." Check for libtorsocks.so and bail out if it isn't found. --- src/torsocks.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 27540ec..53db2fc 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -78,6 +78,12 @@ LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@" SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +# Ensure libtorsocks exists, +if [ ! -f $SHLIB ]; then + echo "$0: $SHLIB does not exist! Try re-installing torsocks." + exit +fi + case "$1" in on) if [ -z "$@LDPRELOAD@" ]

1 0

[torsocks/osx] Fix compile warning in test_torsocks.c
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 90f3cc0b3f08b965ec999fbcecbc9f9ff4f5dbf4 Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 14:00:07 2011 +0000 Fix compile warning in test_torsocks.c --- test/test_torsocks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/test_torsocks.c b/test/test_torsocks.c index e67de0a..a262303 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -69,7 +69,7 @@ static int icmp_test() struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); - char *buff=(icmphdr +1); + char *buff=(char *)(icmphdr +1); printf("\n----------------icmp() TEST----------------------------\n\n"); if((sockfd=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP))<0)

1 0

[torsocks/osx] Compile and run tests on FreeBSD
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 9de888be00f23ba1cfe1b172de61a59da6ae0ecd Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 15:36:50 2011 +0000 Compile and run tests on FreeBSD --- configure.in | 3 +++ test/test_torsocks.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f238caa..3366420 100644 --- a/configure.in +++ b/configure.in @@ -572,6 +572,9 @@ case $host in AC_SEARCH_LIBS(pthread_create, [pthread]) AC_SEARCH_LIBS(pthread_detach, [pthread]) ;; +*-*-freebsd*) + AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") + ;; esac AC_SUBST(SHLIB_EXT) diff --git a/test/test_torsocks.c b/test/test_torsocks.c index 902a216..6e8933b 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -80,7 +80,7 @@ static int icmp_test() char datagram[400]; struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; -#ifdef OPENBSD +#if defined(OPENBSD) || defined(FREEBSD) struct icmp *icmphdr=(struct icmp *)(iphdr +1); #else struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); @@ -112,7 +112,7 @@ static int icmp_test() iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); -#ifdef OPENBSD +#if defined(OPENBSD) || defined(FREEBSD) icmphdr->icmp_type=130; icmphdr->icmp_code=0; icmphdr->icmp_cksum=htons(0xc3b0);

1 0

[torsocks/osx] Make tests compile and run on OpenBSD
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 6bec541ad5398625f14757199df26ce5a4755f9c Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 11:04:54 2011 +0000 Make tests compile and run on OpenBSD --- test/Makefile.am | 2 - test/test_torsocks.c | 74 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index c03c387..84e4859 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,4 @@ noinst_PROGRAMS= test_torsocks -LIBS = -lresolv - test_torsocks_SOURCES= test_torsocks.c CLEANFILES= test_torsocks diff --git a/test/test_torsocks.c b/test/test_torsocks.c index a262303..902a216 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -19,13 +19,24 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +/* PreProcessor Defines */ +#include <config.h> -#include <arpa/inet.h> -#include <arpa/nameser.h> #include <errno.h> #include <fcntl.h> #include <netdb.h> +#ifdef OPENBSD +#include <netinet/in_systm.h> +#endif +#include <sys/types.h> +#include <sys/socket.h> +#ifndef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifndef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#include <arpa/nameser.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <pthread.h> @@ -33,9 +44,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/socket.h> #include <sys/time.h> -#include <sys/types.h> +#ifdef OPENBSD +#include <sys/uio.h> +#endif #include <sys/un.h> #include <sysexits.h> #include <syslog.h> @@ -68,7 +80,11 @@ static int icmp_test() char datagram[400]; struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; +#ifdef OPENBSD + struct icmp *icmphdr=(struct icmp *)(iphdr +1); +#else struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); +#endif char *buff=(char *)(icmphdr +1); printf("\n----------------icmp() TEST----------------------------\n\n"); @@ -96,16 +112,21 @@ static int icmp_test() iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); +#ifdef OPENBSD + icmphdr->icmp_type=130; + icmphdr->icmp_code=0; + icmphdr->icmp_cksum=htons(0xc3b0); +#else icmphdr->type=130; icmphdr->code=0; icmphdr->checksum=htons(0xc3b0); icmphdr->un.echo.sequence=0; icmphdr->un.echo.id=0; - - int one=1; - int *val=&one; - if(setsockopt(sockfd,IPPROTO_IP,IP_HDRINCL,val,sizeof(one))<0) - printf("cannot set HDRINCL!\n"); +#endif + int one=1; + int *val=&one; + if(setsockopt(sockfd,IPPROTO_IP,IP_HDRINCL,val,sizeof(one))<0) + printf("cannot set HDRINCL!\n"); if(sendto(sockfd,datagram,35,0,(struct sockaddr *)&dest,sizeof(dest))<0) @@ -228,7 +249,6 @@ static int res_tests(char *ip, char *test) { return -1; } - inet_ntop(AF_INET, &_res.nsaddr_list[0].sin_addr.s_addr, buf, sizeof(buf)); addr.sin_family=AF_INET; addr.sin_port=htons(53); @@ -240,29 +260,43 @@ static int res_tests(char *ip, char *test) { inet_ntop(AF_INET, &_res.nsaddr_list[0].sin_addr.s_addr, buf, sizeof(buf)); printf("nameserver for test: %s\n", buf); + /* Modifying _res directly doesn't work, so we have to use res_n* where available. + See: http://sourceware.org/ml/libc-help/2009-11/msg00013.html */ printf("\n---------------------- %s res_query() TEST----------------------\n\n", test); snprintf((char *)host, 127, "www.google.com"); - ret = res_nquery( &_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_QUERY results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nquery(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_query((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n---------------------- %s res_search() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nsearch( &_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_SEARCH results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nsearch(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_search((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n--------------- %s res_querydomain() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nquerydomain( &_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_QUERYDOMAIN results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nquerydomain(&_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_querydomain("www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n---------------------- %s res_send() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nsend( &_res, host, 32, dnsreply, sizeof( dnsreply )); -// printf("RES_SEND results: %s.\n", dnsreply); - printf("return code: %i\n", ret); +#ifndef OPENBSD + ret = res_nsend(&_res, host, 32, dnsreply, sizeof( dnsreply )); +#else + ret = res_send(host, 32, dnsreply, sizeof( dnsreply )); +#endif +printf("return code: %i\n", ret); return ret; } @@ -353,7 +387,7 @@ static int gethostbyaddr_test() { printf("\n----------------------gethostbyaddr() TEST-----------------\n\n"); - inet_aton("38.229.70.16",&bar); + inet_aton("38.229.70.16", &bar); foo=gethostbyaddr(&bar,4,AF_INET); if (foo) { int i;

1 0