May 2014 - tor-commits - lists.torproject.org

[orbot/master] update 14.0.0-ALPHA-2a for some testers (samsung)
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 9096f8c7b86f2940a037a010ae8539d5d95e00e5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 14:59:18 2014 -0400 update 14.0.0-ALPHA-2a for some testers (samsung) --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b4bee9..f6f1c5d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.0-ALPHA-2" - android:versionCode="89" + android:versionName="14.0.0-ALPHA-2a" + android:versionCode="90" android:installLocation="auto" >

1 0

[orbot/master] for some devices, the process-id is listed first
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 42d8ca1377e64559b685a1dbbd3cf26bb5899618 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 14:58:47 2014 -0400 for some devices, the process-id is listed first --- src/org/torproject/android/service/TorServiceUtils.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index be1694e..70c5746 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -89,9 +89,17 @@ public class TorServiceUtils implements TorServiceConstants { { if (line.contains(command)) { + String[] lineParts = line.split("\\s+"); - procId = Integer.parseInt(lineParts[1]); + try { + + procId = Integer.parseInt(lineParts[1]); //for most devices it is the second number + } catch(NumberFormatException e) { + procId = Integer.parseInt(lineParts[0]); //but for samsungs it is the first + + } + break; }

1 0

[orbot/master] make sure the unbind intent is not null
by n8fr8＠torproject.org 02 May '14

02 May '14

commit fd5128170a63dcd1087b2ebf1c8a1201f6b7e844 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 2 14:58:36 2014 -0400 make sure the unbind intent is not null --- src/org/torproject/android/service/TorService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 97e2851..13c653c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -186,7 +186,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst @Override public boolean onUnbind(Intent intent) { - logNotice( "onUnbind Called: " + intent.getAction()); + if (intent != null) + logNotice( "onUnbind Called: " + intent.getAction()); return super.onUnbind(intent);

1 0

r26759: {website} Update the source links on the tor browser details page. (website/trunk/projects/en)
by Mike Perry 02 May '14

02 May '14

Author: mikeperry Date: 2014-05-02 18:08:57 +0000 (Fri, 02 May 2014) New Revision: 26759 Modified: website/trunk/projects/en/torbrowser-details.wml Log: Update the source links on the tor browser details page. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2014-05-01 17:34:09 UTC (rev 26758) +++ website/trunk/projects/en/torbrowser-details.wml 2014-05-02 18:08:57 UTC (rev 26759) @@ -35,13 +35,18 @@ <h3 id="build">Building the bundle</h3> - <p>To re-build the bundle, download the <a - href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">source - distribution</a> (<a - href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">signature</a>). - See <a href="https://gitweb.torproject.org/torbrowser.git/tree">README</a> for - the directory layout and changelog. Build instructions can be found in <a - href="<tbbrepo>/build-scripts/INSTALL">build-scripts/INSTALL</a>.</p> + <p>We use <a +href="https://blog.torproject.org/blog/deterministic-builds-part-two-technical-de…">Gitian</a> +to ensure that byte-for-byte reproducible packages can be built from our +source repository by anyone. To re-build the bundle, check out the <a +href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">Tor +Browser builder repository</a> and see the <a +href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">README.build</a> +for instructions. You may also find the <a +href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor +Browser Hacking</a> intro document useful for learning about the build system +and our development processes. + </div>  <div id = "sidecol">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 May '14

02 May '14

commit 2e9da49090dae907570767b9ed1a8822e42841d4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 2 17:15:40 2014 +0000 Update translations for tails-misc_completed --- fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 58d7f7a..5edefb6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-02 17:00+0000\n" +"Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +226,7 @@ msgstr "Redémarrer immédiatement" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid "Shutdown Helper" -msgstr "Assistant d'arrêt" +msgstr "Assistant d'extinction" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 May '14

02 May '14

commit 821e8b5f9c0222d8b672a42f37e7348cb10d5cc3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 2 17:15:38 2014 +0000 Update translations for tails-misc --- fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 58d7f7a..5edefb6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-27 19:29+0200\n" -"PO-Revision-Date: 2014-04-30 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-02 17:00+0000\n" +"Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +226,7 @@ msgstr "Redémarrer immédiatement" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid "Shutdown Helper" -msgstr "Assistant d'arrêt" +msgstr "Assistant d'extinction" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available"

1 0

[tor/master] Tweak the changelog formatter a little.
by nickm＠torproject.org 02 May '14

02 May '14

commit 8a173635bcd85ad7375d996fb39efeaddd8c611d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 2 12:50:23 2014 -0400 Tweak the changelog formatter a little. (I had a bad clone of Knuth's algorithm sitting around in an old code repository of mine. I added orphan detection and smarter hyphenation; it seems to give marginally better results than we had before.) --- scripts/maint/format_changelog.py | 139 +++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 5 deletions(-) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 6997d95..35044b3 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -12,7 +12,135 @@ import os import re import sys -import textwrap + +# ============================== +# Oh, look! It's a cruddy approximation to Knuth's elegant text wrapping +# algorithm, with totally ad hoc parameters! +# +# We're trying to minimize: +# The total of the cubes of ragged space on underflowed intermediate lines, +# PLUS +# 100 * the fourth power of overflowed characters +# PLUS +# .1 * a bit more than the cube of ragged space on the last line. +# +# We use an obvious dynamic programming algorithm to sorta approximate this. +# It's not coded right or optimally, but it's fast enough for changelogs +# +# (Code found in an old directory of mine, lightly cleaned. -NM) + +NO_HYPHENATE=set(""" +pf-divert +""".split()) + +LASTLINE_UNDERFLOW_EXPONENT = 1 +LASTLINE_UNDERFLOW_PENALTY = 1 + +UNDERFLOW_EXPONENT = 3 +UNDERFLOW_PENALTY = 1 + +OVERFLOW_EXPONENT = 4 +OVERFLOW_PENALTY = 2000 + +ORPHAN_PENALTY = 10000 + +def generate_wrapping(words, divisions): + lines = [] + last = 0 + for i in divisions: + w = words[last:i] + last = i + line = " ".join(w).replace("\xff ","-").replace("\xff","-") + lines.append(line) + return lines + +def wrapping_quality(words, divisions, width1, width2): + total = 0.0 + + lines = generate_wrapping(words, divisions) + for line in lines: + length = len(line) + if line is lines[0]: + width = width1 + else: + width = width2 + + if length > width: + total += OVERFLOW_PENALTY * ( + (length - width) ** OVERFLOW_EXPONENT ) + else: + if line is lines[-1]: + e,p = (LASTLINE_UNDERFLOW_EXPONENT, LASTLINE_UNDERFLOW_PENALTY) + if " " not in line: + total += ORPHAN_PENALTY + else: + e,p = (UNDERFLOW_EXPONENT, UNDERFLOW_PENALTY) + + total += p * ((width - length) ** e) + + return total + +def wrap_graf(words, prefix_len1=0, prefix_len2=0, width=72): + wrapping_after = [ (0,), ] + + w1 = width - prefix_len1 + w2 = width - prefix_len2 + + for i in range(1, len(words)+1): + best_so_far = None + best_score = 1e300 + for j in range(i): + t = wrapping_after[j] + t1 = t[:-1] + (i,) + t2 = t + (i,) + wq1 = wrapping_quality(words, t1, w1, w2) + wq2 = wrapping_quality(words, t2, w1, w2) + + if wq1 < best_score: + best_so_far = t1 + best_score = wq1 + if wq2 < best_score: + best_so_far = t2 + best_score = wq2 + wrapping_after.append( best_so_far ) + + lines = generate_wrapping(words, wrapping_after[-1]) + + return lines + +def hyphenateable(word): + if re.match(r'^[^\d\-].*-', word): + stripped = re.sub(r'^\W+','',word) + stripped = re.sub(r'\W+$','',word) + return stripped not in NO_HYPHENATE + else: + return False + +def split_paragraph(s): + "Split paragraph into words; tuned for Tor." + + r = [] + for word in s.split(): + if hyphenateable(word): + while "-" in word: + a,word = word.split("-",1) + r.append(a+"\xff") + r.append(word) + return r + +def fill(text, width, initial_indent, subsequent_indent): + words = split_paragraph(text) + lines = wrap_graf(words, len(initial_indent), len(subsequent_indent), + width) + res = [ initial_indent, lines[0], "\n" ] + for line in lines[1:]: + res.append(subsequent_indent) + res.append(line) + res.append("\n") + return "".join(res) + +# ============================== + TP_MAINHEAD = 0 TP_HEADTEXT = 1 @@ -108,10 +236,11 @@ class ChangeLog(object): if indent2 == -1: indent2 = indent1 text = " ".join(re.sub(r'\s+', ' ', line.strip()) for line in par) - print textwrap.fill(text, width=72, - initial_indent=" "*indent1, - subsequent_indent=" "*indent2, - break_on_hyphens=False) + + sys.stdout.write(fill(text, + width=72, + initial_indent=" "*indent1, + subsequent_indent=" "*indent2)) def dump(self): print self.mainhead

1 0

[orbot/master] Update the obfsclient submodule to include Android fixes
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 43c259acccc906dae95606eaa9f3efeffd0fddb0 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Apr 9 14:16:25 2014 -0700 Update the obfsclient submodule to include Android fixes Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- external/obfsclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/obfsclient b/external/obfsclient index 1f5f2a3..81d8c2d 160000 --- a/external/obfsclient +++ b/external/obfsclient @@ -1 +1 @@ -Subproject commit 1f5f2a358e9cce67184a250553b82e48f1cbd82e +Subproject commit 81d8c2da9864bafc249aa4a058426ef982a61ac3

1 0

[orbot/master] Integrate obfsclient/liballium into the build process
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 2c2d09460194249b57adb5df55efba2e67da9bce Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Apr 9 16:23:52 2014 -0700 Integrate obfsclient/liballium into the build process * Compiler/toolchain version changed to 4.8 for C++11 * Build and package obfsclient/liballium NB: Currently obfsclient is build with debugging information which results in a binary that is rather large, strongly consider stripping. Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- external/Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/external/Makefile b/external/Makefile index b297c51..7fec5de 100644 --- a/external/Makefile +++ b/external/Makefile @@ -25,14 +25,14 @@ endif NDK_BASE ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 5 NDK_ABI=arm -NDK_COMPILER_VERSION = 4.6 +NDK_COMPILER_VERSION = 4.8 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="$[0-9][0-9]*$".*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.6 +NDK_TOOLCHAIN_VERSION=4.8 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android @@ -48,8 +48,8 @@ TARGET_ARCH_ABI = $(APP_ABI) include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT) -CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ -CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp +CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT) +CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp --sysroot=$(NDK_SYSROOT) LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib @@ -74,6 +74,7 @@ endif iptables iptables-clean \ tor tor-clean \ obfsproxy obfsproxy-clean \ + liballium liballium-clean \ obfsclient obfsclient-clean \ privoxy privoxy-clean @@ -246,6 +247,37 @@ obfsproxy-clean: git clean -fdx #------------------------------------------------------------------------------# +# liballium + +liballium/Makefile: + cd liballium && ./autogen.sh + cp config.sub liballium + cp config.guess liballium + cd liballium && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ + ./configure \ + --host=$(HOST) \ + --disable-shared + +liballium-build-stamp: liballium/Makefile + $(MAKE) -C liballium all-am + touch liballium-build-stamp + +liballium: liballium-build-stamp + test -d lib || mkdir lib + test -d include || mkdir include + test -d include/allium || mkdir include/allium + cp liballium/.libs/liballium-1.0.a lib + cp liballium/include/* include/allium/ + +liballium-clean: + -rm -f include/allium + -rm -f lib/liballium-1.0.a + -rm -f liballium-build-stamp + -cd liballium && \ + git clean -fdx + +#------------------------------------------------------------------------------# # obfsclient @@ -255,16 +287,23 @@ obfsclient/Makefile: cp config.sub obfsclient cp config.guess obfsclient cd obfsclient && \ - CPP="$(CPP)" CXX="$(CXX)" AR="$(AR)" RANLIB=$(RANLIB) CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" CXXFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ - LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \ + CC="$(CC)" CPP="$(CPP)" CXX="$(CXX)" AR="$(AR)" RANLIB=$(RANLIB) \ + CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \ + CPPFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" \ + CXXFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow -I$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/include -I$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/$(APP_ABI)/include" \ +LDFLAGS="$(LDFLAGS)" \ + libevent_CFLAGS="-I$(EXTERNAL_ROOT)/include" libevent_LIBS="-L$(EXTERNAL_ROOT)/lib" \ + liballium_CFLAGS="-I$(EXTERNAL_ROOT)/include" liballium_LIBS="-L$(EXTERNAL_ROOT)/lib" \ + LIBS="-L$(EXTERNAL_ROOT)/lib -levent -lallium-1.0 -L$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/$(APP_ABI)/ -lgnustl_static" \ ./configure \ --host=$(HOST) \ + --with-openssl=$(EXTERNAL_ROOT) obfsclient-build-stamp: obfsclient/Makefile $(MAKE) -C obfsclient touch obfsclient-build-stamp -obfsclient: openssl libevent obfsclient-build-stamp +obfsclient: openssl libevent liballium obfsclient-build-stamp test -d bin || mkdir bin cp obfsclient/obfsclient bin @@ -333,17 +372,19 @@ jtorctl-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor privoxy jtorctl obfsproxy iptables +assets: tor privoxy jtorctl obfsproxy iptables obfsclient install bin/jtorctl.jar ../libs install -d ../res/raw -zip ../res/raw/privoxy.mp3 bin/privoxy -zip ../res/raw/obfsproxy.mp3 bin/obfsproxy + -zip ../res/raw/obfsclient.mp3 bin/obfsclient -zip ../res/raw/tor.mp3 bin/tor -zip ../res/raw/xtables.mp3 bin/xtables assets-clean: -rm ../res/raw/privoxy.mp3 -rm ../res/raw/obfsproxy.mp3 + -rm ../res/raw/obfsclient.mp3 -rm ../res/raw/tor.mp3 -rm ../res/raw/xtables.mp3 -rm ../libs/jtorctl.jar @@ -351,7 +392,7 @@ assets-clean: #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean +clean: openssl-clean libevent-clean tor-clean privoxy-clean jtorctl-clean liballium-clean obfsclient-clean assets-clean #------------------------------------------------------------------------------# # debugging stuff

1 0

[orbot/master] small updates to Makefile for NDK
by n8fr8＠torproject.org 02 May '14

02 May '14

commit 7af85b5cc3069debfeb2928f784d13695ff01677 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 24 12:29:41 2014 -0400 small updates to Makefile for NDK --- external/Makefile | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/external/Makefile b/external/Makefile index 7fec5de..aa6922c 100644 --- a/external/Makefile +++ b/external/Makefile @@ -23,16 +23,15 @@ endif # Android NDK setup NDK_BASE ?= /opt/android-ndk -NDK_PLATFORM_LEVEL ?= 5 +NDK_PLATFORM_LEVEL ?= 9 NDK_ABI=arm -NDK_COMPILER_VERSION = 4.8 +NDK_TOOLCHAIN_VERSION=4.8 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="$[0-9][0-9]*$".*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.8 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android @@ -73,7 +72,6 @@ endif libevent libevent-clean \ iptables iptables-clean \ tor tor-clean \ - obfsproxy obfsproxy-clean \ liballium liballium-clean \ obfsclient obfsclient-clean \ privoxy privoxy-clean @@ -214,42 +212,10 @@ tor-clean: #------------------------------------------------------------------------------# -# obfsproxy - - -obfsproxy/Makefile: - cp obfsproxy_android_no_hardening.patch obfsproxy - -cd obfsproxy && \ - patch -N -p1 --reject-file=- < obfsproxy_android_no_hardening.patch - cd obfsproxy && \ - ./autogen.sh - cp config.sub obfsproxy - cp config.guess obfsproxy - cd obfsproxy && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ - libevent_LIBS="-L$(EXTERNAL_ROOT)/lib -levent" libevent_CFLAGS="-I$(EXTERNAL_ROOT)/include" \ - libcrypto_LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto" libcrypto_CFLAGS="-I$(EXTERNAL_ROOT)/include" \ - ./configure \ - --host=$(HOST) \ - -obfsproxy-build-stamp: obfsproxy/Makefile - $(MAKE) -C obfsproxy - touch obfsproxy-build-stamp - -obfsproxy: openssl libevent obfsproxy-build-stamp - test -d bin || mkdir bin - cp obfsproxy/obfsproxy bin - -obfsproxy-clean: - -rm -f bin/obfsproxy - -rm -f obfsproxy-build-stamp - -cd obfsproxy && \ - git clean -fdx - -#------------------------------------------------------------------------------# # liballium liballium/Makefile: + cd liballium && mkdir m4 cd liballium && ./autogen.sh cp config.sub liballium cp config.guess liballium @@ -372,18 +338,16 @@ jtorctl-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor privoxy jtorctl obfsproxy iptables obfsclient +assets: tor privoxy jtorctl iptables obfsclient install bin/jtorctl.jar ../libs install -d ../res/raw -zip ../res/raw/privoxy.mp3 bin/privoxy - -zip ../res/raw/obfsproxy.mp3 bin/obfsproxy -zip ../res/raw/obfsclient.mp3 bin/obfsclient -zip ../res/raw/tor.mp3 bin/tor -zip ../res/raw/xtables.mp3 bin/xtables assets-clean: -rm ../res/raw/privoxy.mp3 - -rm ../res/raw/obfsproxy.mp3 -rm ../res/raw/obfsclient.mp3 -rm ../res/raw/tor.mp3 -rm ../res/raw/xtables.mp3

1 0