07 Dec '17
commit c7f834b90d69501670a2d1656a6112bee68787f2
Author: n8fr8 <nathan(a)freitas.net>
Date: Sun Dec 3 15:09:58 2017 +0530
moving binary files, use tor-android gradle
---
orbotservice/src/main/res/raw/geoip.mp3 | Bin 609031 -> 0 bytes
orbotservice/src/main/res/raw/geoip6.mp3 | 1663 --------------------------
orbotservice/src/main/res/raw/torpolipo.conf | 23 -
orbotservice/src/main/res/raw/torrc | 8 -
4 files changed, 1694 deletions(-)
diff --git a/orbotservice/src/main/res/raw/geoip.mp3 b/orbotservice/src/main/res/raw/geoip.mp3
deleted file mode 100644
index 3db9c63d..00000000
Binary files a/orbotservice/src/main/res/raw/geoip.mp3 and /dev/null differ
diff --git a/orbotservice/src/main/res/raw/geoip6.mp3 b/orbotservice/src/main/res/raw/geoip6.mp3
deleted file mode 100644
index 0e439b90..00000000
--- a/orbotservice/src/main/res/raw/geoip6.mp3
+++ /dev/null
@@ -1,1663 +0,0 @@
-
-
-
-
-<!DOCTYPE html>
-<html lang="en" class="">
- <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# object: http://ogp.me/ns/object# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#">
- <meta charset='utf-8'>
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta http-equiv="Content-Language" content="en">
-
-
- <title>orbot/geoip6.mp3 at master · n8fr8/orbot</title>
- <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
- <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
- <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-114.png">
- <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114.png">
- <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-144.png">
- <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144.png">
- <meta property="fb:app_id" content="1401488693436528">
-
- <meta content="@github" name="twitter:site" /><meta content="summary" name="twitter:card" /><meta content="n8fr8/orbot" name="twitter:title" /><meta content="My dev mirror of https://gitweb.torproject.org/n8fr8/orbot.git" name="twitter:description" /><meta content="https://avatars1.githubusercontent.com/u/30851?v=3&s=400" name="twitter:image:src" />
-<meta content="GitHub" property="og:site_name" /><meta content="object" property="og:type" /><meta content="https://avatars1.githubusercontent.com/u/30851?v=3&s=400" property="og:image" /><meta content="n8fr8/orbot" property="og:title" /><meta content="https://github.com/n8fr8/orbot" property="og:url" /><meta content="My dev mirror of https://gitweb.torproject.org/n8fr8/orbot.git" property="og:description" />
-
- <meta name="browser-stats-url" content="/_stats">
- <link rel="assets" href="https://assets-cdn.github.com/">
- <link rel="conduit-xhr" href="https://ghconduit.com:25035">
- <link rel="xhr-socket" href="/_sockets">
- <meta name="pjax-timeout" content="1000">
- <link rel="sudo-modal" href="/sessions/sudo_modal">
-
- <meta name="msapplication-TileImage" content="/windows-tile.png">
- <meta name="msapplication-TileColor" content="#ffffff">
- <meta name="selected-link" value="repo_source" data-pjax-transient>
- <meta name="google-analytics" content="UA-3769691-2">
-
- <meta content="collector.githubapp.com" name="octolytics-host" /><meta content="collector-cdn.github.com" name="octolytics-script-host" /><meta content="github" name="octolytics-app-id" /><meta content="D10693A5:67D1:B7ACB61:5460FBA6" name="octolytics-dimension-request_id" /><meta content="30851" name="octolytics-actor-id" /><meta content="n8fr8" name="octolytics-actor-login" /><meta content="49360e5b97233bb7342ef464ba150d5510000db2a2342cda0caf1f5b272307ea" name="octolytics-actor-hash" />
-
- <meta content="Rails, view, blob#show" name="analytics-event" />
-
-
-
- <link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
-
-
- <meta content="authenticity_token" name="csrf-param" />
-<meta content="IYMVx4jhFZWjsIbaBF2PfpJkJd+JDhomrwrNBcgVWt/2AyRQihknFfGD+XTHggwxwlRUZOQOcm9F6eyHHLjfCQ==" name="csrf-token" />
-
- <link href="https://assets-cdn.github.com/assets/github-2fb9b25b51546977e75d8ae9e070af4…" media="all" rel="stylesheet" type="text/css" />
- <link href="https://assets-cdn.github.com/assets/github2-cbef91bb0032999dd66abd1af1d766…" media="all" rel="stylesheet" type="text/css" />
-
-
-
-
- <meta http-equiv="x-pjax-version" content="f1bf8b6c4433c64f418b520942f0c02a">
-
-
- <meta name="description" content="My dev mirror of https://gitweb.torproject.org/n8fr8/orbot.git">
- <meta name="go-import" content="github.com/n8fr8/orbot git https://github.com/n8fr8/orbot.git">
-
- <meta content="30851" name="octolytics-dimension-user_id" /><meta content="n8fr8" name="octolytics-dimension-user_login" /><meta content="20008432" name="octolytics-dimension-repository_id" /><meta content="n8fr8/orbot" name="octolytics-dimension-repository_nwo" /><meta content="true" name="octolytics-dimension-repository_public" /><meta content="false" name="octolytics-dimension-repository_is_fork" /><meta content="20008432" name="octolytics-dimension-repository_network_root_id" /><meta content="n8fr8/orbot" name="octolytics-dimension-repository_network_root_nwo" />
- <link href="https://github.com/n8fr8/orbot/commits/master.atom" rel="alternate" title="Recent Commits to orbot:master" type="application/atom+xml">
-
- </head>
-
-
- <body class="logged_in env-production linux vis-public page-blob">
- <a href="#start-of-content" tabindex="1" class="accessibility-aid js-skip-to-content">Skip to content</a>
- <div class="wrapper">
-
-
-
-
-
-
- <div class="header header-logged-in true" role="banner">
- <div class="container clearfix">
-
- <a class="header-logo-invertocat" href="https://github.com/" data-hotkey="g d" aria-label="Homepage" ga-data-click="Header, go to dashboard, icon:logo">
- <span class="mega-octicon octicon-mark-github"></span>
-</a>
-
-
- <div class="site-search repo-scope js-site-search" role="search">
- <form accept-charset="UTF-8" action="/n8fr8/orbot/search" class="js-site-search-form" data-global-search-url="/search" data-repo-search-url="/n8fr8/orbot/search" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /></div>
- <input type="text"
- class="js-site-search-field is-clearable"
- data-hotkey="s"
- name="q"
- placeholder="Search"
- data-global-scope-placeholder="Search GitHub"
- data-repo-scope-placeholder="Search"
- tabindex="1"
- autocapitalize="off">
- <div class="scope-badge">This repository</div>
-</form>
- </div>
- <ul class="header-nav left" role="navigation">
- <li class="header-nav-item explore">
- <a class="header-nav-link" href="/explore" data-ga-click="Header, go to explore, text:explore">Explore</a>
- </li>
- <li class="header-nav-item">
- <a class="header-nav-link" href="https://gist.github.com" data-ga-click="Header, go to gist, text:gist">Gist</a>
- </li>
- <li class="header-nav-item">
- <a class="header-nav-link" href="/blog" data-ga-click="Header, go to blog, text:blog">Blog</a>
- </li>
- <li class="header-nav-item">
- <a class="header-nav-link" href="https://help.github.com" data-ga-click="Header, go to help, text:help">Help</a>
- </li>
- </ul>
-
-
-<ul class="header-nav user-nav right" id="user-links">
- <li class="header-nav-item dropdown js-menu-container">
- <a class="header-nav-link name" href="/n8fr8" data-ga-click="Header, go to profile, text:username">
- <img alt="n8fr8" class="avatar" data-user="30851" height="20" src="https://avatars3.githubusercontent.com/u/30851?v=3&s=40" width="20" />
- <span class="css-truncate">
- <span class="css-truncate-target">n8fr8</span>
- </span>
- </a>
- </li>
-
- <li class="header-nav-item dropdown js-menu-container">
- <a class="header-nav-link js-menu-target tooltipped tooltipped-s" href="#" aria-label="Create new..." data-ga-click="Header, create new, icon:add">
- <span class="octicon octicon-plus"></span>
- <span class="dropdown-caret"></span>
- </a>
-
- <div class="dropdown-menu-content js-menu-content">
-
-<ul class="dropdown-menu">
- <li>
- <a href="/new"><span class="octicon octicon-repo"></span> New repository</a>
- </li>
- <li>
- <a href="/organizations/new"><span class="octicon octicon-organization"></span> New organization</a>
- </li>
-
-
- <li class="dropdown-divider"></li>
- <li class="dropdown-header">
- <span title="n8fr8/orbot">This repository</span>
- </li>
- <li>
- <a href="/n8fr8/orbot/issues/new"><span class="octicon octicon-issue-opened"></span> New issue</a>
- </li>
- <li>
- <a href="/n8fr8/orbot/settings/collaboration"><span class="octicon octicon-person"></span> New collaborator</a>
- </li>
-</ul>
-
- </div>
- </li>
-
- <li class="header-nav-item">
- <a href="/n8fr8/orbot/notifications" aria-label="You have unread notifications in this repository" class="header-nav-link notification-indicator tooltipped tooltipped-s" data-ga-click="Header, go to notifications, icon:unread" data-hotkey="g n">
- <span class="mail-status unread"></span>
- <span class="octicon octicon-inbox"></span>
-</a>
- </li>
-
- <li class="header-nav-item">
- <a class="header-nav-link tooltipped tooltipped-s" href="/settings/profile" id="account_settings" aria-label="Settings" data-ga-click="Header, go to settings, icon:settings">
- <span class="octicon octicon-gear"></span>
- </a>
- </li>
-
- <li class="header-nav-item">
- <form accept-charset="UTF-8" action="/logout" class="logout-form" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="HjRChgYajLZtVVXyeH257jhP2/4FAQeXIgc6YcUuMlQHE+D78qgPWo4jRvgAzSSG+HCpblQ+eZViYCWKuCy/ew==" /></div>
- <button class="header-nav-link sign-out-button tooltipped tooltipped-s" aria-label="Sign out" data-ga-click="Header, sign out, icon:logout">
- <span class="octicon octicon-sign-out"></span>
- </button>
-</form> </li>
-
-</ul>
-
-
-
- </div>
-</div>
-
-
-
-
-
-
- <div id="start-of-content" class="accessibility-aid"></div>
- <div class="site" itemscope itemtype="http://schema.org/WebPage">
- <div id="js-flash-container">
-
- </div>
- <div class="pagehead repohead instapaper_ignore readability-menu">
- <div class="container">
-
-<ul class="pagehead-actions">
-
- <li class="subscription">
- <form accept-charset="UTF-8" action="/notifications/subscribe" class="js-social-container" data-autosubmit="true" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="suDhnxjOgyUS/nUDuqsP5VCn+wHKXUuwX1Y2lMWD8rt2ct1innb9/LbTkKkmYnKDfIRpkwMeuLeDaAtAOKlFyA==" /></div> <input id="repository_id" name="repository_id" type="hidden" value="20008432" />
-
- <div class="select-menu js-menu-container js-select-menu">
- <a class="social-count js-social-count" href="/n8fr8/orbot/watchers">
- 1
- </a>
- <a href="/n8fr8/orbot/subscription"
- class="minibutton select-menu-button with-count js-menu-target" role="button" tabindex="0" aria-haspopup="true">
- <span class="js-select-button">
- <span class="octicon octicon-eye"></span>
- Unwatch
- </span>
- </a>
-
- <div class="select-menu-modal-holder">
- <div class="select-menu-modal subscription-menu-modal js-menu-content" aria-hidden="true">
- <div class="select-menu-header">
- <span class="select-menu-title">Notifications</span>
- <span class="octicon octicon-x js-menu-close" role="button" aria-label="Close"></span>
- </div> <!-- /.select-menu-header -->
-
- <div class="select-menu-list js-navigation-container" role="menu">
-
- <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <div class="select-menu-item-text">
- <input id="do_included" name="do" type="radio" value="included" />
- <h4>Not watching</h4>
- <span class="description">Be notified when participating or @mentioned.</span>
- <span class="js-select-button-text hidden-select-button-text">
- <span class="octicon octicon-eye"></span>
- Watch
- </span>
- </div>
- </div> <!-- /.select-menu-item -->
-
- <div class="select-menu-item js-navigation-item selected" role="menuitem" tabindex="0">
- <span class="select-menu-item-icon octicon octicon octicon-check"></span>
- <div class="select-menu-item-text">
- <input checked="checked" id="do_subscribed" name="do" type="radio" value="subscribed" />
- <h4>Watching</h4>
- <span class="description">Be notified of all conversations.</span>
- <span class="js-select-button-text hidden-select-button-text">
- <span class="octicon octicon-eye"></span>
- Unwatch
- </span>
- </div>
- </div> <!-- /.select-menu-item -->
-
- <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <div class="select-menu-item-text">
- <input id="do_ignore" name="do" type="radio" value="ignore" />
- <h4>Ignoring</h4>
- <span class="description">Never be notified.</span>
- <span class="js-select-button-text hidden-select-button-text">
- <span class="octicon octicon-mute"></span>
- Stop ignoring
- </span>
- </div>
- </div> <!-- /.select-menu-item -->
-
- </div> <!-- /.select-menu-list -->
-
- </div> <!-- /.select-menu-modal -->
- </div> <!-- /.select-menu-modal-holder -->
- </div> <!-- /.select-menu -->
-
-</form>
- </li>
-
- <li>
-
- <div class="js-toggler-container js-social-container starring-container ">
-
- <form accept-charset="UTF-8" action="/n8fr8/orbot/unstar" class="js-toggler-form starred js-unstar-button" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="kAC65QMMg5xEzDd3tUiIxGzYEzoiv1MemXsSlQYQgOFoiVJ/tTWLqnBbeFn0y7SbwFEjNfM+yLDV6vO/frw1Ew==" /></div>
- <button
- class="minibutton with-count js-toggler-target star-button"
- aria-label="Unstar this repository" title="Unstar n8fr8/orbot">
- <span class="octicon octicon-star"></span>
- Unstar
- </button>
- <a class="social-count js-social-count" href="/n8fr8/orbot/stargazers">
- 4
- </a>
-</form>
- <form accept-charset="UTF-8" action="/n8fr8/orbot/star" class="js-toggler-form unstarred js-star-button" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="4AA5vm/aRGfPxhwOSDd57h4X5OOdm/O6Se/MKrg2lPw07oNp5MvJk3mF6X4FkNM89OhxIC812fQUZY4KYJl35g==" /></div>
- <button
- class="minibutton with-count js-toggler-target star-button"
- aria-label="Star this repository" title="Star n8fr8/orbot">
- <span class="octicon octicon-star"></span>
- Star
- </button>
- <a class="social-count js-social-count" href="/n8fr8/orbot/stargazers">
- 4
- </a>
-</form> </div>
-
- </li>
-
-
- <li>
- <a href="/n8fr8/orbot/fork" class="minibutton with-count js-toggler-target fork-button tooltipped-n" title="Fork your own copy of n8fr8/orbot to your account" aria-label="Fork your own copy of n8fr8/orbot to your account" rel="facebox nofollow">
- <span class="octicon octicon-repo-forked"></span>
- Fork
- </a>
- <a href="/n8fr8/orbot/network" class="social-count">4</a>
- </li>
-
-</ul>
-
- <h1 itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="entry-title public">
- <span class="mega-octicon octicon-repo"></span>
- <span class="author"><a href="/n8fr8" class="url fn" itemprop="url" rel="author"><span itemprop="title">n8fr8</span></a></span><!--
- --><span class="path-divider">/</span><!--
- --><strong><a href="/n8fr8/orbot" class="js-current-repository js-repo-home-link" data-pjax-container-selector="#js-repo-pjax-container">orbot</a></strong>
-
- <span class="page-context-loader">
- <img alt="" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
- </span>
-
- </h1>
- </div><!-- /.container -->
- </div><!-- /.repohead -->
-
- <div class="container">
- <div class="repository-with-sidebar repo-container new-discussion-timeline ">
- <div class="repository-sidebar clearfix">
-
-<nav class="sunken-menu repo-nav js-repo-nav js-sidenav-container-pjax js-octicon-loaders" role="navigation" data-issue-count-url="/n8fr8/orbot/issues/counts" data-pjax-container-selector="#js-repo-pjax-container">
- <ul class="sunken-menu-group">
- <li class="tooltipped tooltipped-w" aria-label="Code">
- <a href="/n8fr8/orbot" aria-label="Code" class="selected js-selected-navigation-item sunken-menu-item" data-hotkey="g c" data-pjax="true" data-selected-links="repo_source repo_downloads repo_commits repo_releases repo_tags repo_branches /n8fr8/orbot">
- <span class="octicon octicon-code"></span> <span class="full-word">Code</span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
-
- <li class="tooltipped tooltipped-w" aria-label="Issues">
- <a href="/n8fr8/orbot/issues" aria-label="Issues" class="js-selected-navigation-item sunken-menu-item js-disable-pjax" data-hotkey="g i" data-selected-links="repo_issues repo_labels repo_milestones /n8fr8/orbot/issues">
- <span class="octicon octicon-issue-opened"></span> <span class="full-word">Issues</span>
- <span class="js-issue-replace-counter"></span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
-
- <li class="tooltipped tooltipped-w" aria-label="Pull Requests">
- <a href="/n8fr8/orbot/pulls" aria-label="Pull Requests" class="js-selected-navigation-item sunken-menu-item js-disable-pjax" data-hotkey="g p" data-selected-links="repo_pulls /n8fr8/orbot/pulls">
- <span class="octicon octicon-git-pull-request"></span> <span class="full-word">Pull Requests</span>
- <span class="js-pull-replace-counter"></span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
-
-
- <li class="tooltipped tooltipped-w" aria-label="Wiki">
- <a href="/n8fr8/orbot/wiki" aria-label="Wiki" class="js-selected-navigation-item sunken-menu-item js-disable-pjax" data-hotkey="g w" data-selected-links="repo_wiki /n8fr8/orbot/wiki">
- <span class="octicon octicon-book"></span> <span class="full-word">Wiki</span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
- </ul>
- <div class="sunken-menu-separator"></div>
- <ul class="sunken-menu-group">
-
- <li class="tooltipped tooltipped-w" aria-label="Pulse">
- <a href="/n8fr8/orbot/pulse/weekly" aria-label="Pulse" class="js-selected-navigation-item sunken-menu-item" data-pjax="true" data-selected-links="pulse /n8fr8/orbot/pulse/weekly">
- <span class="octicon octicon-pulse"></span> <span class="full-word">Pulse</span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
-
- <li class="tooltipped tooltipped-w" aria-label="Graphs">
- <a href="/n8fr8/orbot/graphs" aria-label="Graphs" class="js-selected-navigation-item sunken-menu-item" data-pjax="true" data-selected-links="repo_graphs repo_contributors /n8fr8/orbot/graphs">
- <span class="octicon octicon-graph"></span> <span class="full-word">Graphs</span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
- </ul>
-
-
- <div class="sunken-menu-separator"></div>
- <ul class="sunken-menu-group">
- <li class="tooltipped tooltipped-w" aria-label="Settings">
- <a href="/n8fr8/orbot/settings" aria-label="Settings" class="js-selected-navigation-item sunken-menu-item" data-pjax="true" data-selected-links="repo_settings /n8fr8/orbot/settings">
- <span class="octicon octicon-tools"></span> <span class="full-word">Settings</span>
- <img alt="" class="mini-loader" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32.gif" width="16" />
-</a> </li>
- </ul>
-</nav>
-
- <div class="only-with-full-nav">
-
-
-<div class="clone-url open"
- data-protocol-type="http"
- data-url="/users/set_protocol?protocol_selector=http&protocol_type=push">
- <h3><span class="text-emphasized">HTTPS</span> clone URL</h3>
- <div class="input-group">
- <input type="text" class="input-mini input-monospace js-url-field"
- value="https://github.com/n8fr8/orbot.git" readonly="readonly">
- <span class="input-group-button">
- <button aria-label="Copy to clipboard" class="js-zeroclipboard minibutton zeroclipboard-button" data-clipboard-text="https://github.com/n8fr8/orbot.git" data-copied-hint="Copied!" type="button"><span class="octicon octicon-clippy"></span></button>
- </span>
- </div>
-</div>
-
-
-<div class="clone-url "
- data-protocol-type="ssh"
- data-url="/users/set_protocol?protocol_selector=ssh&protocol_type=push">
- <h3><span class="text-emphasized">SSH</span> clone URL</h3>
- <div class="input-group">
- <input type="text" class="input-mini input-monospace js-url-field"
- value="git@github.com:n8fr8/orbot.git" readonly="readonly">
- <span class="input-group-button">
- <button aria-label="Copy to clipboard" class="js-zeroclipboard minibutton zeroclipboard-button" data-clipboard-text="git@github.com:n8fr8/orbot.git" data-copied-hint="Copied!" type="button"><span class="octicon octicon-clippy"></span></button>
- </span>
- </div>
-</div>
-
-
-<div class="clone-url "
- data-protocol-type="subversion"
- data-url="/users/set_protocol?protocol_selector=subversion&protocol_type=push">
- <h3><span class="text-emphasized">Subversion</span> checkout URL</h3>
- <div class="input-group">
- <input type="text" class="input-mini input-monospace js-url-field"
- value="https://github.com/n8fr8/orbot" readonly="readonly">
- <span class="input-group-button">
- <button aria-label="Copy to clipboard" class="js-zeroclipboard minibutton zeroclipboard-button" data-clipboard-text="https://github.com/n8fr8/orbot" data-copied-hint="Copied!" type="button"><span class="octicon octicon-clippy"></span></button>
- </span>
- </div>
-</div>
-
-
-<p class="clone-options">You can clone with
- <a href="#" class="js-clone-selector" data-protocol="http">HTTPS</a>,
- <a href="#" class="js-clone-selector" data-protocol="ssh">SSH</a>,
- or <a href="#" class="js-clone-selector" data-protocol="subversion">Subversion</a>.
- <a href="https://help.github.com/articles/which-remote-url-should-i-use" class="help tooltipped tooltipped-n" aria-label="Get help on which URL is right for you.">
- <span class="octicon octicon-question"></span>
- </a>
-</p>
-
-
-
- <a href="/n8fr8/orbot/archive/master.zip"
- class="minibutton sidebar-button"
- aria-label="Download the contents of n8fr8/orbot as a zip file"
- title="Download the contents of n8fr8/orbot as a zip file"
- rel="nofollow">
- <span class="octicon octicon-cloud-download"></span>
- Download ZIP
- </a>
- </div>
- </div><!-- /.repository-sidebar -->
-
- <div id="js-repo-pjax-container" class="repository-content context-loader-container" data-pjax-container>
-
-
-<a href="/n8fr8/orbot/blob/3c4642cc823ac5ec30993ad2eb8af2a0efcfef39/res/raw/geoip6.mp3" class="hidden js-permalink-shortcut" data-hotkey="y">Permalink</a>
-
-<!-- blob contrib key: blob_contributors:v21:4e79b88b33c0a5c810d7088e347629bf -->
-
-<div class="file-navigation">
-
-<div class="select-menu js-menu-container js-select-menu left">
- <span class="minibutton select-menu-button js-menu-target css-truncate" data-hotkey="w"
- data-master-branch="master"
- data-ref="master"
- title="master"
- role="button" aria-label="Switch branches or tags" tabindex="0" aria-haspopup="true">
- <span class="octicon octicon-git-branch"></span>
- <i>branch:</i>
- <span class="js-select-button css-truncate-target">master</span>
- </span>
-
- <div class="select-menu-modal-holder js-menu-content js-navigation-container" data-pjax aria-hidden="true">
-
- <div class="select-menu-modal">
- <div class="select-menu-header">
- <span class="select-menu-title">Switch branches/tags</span>
- <span class="octicon octicon-x js-menu-close" role="button" aria-label="Close"></span>
- </div> <!-- /.select-menu-header -->
-
- <div class="select-menu-filters">
- <div class="select-menu-text-filter">
- <input type="text" aria-label="Find or create a branch…" id="context-commitish-filter-field" class="js-filterable-field js-navigation-enable" placeholder="Find or create a branch…">
- </div>
- <div class="select-menu-tabs">
- <ul>
- <li class="select-menu-tab">
- <a href="#" data-tab-filter="branches" class="js-select-menu-tab">Branches</a>
- </li>
- <li class="select-menu-tab">
- <a href="#" data-tab-filter="tags" class="js-select-menu-tab">Tags</a>
- </li>
- </ul>
- </div><!-- /.select-menu-tabs -->
- </div><!-- /.select-menu-filters -->
-
- <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="branches">
-
- <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
-
-
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/amoghbl1-issue_3014_wizard_workflow/res/raw/geoip6.mp3"
- data-name="amoghbl1-issue_3014_wizard_workflow"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="amoghbl1-issue_3014_wizard_workflow">amoghbl1-issue_3014_wizard_workflow</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/amoghbl1-new_notification_expanded/res/raw/geoip6.mp3"
- data-name="amoghbl1-new_notification_expanded"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="amoghbl1-new_notification_expanded">amoghbl1-new_notification_expanded</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_2803_jabberdotorg/res/raw/geoip6.mp3"
- data-name="bug_2803_jabberdotorg"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_2803_jabberdotorg">bug_2803_jabberdotorg</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_build_fix_mvdan/res/raw/geoip6.mp3"
- data-name="bug_build_fix_mvdan"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_build_fix_mvdan">bug_build_fix_mvdan</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_fix_binary_install/res/raw/geoip6.mp3"
- data-name="bug_fix_binary_install"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_fix_binary_install">bug_fix_binary_install</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_transproxy_fixes/res/raw/geoip6.mp3"
- data-name="bug_transproxy_fixes"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_transproxy_fixes">bug_transproxy_fixes</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_ui_disconnect/res/raw/geoip6.mp3"
- data-name="bug_ui_disconnect"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_ui_disconnect">bug_ui_disconnect</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bug_wizard_cleanup/res/raw/geoip6.mp3"
- data-name="bug_wizard_cleanup"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bug_wizard_cleanup">bug_wizard_cleanup</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/bugs_v13_fixes/res/raw/geoip6.mp3"
- data-name="bugs_v13_fixes"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="bugs_v13_fixes">bugs_v13_fixes</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/dev_orbotvpn/res/raw/geoip6.mp3"
- data-name="dev_orbotvpn"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="dev_orbotvpn">dev_orbotvpn</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/feature_add_orchid/res/raw/geoip6.mp3"
- data-name="feature_add_orchid"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="feature_add_orchid">feature_add_orchid</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/feature_remove_abs/res/raw/geoip6.mp3"
- data-name="feature_remove_abs"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="feature_remove_abs">feature_remove_abs</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/hans_build_patches/res/raw/geoip6.mp3"
- data-name="hans_build_patches"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="hans_build_patches">hans_build_patches</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/hans_feature_desc/res/raw/geoip6.mp3"
- data-name="hans_feature_desc"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="hans_feature_desc">hans_feature_desc</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item selected">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/master/res/raw/geoip6.mp3"
- data-name="master"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="master">master</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/blob/v13_dev/res/raw/geoip6.mp3"
- data-name="v13_dev"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="v13_dev">v13_dev</a>
- </div> <!-- /.select-menu-item -->
- </div>
-
- <form accept-charset="UTF-8" action="/n8fr8/orbot/branches" class="js-create-branch select-menu-item select-menu-new-item-form js-navigation-item js-new-item-form" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="4z8e4vvpHHxLttekMVFIaQiGVX+Fysb6mixyner/ETQP59dBPuIXvJl6rS80FV+ueWr2OJHjj8rNg3qOFu0rww==" /></div>
- <span class="octicon octicon-git-branch select-menu-item-icon"></span>
- <div class="select-menu-item-text">
- <h4>Create branch: <span class="js-new-item-name"></span></h4>
- <span class="description">from ‘master’</span>
- </div>
- <input type="hidden" name="name" id="name" class="js-new-item-value">
- <input type="hidden" name="branch" id="branch" value="master">
- <input type="hidden" name="path" id="path" value="res/raw/geoip6.mp3">
- </form> <!-- /.select-menu-item -->
-
- </div> <!-- /.select-menu-list -->
-
- <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="tags">
- <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
-
-
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/v12-beta-tor-0.2.4.15-rc/res/raw/geoip6.mp3"
- data-name="v12-beta-tor-0.2.4.15-rc"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="v12-beta-tor-0.2.4.15-rc">v12-beta-tor-0.2.4.15-rc</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/v11-RC2/res/raw/geoip6.mp3"
- data-name="v11-RC2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="v11-RC2">v11-RC2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.7.1/res/raw/geoip6.mp3"
- data-name="14.0.7.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.7.1">14.0.7.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.7/res/raw/geoip6.mp3"
- data-name="14.0.7"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.7">14.0.7</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.6/res/raw/geoip6.mp3"
- data-name="14.0.6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.6">14.0.6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5-beta-2/res/raw/geoip6.mp3"
- data-name="14.0.5-beta-2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5-beta-2">14.0.5-beta-2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5-beta/res/raw/geoip6.mp3"
- data-name="14.0.5-beta"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5-beta">14.0.5-beta</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5-RC1/res/raw/geoip6.mp3"
- data-name="14.0.5-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5-RC1">14.0.5-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5.4/res/raw/geoip6.mp3"
- data-name="14.0.5.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5.4">14.0.5.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5.3/res/raw/geoip6.mp3"
- data-name="14.0.5.3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5.3">14.0.5.3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5.2/res/raw/geoip6.mp3"
- data-name="14.0.5.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5.2">14.0.5.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5.1/res/raw/geoip6.mp3"
- data-name="14.0.5.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5.1">14.0.5.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.5/res/raw/geoip6.mp3"
- data-name="14.0.5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.5">14.0.5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.4.3/res/raw/geoip6.mp3"
- data-name="14.0.4.3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.4.3">14.0.4.3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.4.2/res/raw/geoip6.mp3"
- data-name="14.0.4.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.4.2">14.0.4.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.4.1/res/raw/geoip6.mp3"
- data-name="14.0.4.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.4.1">14.0.4.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.4/res/raw/geoip6.mp3"
- data-name="14.0.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.4">14.0.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.3.1/res/raw/geoip6.mp3"
- data-name="14.0.3.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.3.1">14.0.3.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.3/res/raw/geoip6.mp3"
- data-name="14.0.3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.3">14.0.3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.2.1/res/raw/geoip6.mp3"
- data-name="14.0.2.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.2.1">14.0.2.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.2/res/raw/geoip6.mp3"
- data-name="14.0.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.2">14.0.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.1/res/raw/geoip6.mp3"
- data-name="14.0.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.1">14.0.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-RC3/res/raw/geoip6.mp3"
- data-name="14.0.0-RC3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-RC3">14.0.0-RC3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-RC-1/res/raw/geoip6.mp3"
- data-name="14.0.0-RC-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-RC-1">14.0.0-RC-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-BETA-2/res/raw/geoip6.mp3"
- data-name="14.0.0-BETA-2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-BETA-2">14.0.0-BETA-2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-BETA-1/res/raw/geoip6.mp3"
- data-name="14.0.0-BETA-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-BETA-1">14.0.0-BETA-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-ALPHA-4/res/raw/geoip6.mp3"
- data-name="14.0.0-ALPHA-4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-ALPHA-4">14.0.0-ALPHA-4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-ALPHA-3/res/raw/geoip6.mp3"
- data-name="14.0.0-ALPHA-3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-ALPHA-3">14.0.0-ALPHA-3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-ALPHA-2b/res/raw/geoip6.mp3"
- data-name="14.0.0-ALPHA-2b"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-ALPHA-2b">14.0.0-ALPHA-2b</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0-ALPHA-2/res/raw/geoip6.mp3"
- data-name="14.0.0-ALPHA-2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0-ALPHA-2">14.0.0-ALPHA-2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/14.0.0/res/raw/geoip6.mp3"
- data-name="14.0.0"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="14.0.0">14.0.0</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.7-BETA-1/res/raw/geoip6.mp3"
- data-name="13.0.7-BETA-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.7-BETA-1">13.0.7-BETA-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.7/res/raw/geoip6.mp3"
- data-name="13.0.7"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.7">13.0.7</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-RC-4a/res/raw/geoip6.mp3"
- data-name="13.0.6-RC-4a"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-RC-4a">13.0.6-RC-4a</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-RC-4/res/raw/geoip6.mp3"
- data-name="13.0.6-RC-4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-RC-4">13.0.6-RC-4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-RC-3/res/raw/geoip6.mp3"
- data-name="13.0.6-RC-3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-RC-3">13.0.6-RC-3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-RC-2/res/raw/geoip6.mp3"
- data-name="13.0.6-RC-2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-RC-2">13.0.6-RC-2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-RC-1/res/raw/geoip6.mp3"
- data-name="13.0.6-RC-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-RC-1">13.0.6-RC-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-8/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-8"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-8">13.0.6-BETA-8</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-7/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-7"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-7">13.0.6-BETA-7</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-6/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-6">13.0.6-BETA-6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-5/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-5">13.0.6-BETA-5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-4/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-4">13.0.6-BETA-4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-3/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-3">13.0.6-BETA-3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-2/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-2">13.0.6-BETA-2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.6-BETA-1/res/raw/geoip6.mp3"
- data-name="13.0.6-BETA-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.6-BETA-1">13.0.6-BETA-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.5/res/raw/geoip6.mp3"
- data-name="13.0.5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.5">13.0.5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.4a/res/raw/geoip6.mp3"
- data-name="13.0.4a"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.4a">13.0.4a</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.4/res/raw/geoip6.mp3"
- data-name="13.0.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.4">13.0.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.3/res/raw/geoip6.mp3"
- data-name="13.0.3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.3">13.0.3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.2/res/raw/geoip6.mp3"
- data-name="13.0.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.2">13.0.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.1/res/raw/geoip6.mp3"
- data-name="13.0.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.1">13.0.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.0-alpha-1/res/raw/geoip6.mp3"
- data-name="13.0.0-alpha-1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.0-alpha-1">13.0.0-alpha-1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/13.0.0/res/raw/geoip6.mp3"
- data-name="13.0.0"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="13.0.0">13.0.0</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/12.0.5/res/raw/geoip6.mp3"
- data-name="12.0.5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="12.0.5">12.0.5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/12.0.4/res/raw/geoip6.mp3"
- data-name="12.0.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="12.0.4">12.0.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/12.0.2/res/raw/geoip6.mp3"
- data-name="12.0.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="12.0.2">12.0.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/12.0.1/res/raw/geoip6.mp3"
- data-name="12.0.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="12.0.1">12.0.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.4.4-alpha-1.0.11-RC4/res/raw/geoip6.mp3"
- data-name="0.2.4.4-alpha-1.0.11-RC4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.4.4-alpha-1.0.11-RC4">0.2.4.4-alpha-1.0.11-RC4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.4.3-alpha-1.0.11-RC3/res/raw/geoip6.mp3"
- data-name="0.2.4.3-alpha-1.0.11-RC3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.4.3-alpha-1.0.11-RC3">0.2.4.3-alpha-1.0.11-RC3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.4.3-alpha-1.0.11-RC1/res/raw/geoip6.mp3"
- data-name="0.2.4.3-alpha-1.0.11-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.4.3-alpha-1.0.11-RC1">0.2.4.3-alpha-1.0.11-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.23-rc-1.0.11-RC6/res/raw/geoip6.mp3"
- data-name="0.2.3.23-rc-1.0.11-RC6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.23-rc-1.0.11-RC6">0.2.3.23-rc-1.0.11-RC6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.17-beta-1.0.9-rc5a/res/raw/geoip6.mp3"
- data-name="0.2.3.17-beta-1.0.9-rc5a"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.17-beta-1.0.9-rc5a">0.2.3.17-beta-1.0.9-rc5a</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.17-beta-1.0.9-rc4/res/raw/geoip6.mp3"
- data-name="0.2.3.17-beta-1.0.9-rc4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.17-beta-1.0.9-rc4">0.2.3.17-beta-1.0.9-rc4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.17-beta-1.0.9-rc3/res/raw/geoip6.mp3"
- data-name="0.2.3.17-beta-1.0.9-rc3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.17-beta-1.0.9-rc3">0.2.3.17-beta-1.0.9-rc3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.17-beta-1.0.9-RC2/res/raw/geoip6.mp3"
- data-name="0.2.3.17-beta-1.0.9-RC2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.17-beta-1.0.9-RC2">0.2.3.17-beta-1.0.9-RC2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.17-beta-1.0.9-RC1/res/raw/geoip6.mp3"
- data-name="0.2.3.17-beta-1.0.9-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.17-beta-1.0.9-RC1">0.2.3.17-beta-1.0.9-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.15-alpha-orbot-1.0.8-RC1/res/raw/geoip6.mp3"
- data-name="0.2.3.15-alpha-orbot-1.0.8-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.15-alpha-orbot-1.0.8-RC1">0.2.3.15-alpha-orbot-1.0.8-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.11-alpha-1.0.7.2-OBFS-FINAL/res/raw/geoip6.mp3"
- data-name="0.2.3.11-alpha-1.0.7.2-OBFS-FINAL"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.11-alpha-1.0.7.2-OBFS-FINAL">0.2.3.11-alpha-1.0.7.2-OBFS-FINAL</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-orbot-1.0.7-RC6/res/raw/geoip6.mp3"
- data-name="0.2.3.10-orbot-1.0.7-RC6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-orbot-1.0.7-RC6">0.2.3.10-orbot-1.0.7-RC6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-orbot-1.0.7-RC7/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-orbot-1.0.7-RC7"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-orbot-1.0.7-RC7">0.2.3.10-alpha-orbot-1.0.7-RC7</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-orbot-1.0.7-RC4/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-orbot-1.0.7-RC4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-orbot-1.0.7-RC4">0.2.3.10-alpha-orbot-1.0.7-RC4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-orbot-1.0.7-RC3/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-orbot-1.0.7-RC3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-orbot-1.0.7-RC3">0.2.3.10-alpha-orbot-1.0.7-RC3</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-orbot-1.0.7-RC2/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-orbot-1.0.7-RC2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-orbot-1.0.7-RC2">0.2.3.10-alpha-orbot-1.0.7-RC2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-orbot-1.0.7-RC1/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-orbot-1.0.7-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-orbot-1.0.7-RC1">0.2.3.10-alpha-orbot-1.0.7-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.10-alpha-1.0.7-FINAL/res/raw/geoip6.mp3"
- data-name="0.2.3.10-alpha-1.0.7-FINAL"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.10-alpha-1.0.7-FINAL">0.2.3.10-alpha-1.0.7-FINAL</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.7-alpha-orbot-1.0.6-RC4/res/raw/geoip6.mp3"
- data-name="0.2.3.7-alpha-orbot-1.0.6-RC4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.7-alpha-orbot-1.0.6-RC4">0.2.3.7-alpha-orbot-1.0.6-RC4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.7-alpha-orbot-1.0.6-FINAL/res/raw/geoip6.mp3"
- data-name="0.2.3.7-alpha-orbot-1.0.6-FINAL"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.7-alpha-orbot-1.0.6-FINAL">0.2.3.7-alpha-orbot-1.0.6-FINAL</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.3.6-alpha-orbot-1.0.6/res/raw/geoip6.mp3"
- data-name="0.2.3.6-alpha-orbot-1.0.6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.3.6-alpha-orbot-1.0.6">0.2.3.6-alpha-orbot-1.0.6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.25-alpha-orbot-1.0.5-RC1%4024716/res/raw/geoip6.mp3"
- data-name="0.2.2.25-alpha-orbot-1.0.5-RC1@24716"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.25-alpha-orbot-1.0.5-RC1@24716">0.2.2.25-alpha-orbot-1.0.5-RC1@24716</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.25-alpha-orbot-1.0.5-RC1/res/raw/geoip6.mp3"
- data-name="0.2.2.25-alpha-orbot-1.0.5-RC1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.25-alpha-orbot-1.0.5-RC1">0.2.2.25-alpha-orbot-1.0.5-RC1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.25-alpha-orbot-1.0.5.1/res/raw/geoip6.mp3"
- data-name="0.2.2.25-alpha-orbot-1.0.5.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.25-alpha-orbot-1.0.5.1">0.2.2.25-alpha-orbot-1.0.5.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.25-alpha-orbot-1.0.5/res/raw/geoip6.mp3"
- data-name="0.2.2.25-alpha-orbot-1.0.5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.25-alpha-orbot-1.0.5">0.2.2.25-alpha-orbot-1.0.5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-1.0.4/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-1.0.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-1.0.4">0.2.2.14-alpha-orbot-1.0.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-1.0.2/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-1.0.2"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-1.0.2">0.2.2.14-alpha-orbot-1.0.2</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-1.0.1/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-1.0.1"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-1.0.1">0.2.2.14-alpha-orbot-1.0.1</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-1.0.0/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-1.0.0"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-1.0.0">0.2.2.14-alpha-orbot-1.0.0</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-0.0.10/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-0.0.10"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-0.0.10">0.2.2.14-alpha-orbot-0.0.10</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.14-alpha-orbot-0.0.9/res/raw/geoip6.mp3"
- data-name="0.2.2.14-alpha-orbot-0.0.9"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.14-alpha-orbot-0.0.9">0.2.2.14-alpha-orbot-0.0.9</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.13-alpha-orbot-0.0.8/res/raw/geoip6.mp3"
- data-name="0.2.2.13-alpha-orbot-0.0.8"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.13-alpha-orbot-0.0.8">0.2.2.13-alpha-orbot-0.0.8</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.13-alpha-orbot-0.0.7/res/raw/geoip6.mp3"
- data-name="0.2.2.13-alpha-orbot-0.0.7"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.13-alpha-orbot-0.0.7">0.2.2.13-alpha-orbot-0.0.7</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.13-alpha-orbot-0.0.6/res/raw/geoip6.mp3"
- data-name="0.2.2.13-alpha-orbot-0.0.6"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.13-alpha-orbot-0.0.6">0.2.2.13-alpha-orbot-0.0.6</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.9-alpha-orbot-0.0.5/res/raw/geoip6.mp3"
- data-name="0.2.2.9-alpha-orbot-0.0.5"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.9-alpha-orbot-0.0.5">0.2.2.9-alpha-orbot-0.0.5</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.9-alpha-orbot-0.0.4/res/raw/geoip6.mp3"
- data-name="0.2.2.9-alpha-orbot-0.0.4"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.9-alpha-orbot-0.0.4">0.2.2.9-alpha-orbot-0.0.4</a>
- </div> <!-- /.select-menu-item -->
- <div class="select-menu-item js-navigation-item ">
- <span class="select-menu-item-icon octicon octicon-check"></span>
- <a href="/n8fr8/orbot/tree/0.2.2.9-alpha-orbot-0.0.3/res/raw/geoip6.mp3"
- data-name="0.2.2.9-alpha-orbot-0.0.3"
- data-skip-pjax="true"
- rel="nofollow"
- class="js-navigation-open select-menu-item-text css-truncate-target"
- title="0.2.2.9-alpha-orbot-0.0.3">0.2.2.9-alpha-orbot-0.0.3</a>
- </div> <!-- /.select-menu-item -->
- </div>
-
- <div class="select-menu-no-results">Nothing to show</div>
- </div> <!-- /.select-menu-list -->
-
- </div> <!-- /.select-menu-modal -->
- </div> <!-- /.select-menu-modal-holder -->
-</div> <!-- /.select-menu -->
-
- <div class="button-group right">
- <a href="/n8fr8/orbot/find/master"
- class="js-show-file-finder minibutton empty-icon tooltipped tooltipped-s"
- data-pjax
- data-hotkey="t"
- aria-label="Quickly jump between files">
- <span class="octicon octicon-list-unordered"></span>
- </a>
- <button aria-label="Copy to clipboard" class="js-zeroclipboard minibutton zeroclipboard-button" data-clipboard-text="res/raw/geoip6.mp3" data-copied-hint="Copied!" type="button"><span class="octicon octicon-clippy"></span></button>
- </div>
-
- <div class="breadcrumb">
- <span class='repo-root js-repo-root'><span itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/n8fr8/orbot" class="" data-branch="master" data-direction="back" data-pjax="true" itemscope="url"><span itemprop="title">orbot</span></a></span></span><span class="separator"> / </span><span itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/n8fr8/orbot/tree/master/res" class="" data-branch="master" data-direction="back" data-pjax="true" itemscope="url"><span itemprop="title">res</span></a></span><span class="separator"> / </span><span itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/n8fr8/orbot/tree/master/res/raw" class="" data-branch="master" data-direction="back" data-pjax="true" itemscope="url"><span itemprop="title">raw</span></a></span><span class="separator"> / </span><strong class="final-path">geoip6.mp3</strong>
- </div>
-</div>
-
-<include-fragment class="commit commit-loader file-history-tease" src="/n8fr8/orbot/contributors/master/res/raw/geoip6.mp3">
- <div class="file-history-tease-header">
- Fetching contributors…
- </div>
-
- <div class="participation">
- <p class="loader-loading"><img alt="" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32-EAF2F5.gif" width="16" /></p>
- <p class="loader-error">Cannot retrieve contributors at this time</p>
- </div>
-</include-fragment>
-<div class="file-box">
- <div class="file">
- <div class="meta clearfix">
- <div class="info file-name">
- <span>81.42 kb</span>
- </div>
- <div class="actions">
- <div class="button-group">
- <a href="/n8fr8/orbot/raw/master/res/raw/geoip6.mp3" class="minibutton " id="raw-url">Raw</a>
- <a href="/n8fr8/orbot/commits/master/res/raw/geoip6.mp3" class="minibutton " rel="nofollow">History</a>
- </div><!-- /.button-group -->
-
-
-
- <a class="octicon-button danger"
- href="/n8fr8/orbot/delete/master/res/raw/geoip6.mp3"
- aria-label="Delete this file"
- data-method="post" data-test-id="delete-blob-file" rel="nofollow">
- <span class="octicon octicon-trashcan"></span>
- </a>
- </div><!-- /.actions -->
- </div>
-
-
- <div class="blob-wrapper data type-text">
- <div class="image">
- <a href="/n8fr8/orbot/blob/master/res/raw/geoip6.mp3?raw=true">View Raw</a>
- </div>
- </div>
-
- </div>
-</div>
-
-<a href="#jump-to-line" rel="facebox[.linejump]" data-hotkey="l" style="display:none">Jump to Line</a>
-<div id="jump-to-line" style="display:none">
- <form accept-charset="UTF-8" class="js-jump-to-line-form">
- <input class="linejump-input js-jump-to-line-field" type="text" placeholder="Jump to line…" autofocus>
- <button type="submit" class="button">Go</button>
- </form>
-</div>
-
- </div>
-
- </div><!-- /.repo-container -->
- <div class="modal-backdrop"></div>
- </div><!-- /.container -->
- </div><!-- /.site -->
-
-
- </div><!-- /.wrapper -->
-
- <div class="container">
- <div class="site-footer" role="contentinfo">
- <ul class="site-footer-links right">
- <li><a href="https://status.github.com/">Status</a></li>
- <li><a href="https://developer.github.com">API</a></li>
- <li><a href="http://training.github.com">Training</a></li>
- <li><a href="http://shop.github.com">Shop</a></li>
- <li><a href="/blog">Blog</a></li>
- <li><a href="/about">About</a></li>
-
- </ul>
-
- <a href="/" aria-label="Homepage">
- <span class="mega-octicon octicon-mark-github" title="GitHub"></span>
- </a>
-
- <ul class="site-footer-links">
- <li>© 2014 <span title="0.08933s from github-fe127-cp1-prd.iad.github.net">GitHub</span>, Inc.</li>
- <li><a href="/site/terms">Terms</a></li>
- <li><a href="/site/privacy">Privacy</a></li>
- <li><a href="/security">Security</a></li>
- <li><a href="/contact">Contact</a></li>
- </ul>
- </div><!-- /.site-footer -->
-</div><!-- /.container -->
-
-
- <div class="fullscreen-overlay js-fullscreen-overlay" id="fullscreen_overlay">
- <div class="fullscreen-container js-suggester-container">
- <div class="textarea-wrap">
- <textarea name="fullscreen-contents" id="fullscreen-contents" class="fullscreen-contents js-fullscreen-contents js-suggester-field" placeholder=""></textarea>
- </div>
- </div>
- <div class="fullscreen-sidebar">
- <a href="#" class="exit-fullscreen js-exit-fullscreen tooltipped tooltipped-w" aria-label="Exit Zen Mode">
- <span class="mega-octicon octicon-screen-normal"></span>
- </a>
- <a href="#" class="theme-switcher js-theme-switcher tooltipped tooltipped-w"
- aria-label="Switch themes">
- <span class="octicon octicon-color-mode"></span>
- </a>
- </div>
-</div>
-
-
-
- <div id="ajax-error-message" class="flash flash-error">
- <span class="octicon octicon-alert"></span>
- <a href="#" class="octicon octicon-x flash-close js-ajax-error-dismiss" aria-label="Dismiss error"></a>
- Something went wrong with that request. Please try again.
- </div>
-
-
- <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/frameworks-fe1dc1d9b25d6a0cda010576a3c…" type="text/javascript"></script>
- <script async="async" crossorigin="anonymous" src="https://assets-cdn.github.com/assets/github-aba45b8411f81a17de91f1837c70a8c…" type="text/javascript"></script>
-
-
- </body>
-</html>
-
diff --git a/orbotservice/src/main/res/raw/torpolipo.conf b/orbotservice/src/main/res/raw/torpolipo.conf
deleted file mode 100644
index 0aeaf632..00000000
--- a/orbotservice/src/main/res/raw/torpolipo.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-proxyAddress = "127.0.0.1"
-proxyPort = 8118
-allowedClients = 127.0.0.1
-allowedPorts = 1-65535
-proxyName = "127.0.0.1"
-cacheIsShared = false
-socksParentProxy = "127.0.0.1:9050"
-socksProxyType = socks5
-diskCacheRoot = ""
-localDocumentRoot = ""
-disableLocalInterface = true
-disableConfiguration = true
-dnsUseGethostbyname = yes
-disableVia = true
-censoredHeaders = from,accept-language,x-pad,link
-censorReferer = maybe
-maxConnectionAge = 5m
-maxConnectionRequests = 120
-serverMaxSlots = 8
-serverSlots = 2
-tunnelAllowedPorts = 1-65535
-chunkHighMark = 512000
-objectHighMark = 128
\ No newline at end of file
diff --git a/orbotservice/src/main/res/raw/torrc b/orbotservice/src/main/res/raw/torrc
deleted file mode 100644
index fd0223e7..00000000
--- a/orbotservice/src/main/res/raw/torrc
+++ /dev/null
@@ -1,8 +0,0 @@
-RunAsDaemon 1
-AvoidDiskWrites 1
-ControlPort auto
-SOCKSPort 0
-DNSPort 0
-TransPort 0
-CookieAuthentication 1
-DisableNetwork 1
\ No newline at end of file
1
0
07 Dec '17
commit d392ecd60daca353fb6709c9da4bfb1fb4b4b5e5
Author: n8fr8 <nathan(a)freitas.net>
Date: Sun Dec 3 15:19:46 2017 +0530
remove unneeded external dirs for making tor
---
external/Makefile | 367 ----
external/config.guess | 1530 -----------------
external/config.sub | 1773 --------------------
external/fix_android_0.2.6.4rc_build.patch | 77 -
external/libevent | 1 -
external/libevent-patch-1 | 29 -
external/openssl | 1 -
external/patches/UDP-block.patch | 243 ---
.../orbot-patch-sporkbomb-20110501/Part 1.4 | 11 -
...real_transproxy_all-use_only_new_iptables.patch | 390 -----
.../orbot_leak_report | 110 --
external/patches/transproxy.patch | 0
external/patches/udptransproxyfinal.patch | 247 ---
.../ic_launcher_gibberbot.png | Bin 7527 -> 0 bytes
.../update_GibberBot_info.diff | 285 ----
15 files changed, 5064 deletions(-)
diff --git a/external/Makefile b/external/Makefile
deleted file mode 100644
index 0c7b52b1..00000000
--- a/external/Makefile
+++ /dev/null
@@ -1,367 +0,0 @@
-# Please install the following prerequisites (instructions for each follows):
-# Android OS SDK: http://source.android.com/download
-#
-# Install and prepare the Android OS SDK ( http://source.android.com/download )
-# on Debian or Ubuntu
-
-### these modify the calling shell
-# workaround for cross-compiling bug in autoconf
-export ac_cv_func_malloc_0_nonnull=yes
-export ac_cv_func_setpgrp_void=yes
-
-EXTERNAL_ROOT := $(shell pwd)
-
-DEBUG ?= 0
-
-# No-op command.
-NOOP = true
-
-# Android now has 64-bit and 32-bit versions of the NDK for GNU/Linux. We
-# assume that the build platform uses the appropriate version, otherwise the
-# user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN.
-CPU := $(shell uname -m)
-ifeq ($(CPU),x86_64)
- NDK_PROCESSOR=x86_64
-else
- NDK_PROCESSOR=x86
-endif
-
-# Android NDK setup
-ANDROID_NDK_HOME ?= /opt/android-ndk
-NDK_PLATFORM_LEVEL ?= 16
-NDK_TOOLCHAIN_VERSION=4.9
-APP_ABI ?= armeabi
-NDK_ABI ?= $(APP_ABI)
-
-# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets
-PIEFLAGS ?= -fPIE -pie
-
-ifneq ($(filter arm%, $(APP_ABI)),)
- NDK_ABI := arm
-endif
-ifneq ($(filter arm64%, $(APP_ABI)),)
- NDK_ABI := arm64
-endif
-NDK_SYSROOT=$(ANDROID_NDK_HOME)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
-NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
-ifneq ($(filter mips%, $(NDK_ABI)),)
- HOST := $(NDK_ABI)el-linux-android
-endif
-ifneq ($(filter arm64, $(NDK_ABI)),)
- HOST := aarch64-linux-android
-endif
-ifneq ($(filter arm, $(NDK_ABI)),)
- HOST := arm-linux-androideabi
-endif
-ifneq ($(filter x86, $(NDK_ABI)),)
- HOST := i686-linux-android
-endif
-ifneq ($(filter x86_64, $(NDK_ABI)),)
- HOST := x86_64-linux-android
-endif
-
-NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION)
-ifneq ($(filter x86%, $(NDK_ABI)),)
- NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION)
-endif
-NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)
-
-# include Android's build flags
-TARGET_ARCH_ABI = $(APP_ABI)
-#include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
-
-CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT)
-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
-
-ifeq ($(DEBUG), 1)
- STRIP := $(NOOP)
-else
- STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-unneeded -R .note -R .comment --strip-debug
-endif
-
-
-CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS)
-LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS)
-
-# change 'release' to 'debug' for unoptimized debug builds
-ifeq ($(APP_ABI),armeabi-v7a)
- CFLAGS += $(TARGET_arm_release_CFLAGS)
-endif
-ifeq ($(APP_ABI),armeabi)
- CFLAGS += $(TARGET_thumb_release_CFLAGS)
-endif
-
-
-
-.PHONY = clean showsetup \
- assets assets-clean \
- openssl-static openssl-static-clean \
- libevent libevent-clean \
- lzma lzma-clean \
- zstd zstd-clean \
- tor tor-clean \
- polipo polipo-clean
-
-all: assets
-
-#------------------------------------------------------------------------------#
-# openssl
-
-# Disable rc4 cipher for 64-bit archs, to avoid this link error for tor:
-# external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc'
-OPENSSL_CONF_FLAG=
-ifneq ($(findstring 64, $(NDK_ABI)),)
- OPENSSL_CONF_FLAG+=no-rc4
-endif
-
-# OpenSSL's 'make depend' fails if _MIPS_SZLONG is not set:
-ifneq ($(filter mips%, $(NDK_ABI)),)
- ifneq ($(findstring 64, $(NDK_ABI)),)
- OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=64
- else
- OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=32 -D__MIPSEL__
- endif
-endif
-
-lib/libcrypto.a:
- cd openssl && \
- ./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
- make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
- make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
-
-lib/libssl.a:
- cp config.sub openssl
- cp config.guess openssl
- cd openssl && \
- ./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
- make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
- make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
-
-openssl-build-stamp: lib/libcrypto.a lib/libssl.a
- touch openssl-build-stamp
-
-openssl: openssl-build-stamp
- test -d lib || mkdir lib
- test -d include || mkdir include
- test -d include/openssl || mkdir include/openssl
- cp openssl/libcrypto.a lib/libcrypto.a
- cp openssl/libssl.a lib/libssl.a
- cp openssl/include/openssl/* include/openssl
-
-openssl-clean:
- -rm openssl-build-stamp
- -rm lib/libcrypto.a
- -rm lib/libssl.a
- -cd openssl && \
- git clean -fdx
-
-#------------------------------------------------------------------------------#
-# libevent
-
-libevent/Makefile:
- sed -i 's@\(SUBDIRS = . include\) sample test@\1@' libevent/Makefile.am
- cp libevent-patch-1 libevent
- -cd libevent && \
- patch -N -p1 --reject-file=- < libevent-patch-1
- ##sed -i 's@\(AC_OUTPUT(Makefile include/Makefile\) test/Makefile sample/Makefile)@\1)@' libevent/configure.in
- cd libevent && ./autogen.sh
- cp config.sub libevent
- cp config.guess libevent
- cd libevent && \
- CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
- ./configure \
- --host=$(HOST) \
- --disable-shared
-
-libevent-build-stamp: libevent/Makefile
- $(MAKE) -C libevent ./include/event2/event-config.h all-am
- touch libevent-build-stamp
-
-libevent: openssl libevent-build-stamp
- test -d lib || mkdir lib
- test -d include || mkdir include
- cp libevent/.libs/libevent.a lib
- cp -R libevent/include/event2 include
-
-libevent-clean:
- -rm -f include/event2
- -rm -f lib/libevent.a
- -rm -f libevent-build-stamp
- -cd libevent && \
- git clean -fdx
-#------------------------------------------------------------------------------#
-# lzma
-
-xz/Makefile:
- cd xz && ./autogen.sh
- cp config.sub xz
- cp config.guess xz
- cd xz && \
- CC="$(CC)" CXX="$(CXX)" PKG_CONFIG_PATH="$(EXTERNAL_ROOT)/lib/pkgconfig" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS) -std=c99" LDFLAGS="$(LDFLAGS)" \
- ./configure --host=$(HOST) --disable-shared --enable-static --disable-doc --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --prefix=$(EXTERNAL_ROOT)
-
-lzma: lzma-build-stamp
- $(MAKE) -C xz install
-
-lzma-build-stamp: xz/Makefile
- touch lzma-build-stamp
-
-lzma-clean:
- -rm -rf include/lzma
- -rm -f include/lzma.h
- -rm -f lib/liblzma.a
- -rm -f lib/liblzma.la
- -rm -f lzma-build-stamp
- -cd xz && \
- git clean -fdx
-#------------------------------------------------------------------------------#
-# zstd
-
-zstd: zstd-build-stamp
- $(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.a-mt
- $(MAKE) -C zstd/lib CC="$(CC)" CXX="$(CXX)" AR="$(AR)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" PREFIX="$(EXTERNAL_ROOT)" libzstd.pc
- test -d lib || mkdir lib
- test -d lib/pkgconfig || mkdir lib/pkgconfig
- test -d include || mkdir include
- cp zstd/lib/libzstd.a lib
- cp zstd/lib/libzstd.pc lib/pkgconfig
- cp zstd/lib/zstd.h include
- cp zstd/lib/common/zstd_errors.h include
- cp zstd/lib/deprecated/zbuff.h include
- cp zstd/lib/dictBuilder/zdict.h include
-
-zstd-build-stamp:
- touch zstd-build-stamp
-
-zstd-clean:
- -rm -f include/zstd.h include/zstd_errors.h include/zbuff.h include/zdict.h
- -rm -f lib/libzstd.a
- -rm -f lib/pkgconfig/libzstd.pc
- -rm -f zstd-build-stamp
- -cd zstd && \
- git clean -fdx
-#------------------------------------------------------------------------------#
-# tor
-
-tor/configure:
- cd tor && \
- ./autogen.sh
-
-tor/Makefile: tor/configure
-# cp 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch tor
-# cd tor && \
-# git apply 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch
-# cp fix_android_0.2.6.4rc_build.patch tor
-# cd tor && \
-# git apply fix_android_0.2.6.4rc_build.patch
- cp config.sub tor
- cp config.guess tor
- cd tor && \
- CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \
- LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \
- ./configure \
- --host=$(HOST) \
- --disable-asciidoc \
- --enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \
- --enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \
- --disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check --disable-systemd
-
-tor-build-stamp: tor/Makefile
- $(MAKE) -C tor all-am
- touch tor-build-stamp
-
-tor: lzma zstd libevent openssl tor-build-stamp
- test -d bin || mkdir bin
- cp tor/src/or/tor bin
-
-tor-clean:
- -rm -f bin/tor
- -rm -f tor-build-stamp
- -cd tor && \
- git clean -fdx
- -cd tor && \
- git reset HEAD --hard
-
-#------------------------------------------------------------------------------#
-# polipo
-
-polipo-build-stamp:
- CC="$(CC)" CFLAGS="$(PIEFLAGS)" LDFLAGS="$(PIEFLAGS)" $(MAKE) -C polipo
- touch polipo-build-stamp
-
-polipo: polipo-build-stamp
- test -d bin || mkdir bin
- cp polipo/polipo bin
-
-polipo-clean:
- $(MAKE) -C polipo clean
- -rm -f polipo/polipo
- -rm -f bin/polipo
- -rm -f polipo-build-stamp
-
-#------------------------------------------------------------------------------#
-# PLUTO Pluggable Transports
-
-pluto/bin/android_arm/obfs4proxy:
-#don't build for now until we sort out Go SDK
-# cd pluto && \
-# ./build.sh
-
-pluto-build-stamp: pluto/bin/android_arm/obfs4proxy
- touch pluto-build-stamp
-
-pluto: pluto-build-stamp
- test -d bin || mkdir bin
- cp pluto/bin/android_arm/obfs4proxy bin
-
-pluto-clean:
-# -rm -rf pluto/bin
-
-#------------------------------------------------------------------------------#
-#create and clean assets: FYI - tor is stored as a ZIP file with an mp3 extension
-#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 polipo pluto
- install -d ../orbotservice/src/main/assets/$(APP_ABI)
- -$(STRIP) bin/polipo
- -zip ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3 bin/polipo
- -$(STRIP) bin/tor
- -zip ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3 bin/tor
- -$(STRIP) bin/obfs4proxy
- -zip ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 bin/obfs4proxy
- -$(STRIP) ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd
- -zip ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3 ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd
- -rm ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd
-
-assets-clean:
- -rm ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3
- -rm ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3
- -rm ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3
- -rm ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3
-
-
-#------------------------------------------------------------------------------#
-# cleanup, cleanup, put the toys away
-
-##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean
-clean: openssl-clean libevent-clean lzma-clean zstd-clean tor-clean polipo-clean pluto-clean
-
-#------------------------------------------------------------------------------#
-# debugging stuff
-
-showsetup:
- @echo "NDK_TOOLCHAIN_VERSION: $(NDK_TOOLCHAIN_VERSION)"
- @echo "NDK_TOOLCHAIN: $(NDK_TOOLCHAIN)"
- @echo "NDK_PLATFORM_LEVEL: $(NDK_PLATFORM_LEVEL)"
- @echo "NDK_SYSROOT: $(NDK_SYSROOT)"
- @echo "APP_ABI: $(APP_ABI)"
- @echo "HOST: $(HOST)"
- @echo "CC: $(CC)"
- @echo "LD: $(LD)"
- @echo "CFLAGS: $(CFLAGS)"
- @echo "LDFLAGS: $(LDFLAGS)"
diff --git a/external/config.guess b/external/config.guess
deleted file mode 100644
index d622a44e..00000000
--- a/external/config.guess
+++ /dev/null
@@ -1,1530 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-02-10'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches(a)gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues…
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches(a)gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi(a)noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
- *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
-EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
- then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
- HP_ARCH="hppa64"
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
- ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
- exit ;;
- 3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
- exit ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- *:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit ;;
- sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- *:GNU:*:*)
- # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
- # sysname and nodename.
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit ;;
- i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
- exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel(a)ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes(a)openmarket.com>.
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit ;;
- *:*:*:FTX*)
- # From seanf(a)swdc.stratus.com.
- echo i860-stratus-sysv4
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green(a)stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
- exit ;;
- *:VOS:*:*)
- # From Paul.Green(a)stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
- x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
- exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues…
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;…
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches(a)gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/external/config.sub b/external/config.sub
deleted file mode 100644
index c894da45..00000000
--- a/external/config.sub
+++ /dev/null
@@ -1,1773 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-02-10'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches(a)gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;…
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches(a)gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
- os=
- basic_machine=$1
- ;;
- -bluegene*)
- os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
- -psos*)
- os=-psos
- ;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nios | nios2 \
- | ns16k | ns32k \
- | open8 \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
- ms1)
- basic_machine=mt-unknown
- ;;
-
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
- ;;
- xgate)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- xscaleeb)
- basic_machine=armeb-unknown
- ;;
-
- xscaleel)
- basic_machine=armel-unknown
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
- | tron-* \
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
- ;;
- decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- microblaze)
- basic_machine=microblaze-xilinx
- ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
- basic_machine=i386-pc
- os=-msys
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- nacl)
- basic_machine=le32-unknown
- os=-nacl
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
- strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
- ;;
- t90)
- basic_machine=t90-cray
- os=-unicos
- ;;
- tile*)
- basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
- ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- mmix)
- basic_machine=mmix-knuth
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
- ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -svr4*)
- os=-sysv4
- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto-qnx*)
- ;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
- ;;
- -os400*)
- os=-os400
- ;;
- -wince*)
- os=-wince
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -atheos*)
- os=-atheos
- ;;
- -syllable*)
- os=-syllable
- ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- -nova*)
- os=-rtmk-nova
- ;;
- -ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -tpf*)
- os=-tpf
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
- -aros*)
- os=-aros
- ;;
- -kaos*)
- os=-kaos
- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
- -nacl*)
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
- os=-elf
- ;;
- spu-*)
- os=-elf
- ;;
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-rebel)
- os=-linux
- ;;
- arm*-semi)
- os=-aout
- ;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- tic54x-*)
- os=-coff
- ;;
- tic55x-*)
- os=-coff
- ;;
- tic6x-*)
- os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
- pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- ;;
- m68*-cisco)
- os=-aout
- ;;
- mep-*)
- os=-elf
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
- or32-*)
- os=-coff
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-be)
- os=-beos
- ;;
- *-haiku)
- os=-haiku
- ;;
- *-ibm)
- os=-aix
- ;;
- *-knuth)
- os=-mmixware
- ;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigaos
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-next )
- os=-nextstep
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
- *-gould)
- os=-sysv
- ;;
- *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
- *-sgi)
- os=-irix
- ;;
- *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
- *)
- os=-none
- ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
- vendor=be
- ;;
- -hpux*)
- vendor=hp
- ;;
- -mpeix*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -os400*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -tpf*)
- vendor=ibm
- ;;
- -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
- -vos*)
- vendor=stratus
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/external/fix_android_0.2.6.4rc_build.patch b/external/fix_android_0.2.6.4rc_build.patch
deleted file mode 100644
index b7cb1cd3..00000000
--- a/external/fix_android_0.2.6.4rc_build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From ed6a98b39661a204eb0186267bf406469b4e51ba Mon Sep 17 00:00:00 2001
-From: n8fr8 <nathan(a)freitas.net>
-Date: Wed, 18 Mar 2015 17:07:49 -0400
-Subject: [PATCH 1/2] disable setting of MONOTONIC time on Android (it doesn't
- work)
-
----
- src/common/compat_pthreads.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
-index f4a6cad..ccacef1 100644
---- a/src/common/compat_pthreads.c
-+++ b/src/common/compat_pthreads.c
-@@ -181,6 +181,7 @@ tor_cond_init(tor_cond_t *cond)
- return -1;
- }
-
-+#ifndef __ANDROID_API__
- #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
- /* Use monotonic time so when we timedwait() on it, any clock adjustment
- * won't affect the timeout value. */
-@@ -188,6 +189,7 @@ tor_cond_init(tor_cond_t *cond)
- return -1;
- }
- #endif
-+#endif
- if (pthread_cond_init(&cond->cond, &condattr)) {
- return -1;
- }
---
-1.9.1
-
-
-From 4257a9f1fbbc05413077b7b70215622099f667df Mon Sep 17 00:00:00 2001
-From: n8fr8 <nathan(a)freitas.net>
-Date: Wed, 18 Mar 2015 17:08:14 -0400
-Subject: [PATCH 2/2] you must explicitly include limits.h on Android
-
----
- src/ext/trunnel/trunnel.c | 1 +
- src/trunnel/trunnel-local.h | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
-index 7353237..1d4403c 100644
---- a/src/ext/trunnel/trunnel.c
-+++ b/src/ext/trunnel/trunnel.c
-@@ -13,6 +13,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "trunnel-impl.h"
-+#include "limits.h"
-
- #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
- __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
-index b7c2ab9..e55cf3c 100644
---- a/src/trunnel/trunnel-local.h
-+++ b/src/trunnel/trunnel-local.h
-@@ -5,6 +5,7 @@
- #include "util.h"
- #include "compat.h"
- #include "crypto.h"
-+#include "limits.h"
-
- #define trunnel_malloc tor_malloc
- #define trunnel_calloc tor_calloc
-@@ -15,4 +16,5 @@
- #define trunnel_assert tor_assert
- #define trunnel_memwipe(mem, len) memwipe((mem), 0, (len))
-
-+
- #endif
---
-1.9.1
-
diff --git a/external/libevent b/external/libevent
deleted file mode 160000
index c51b159c..00000000
--- a/external/libevent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c51b159cff9f5e86696f5b9a4c6f517276056258
diff --git a/external/libevent-patch-1 b/external/libevent-patch-1
deleted file mode 100644
index babcf9e5..00000000
--- a/external/libevent-patch-1
+++ /dev/null
@@ -1,29 +0,0 @@
-For some reason arc4random_addrandom isn't present in 64-bit android archs. !
-
-diff --git a/configure.ac b/configure.ac
-index d42edd8..c511be7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -290,7 +290,7 @@ AC_HEADER_TIME
-
- dnl Checks for library functions.
- AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
--AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
-+AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf arc4random_addrandom issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
- AC_CHECK_FUNCS([umask])
-
- AC_CACHE_CHECK(
-diff --git a/evutil_rand.c b/evutil_rand.c
-index 284341c..97161e4 100644
---- a/evutil_rand.c
-+++ b/evutil_rand.c
-@@ -174,7 +174,9 @@ evutil_secure_rng_get_bytes(void *buf, size_t n)
- void
- evutil_secure_rng_add_bytes(const char *buf, size_t n)
- {
-+#ifdef _EVENT_HAVE_ARC4RANDOM_ADDRANDOM
- arc4random_addrandom((unsigned char*)buf,
- n>(size_t)INT_MAX ? INT_MAX : (int)n);
-+#endif
- }
-
diff --git a/external/openssl b/external/openssl
deleted file mode 160000
index 081314d0..00000000
--- a/external/openssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 081314d07705aa58912845c213a48414d8f616a9
diff --git a/external/patches/UDP-block.patch b/external/patches/UDP-block.patch
deleted file mode 100644
index e16a9574..00000000
--- a/external/patches/UDP-block.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From c2620d6939713762e30badc3ed5da981e296b742 Mon Sep 17 00:00:00 2001
-From: patch <patrickbx(a)gmail.com>
-Date: Mon, 23 Jul 2012 16:12:55 -0400
-Subject: [PATCH] Modified iptables rules for transproxying. UDP is now
- blocked. Also removed some redundant rules and reordered
- others. I reordered by the idea that its generally easier
- to specifically allow traffic before your reject it.
-
----
- .../torproject/android/service/TorTransProxy.java | 133 ++++++++++----------
- 1 file changed, 64 insertions(+), 69 deletions(-)
-
-diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java
-index 2571123..c248a9f 100644
---- a/src/org/torproject/android/service/TorTransProxy.java
-+++ b/src/org/torproject/android/service/TorTransProxy.java
-@@ -224,6 +224,15 @@ public class TorTransProxy implements TorServiceConstants {
-
- int torUid = context.getApplicationInfo().uid;
-
-+ // Allow everything for Tor
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
- //build up array of shell cmds to execute under one root context
- for (TorifiedApp tApp:apps)
- {
-@@ -235,9 +244,9 @@ public class TorTransProxy implements TorServiceConstants {
- {
-
- TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")");
--
-- // Set up port redirection
-- script.append(ipTablesPath);
-+
-+ // Set up port redirection
-+ script.append(ipTablesPath);
- script.append(" -t nat");
- script.append(" -A OUTPUT -p tcp");
- script.append(" ! -d 127.0.0.1"); //allow access to localhost
-@@ -251,14 +260,28 @@ public class TorTransProxy implements TorServiceConstants {
- // Same for DNS
- script.append(ipTablesPath);
- script.append(" -t nat");
-- script.append(" -A OUTPUT -p udp -m owner --uid-owner ");
-+ script.append(" -A OUTPUT -p udp");
-+ script.append(" -m owner --uid-owner ");
- script.append(tApp.getUid());
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
- script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_DNS_PORT);
- script.append(" || exit\n");
--
-+
-+ // Allow loopback
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(tApp.getUid());
-+ script.append(" -o lo");
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
-+ /*
-+ //Outgoing loopback already allowed (23/7/12)
-+
- int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP};
-
- for (int port : ports)
-@@ -276,53 +299,32 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" -j ACCEPT");
- script.append(" || exit\n");
- }
--
-- // Allow loopback
-+ */
-+
-+ // Reject all other outbound TCP packets
- script.append(ipTablesPath);
- script.append(" -t filter");
- script.append(" -A OUTPUT");
- script.append(" -m owner --uid-owner ");
- script.append(tApp.getUid());
- script.append(" -p tcp");
-- script.append(" -o lo");
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
-- // Reject DNS that is not from Tor (order is important - first matched rule counts!)
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(tApp.getUid());
-- script.append(" -p udp");
-- script.append(" --dport ");
-- script.append(STANDARD_DNS_PORT);
- script.append(" -j REJECT");
- script.append(" || exit\n");
--
-- // Reject all other outbound TCP packets
-+
-+ // Reject all other outbound UDP packets
- script.append(ipTablesPath);
- script.append(" -t filter");
- script.append(" -A OUTPUT");
- script.append(" -m owner --uid-owner ");
- script.append(tApp.getUid());
-- script.append(" -p tcp");
-+ script.append(" -p udp");
- script.append(" -j REJECT");
- script.append(" || exit\n");
-+
-
- }
- }
--
-
-- // Allow everything for Tor
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(torUid);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
- String[] cmdAdd = {script.toString()};
-
- code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
-@@ -450,8 +452,8 @@ public class TorTransProxy implements TorServiceConstants {
-
- int torUid = context.getApplicationInfo().uid;
-
-- // Set up port redirection
-- script.append(ipTablesPath);
-+ // Set up port redirection
-+ script.append(ipTablesPath);
- script.append(" -t nat");
- script.append(" -A OUTPUT -p tcp");
- script.append(" ! -d 127.0.0.1"); //allow access to localhost
-@@ -465,14 +467,36 @@ public class TorTransProxy implements TorServiceConstants {
- // Same for DNS
- script.append(ipTablesPath);
- script.append(" -t nat");
-- script.append(" -A OUTPUT -p udp -m owner ! --uid-owner ");
-+ script.append(" -A OUTPUT -p udp");
-+ script.appent(" -m owner ! --uid-owner ");
- script.append(torUid);
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
- script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_DNS_PORT);
- script.append(" || exit\n");
-+
-+ // Allow loopback
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -o lo");
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-
-+ // Allow everything for Tor
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
-+
-+ /*
-+ //Outgoing loopback already allowed (23/7/12)
-+
- int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP};
-
- for (int port : ports)
-@@ -490,25 +514,8 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" -j ACCEPT");
- script.append(" || exit\n");
-
-- }
--
-- // Allow loopback
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -p tcp");
-- script.append(" -o lo");
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
-+ } */
-
-- // Allow everything for Tor
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(torUid);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
-
- if (TorService.ENABLE_DEBUG_LOG)
- {
-@@ -532,23 +539,11 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" --log-uid");
- script.append(" || exit\n");
- }
--
-- // Reject DNS that is not from Tor (order is important - first matched rule counts!)
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -p udp");
-- script.append(" --dport ");
-- script.append(STANDARD_DNS_PORT);
-- script.append(" -j REJECT");
-- script.append(" || exit\n");
--
-- // Reject all other outbound TCP packets
-+
-+ // Reject all other outbound packets by default
- script.append(ipTablesPath);
- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -p tcp");
-- script.append(" -j REJECT");
-+ script.append(" -P OUTPUT DROP");
- script.append(" || exit\n");
-
- String[] cmdAdd = {script.toString()};
---
-1.7.9.5
-
diff --git a/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4 b/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4
deleted file mode 100644
index 002bdb96..00000000
--- a/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-_______________________________________________
-Guardian-dev mailing list
-
-Post: Guardian-dev(a)lists.mayfirst.org
-List info: https://lists.mayfirst.org/mailman/listinfo/guardian-dev
-
-To Unsubscribe
- Send email to: Guardian-dev-unsubscribe(a)lists.mayfirst.org
- Or visit: https://lists.mayfirst.org/mailman/options/guardian-dev/nathan%40guardianpr…
-
-You are subscribed as: nathan(a)guardianproject.info
diff --git a/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch b/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch
deleted file mode 100644
index 60635b48..00000000
--- a/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-Index: src/org/torproject/android/service/TorService.java
-===================================================================
---- src/org/torproject/android/service/TorService.java (revision 24697)
-+++ src/org/torproject/android/service/TorService.java (working copy)
-@@ -710,10 +710,36 @@
-
- if (enableTransparentProxy)
- {
-- showAlert("Status", "Setting up transparent proxying...");
--
-- //TorTransProxy.setDNSProxying();
-- int code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll);
-+ //TODO: Find a nice place for the next (commented) line
-+ //TorTransProxy.setDNSProxying();
-+
-+ int code = 0; // Default state is "okay"
-+
-+ if(transProxyPortFallback)
-+ {
-+ showAlert("Status", "Setting up port-based transparent proxying...");
-+ StringTokenizer st = new StringTokenizer(portProxyList, ",");
-+ int status = code;
-+ while (st.hasMoreTokens())
-+ {
-+ status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken()));
-+ if(status != 0)
-+ code = status;
-+ }
-+ }
-+ else
-+ {
-+ if(transProxyAll)
-+ {
-+ showAlert("Status", "Setting up full transparent proxying...");
-+ code = TorTransProxy.setTransparentProxyingAll(this);
-+ }
-+ else
-+ {
-+ showAlert("Status", "Setting up app-based transparent proxying...");
-+ code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll);
-+ }
-+ }
-
- TorService.logMessage ("TorTransProxy resp code: " + code);
-
-@@ -725,17 +751,7 @@
- {
- showAlert("Status", "WARNING: error starting transparent proxying!");
- }
--
-- //this is for Androids w/o owner module support as a circumvention only fallback
-- if (transProxyPortFallback)
-- {
-- StringTokenizer st = new StringTokenizer(portProxyList, ",");
--
-- while (st.hasMoreTokens())
-- TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken()));
--
-- }
--
-+
- return true;
-
- }
-Index: src/org/torproject/android/service/TorTransProxy.java
-===================================================================
---- src/org/torproject/android/service/TorTransProxy.java (revision 24697)
-+++ src/org/torproject/android/service/TorTransProxy.java (working copy)
-@@ -136,8 +136,6 @@
- //redirectDNSResolvConf(); //not working yet
-
- String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
--
-- boolean ipTablesOld = false;
-
- StringBuilder script = new StringBuilder();
-
-@@ -145,14 +143,12 @@
- int code = -1;
-
- purgeIptables(context);
--
-- script = new StringBuilder();
--
-+
- //build up array of shell cmds to execute under one root context
- for (int i = 0; i < apps.length; i++)
- {
-
-- if (forceAll || apps[i].isTorified()) //if "Tor Everything" on or app is set to true
-+ if (apps[i].isTorified()) //if app is set to true
- {
-
- if (apps[i].getUsername().equals(TorServiceConstants.TOR_APP_USERNAME))
-@@ -170,14 +166,8 @@
- script.append(" -m owner --uid-owner ");
- script.append(apps[i].getUid());
- script.append(" -m tcp --syn");
--
-- if (ipTablesOld)
-- script.append(" -j DNAT --to 127.0.0.1:");
-- else
-- script.append(" -j REDIRECT --to-ports ");
--
-+ script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_TRANSPROXY_PORT);
--
- script.append(" || exit\n");
-
- //DNS
-@@ -187,57 +177,37 @@
- script.append(apps[i].getUid());
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REDIRECT --to-ports ");
-+ script.append(TOR_DNS_PORT);
-+ script.append(" || exit\n");
-
-- if (ipTablesOld)
-- script.append(" -j DNAT --to 127.0.0.1:");
-- else
-- script.append(" -j REDIRECT --to-ports ");
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT -p tcp");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(apps[i].getUid());
-+ script.append(" -m tcp --dport ");
-+ script.append(TOR_TRANSPROXY_PORT);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT -p udp");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(apps[i].getUid());
-+ script.append(" -m udp --dport ");
- script.append(TOR_DNS_PORT);
--
-+ script.append(" -j ACCEPT");
- script.append(" || exit\n");
-+
-+ script.append(ipTablesPath);
-+ script.append(" -t filter -A OUTPUT -m owner --uid-owner ");
-+ script.append(apps[i].getUid());
-+ script.append(" -j DROP"); //drop all other packets as Tor won't handle them
-+ script.append(" || exit\n");
-
-
-- if (ipTablesOld) //for some reason this doesn't work on iptables 1.3.7
-- {
-- script.append(ipTablesPath);
-- script.append(" -t nat");
-- script.append(" -A OUTPUT -m owner --uid-owner ");
-- script.append(apps[i].getUid());
-- script.append(" -j DROP");
-- script.append(" || exit\n");
-- }
-- else
-- {
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT -p tcp");
-- script.append(" -m owner --uid-owner ");
-- script.append(apps[i].getUid());
-- script.append(" -m tcp --dport ");
-- script.append(TOR_TRANSPROXY_PORT);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT -p udp");
-- script.append(" -m owner --uid-owner ");
-- script.append(apps[i].getUid());
-- script.append(" -m udp --dport ");
-- script.append(TOR_DNS_PORT);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
-- script.append(ipTablesPath);
-- script.append(" -t filter -A OUTPUT -m owner --uid-owner ");
-- script.append(apps[i].getUid());
-- script.append(" -j DROP"); //drop all other packets as Tor won't handle them
-- script.append(" || exit\n");
--
-- }
--
--
- }
- }
-
-@@ -260,20 +230,13 @@
-
- //String baseDir = context.getDir("bin",0).getAbsolutePath() + '/';
- String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
--
-- boolean ipTablesOld = false;
-
- StringBuilder script = new StringBuilder();
-
- StringBuilder res = new StringBuilder();
- int code = -1;
--
-- String[] cmdFlush = {script.toString()};
-- code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true);
-- //String msg = res.toString(); //get stdout from command
-+ purgeIptables(context);
-
-- script = new StringBuilder();
--
- //TCP
- //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe
-
-@@ -283,14 +246,8 @@
- script.append(" --dport ");
- script.append(port);
- //script.append(" -m tcp --syn");
--
-- if (ipTablesOld)
-- script.append(" -j DNAT --to 127.0.0.1:");
-- else
-- script.append(" -j REDIRECT --to-ports ");
--
-+ script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_TRANSPROXY_PORT);
--
- script.append(" || exit\n");
-
- script.append(ipTablesPath);
-@@ -298,14 +255,8 @@
- script.append(" -A OUTPUT -p udp");
- script.append(" --dport ");
- script.append(port);
--
-- if (ipTablesOld)
-- script.append(" -j DNAT --to 127.0.0.1:");
-- else
-- script.append(" -j REDIRECT --to-ports ");
--
-+ script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_TRANSPROXY_PORT);
--
- script.append(" || exit\n");
-
- //DNS
-@@ -314,24 +265,134 @@
- script.append(" -A OUTPUT -p udp ");
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REDIRECT --to-ports ");
-+ script.append(TOR_DNS_PORT);
-+ script.append(" || exit\n");
-
-- if (ipTablesOld)
-- script.append(" -j DNAT --to 127.0.0.1:");
-- else
-- script.append(" -j REDIRECT --to-ports ");
-+
-+ String[] cmdAdd = {script.toString()};
-+ code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true);
-+ String msg = res.toString();
-+ TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
-
-+ return code;
-+ }
-+
-+ public static int setTransparentProxyingAll(Context context) throws Exception {
-+ boolean runRoot = true;
-+ boolean waitFor = true;
-+
-+ //android.os.Debug.waitForDebugger();
-+
-+ //redirectDNSResolvConf(); //not working yet
-+
-+ String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
-+
-+ StringBuilder script = new StringBuilder();
-+
-+ StringBuilder res = new StringBuilder();
-+ int code = -1;
-+
-+ purgeIptables(context);
-+
-+ int torUid = context.getApplicationInfo().uid;
-+
-+ // Set up port redirection
-+ script.append(ipTablesPath);
-+ script.append(" -t nat");
-+ script.append(" -A OUTPUT -p tcp");
-+ script.append(" -m owner ! --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -m tcp --syn");
-+ script.append(" -j REDIRECT --to-ports ");
-+ script.append(TOR_TRANSPROXY_PORT);
-+ script.append(" || exit\n");
-+
-+ // Same for DNS
-+ script.append(ipTablesPath);
-+ script.append(" -t nat");
-+ script.append(" -A OUTPUT -p udp -m owner ! --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -m udp --dport ");
-+ script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_DNS_PORT);
-+ script.append(" || exit\n");
-
-+ // Allow packets to localhost (contains all the port-redirected ones)
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -d 127.0.0.1");
-+ script.append(" -j ACCEPT");
- script.append(" || exit\n");
-
-+ // Allow loopback
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -o lo");
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
-+ // Allow everything for Tor
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
-+ //XXX: Comment the following rules for non-debug builds
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p udp");
-+ script.append(" --dport ");
-+ script.append(STANDARD_DNS_PORT);
-+ script.append(" -j LOG");
-+ script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'");
-+ script.append(" --log-uid");
-+ script.append(" || exit\n");
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -j LOG");
-+ script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'");
-+ script.append(" --log-uid");
-+ script.append(" || exit\n");
-+
-+
-+ // Reject DNS that is not from Tor (order is important - first matched rule counts!)
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p udp");
-+ script.append(" --dport ");
-+ script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REJECT");
-+ script.append(" || exit\n");
-+
-+ // Reject all other outbound TCP packets
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -j REJECT");
-+ script.append(" || exit\n");
-+
-+ String[] cmdAdd = {script.toString()};
-
-- String[] cmdAdd = {script.toString()};
-- code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true);
-+ code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
- String msg = res.toString();
- TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
-
-- return code;
-- }
-+ return code;
-+ }
-
-
- }
diff --git a/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report b/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report
deleted file mode 100644
index 8f61a1f7..00000000
--- a/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report
+++ /dev/null
@@ -1,110 +0,0 @@
-<4>[ 115.319671] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=9997 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035
-<4>[ 115.482788] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9998 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035
-<4>[ 116.037658] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9999 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035
-<4>[ 116.699127] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10000 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10035 GID=10035
-<4>[ 116.724517] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10001 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 UID=10035 GID=10035
-<4>[ 116.922515] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10002 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 117.330810] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10003 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 118.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10004 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 118.903320] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10005 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 119.310729] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10006 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 120.130737] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10007 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 121.770690] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10008 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 122.695465] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10009 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 123.100708] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10010 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 123.920684] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10011 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 125.565673] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10012 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 128.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10013 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 130.366333] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10014 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 130.785339] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10015 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 131.600799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10016 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 132.835144] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50247 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 133.240753] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10017 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 133.410705] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50248 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 133.443481] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50249 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 134.031341] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50250 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 134.782196] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50251 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 135.360778] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50252 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 136.520782] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10018 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 136.526306] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50253 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 137.334716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50254 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 137.915832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50255 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 139.075378] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50256 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 140.435913] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10019 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 140.850799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10020 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 141.395019] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50257 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 141.675140] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10021 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 142.455352] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50258 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 143.030792] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50259 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 143.310852] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10022 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 144.190734] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50260 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 146.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50261 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 146.590789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10023 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 151.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50262 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 151.166290] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10024 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 151.570739] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10025 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 152.390686] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10026 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 152.694427] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50263 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 153.270721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50264 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 154.030731] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10027 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 154.430694] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50265 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 156.750701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50266 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 157.310699] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10028 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 160.383117] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10029 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 160.790832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10030 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 161.390716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50267 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 161.610717] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10031 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 163.250701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10032 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 166.531494] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10033 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 170.670715] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50268 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 170.842285] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10034 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 171.250732] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10035 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 172.070800] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10036 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 173.309783] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50269 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 173.710784] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10037 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 173.880828] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50270 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 175.040710] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50271 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 176.990692] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10038 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 177.360687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50272 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 181.682952] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10039 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 182.000701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50273 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 182.090698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10040 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 182.910797] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10041 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 184.550689] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10042 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 187.830749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10043 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 191.280700] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50274 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 193.917053] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10044 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 194.330749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10045 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 195.150695] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10046 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 196.790679] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10047 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 200.070709] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10048 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 201.567718] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10049 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 201.970703] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10050 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 202.790771] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10051 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 204.430816] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10052 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 207.710693] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10053 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 209.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50275 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 212.362884] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10054 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 212.770812] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10055 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 213.590698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10056 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 215.235809] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10057 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 217.285766] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50276 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 217.860687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50277 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 218.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10058 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 219.020721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50278 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 220.840667] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0
-<4>[ 220.842559] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0
-<4>[ 220.844512] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0
-<4>[ 221.340820] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50279 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 221.478881] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10059 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 221.890777] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10060 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 221.898010] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0
-<4>[ 222.710754] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10061 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 224.350677] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10062 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 225.617523] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0
-<4>[ 225.980743] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50280 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053
-<4>[ 227.630798] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10063 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0
-<4>[ 241.522155] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=20341 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0
-<4>[ 241.792358] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0
-<4>[ 242.362335] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0
-<4>[ 243.452331] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0
diff --git a/external/patches/transproxy.patch b/external/patches/transproxy.patch
deleted file mode 100644
index e69de29b..00000000
diff --git a/external/patches/udptransproxyfinal.patch b/external/patches/udptransproxyfinal.patch
deleted file mode 100644
index 32cc0e2f..00000000
--- a/external/patches/udptransproxyfinal.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From a81741afe06ac2309b4306dedbd5a0ebf755b7e1 Mon Sep 17 00:00:00 2001
-From: patch <patrickbx(a)gmail.com>
-Date: Fri, 31 Aug 2012 17:25:52 -0400
-Subject: [PATCH] Addendum to the last commit on UDP transproxy rules. Trying
- to simplfy the iptables rules didn't work out so this is a
- minimal change from the original TorTransProxy.java file.
- UDP is blocked and tested as working.
-
----
- .../torproject/android/service/TorTransProxy.java | 144 ++++++++++++--------
- 1 file changed, 84 insertions(+), 60 deletions(-)
-
-diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java
-index c248a9f..90bdc34 100644
---- a/src/org/torproject/android/service/TorTransProxy.java
-+++ b/src/org/torproject/android/service/TorTransProxy.java
-@@ -224,15 +224,6 @@ public class TorTransProxy implements TorServiceConstants {
-
- int torUid = context.getApplicationInfo().uid;
-
-- // Allow everything for Tor
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(torUid);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
- //build up array of shell cmds to execute under one root context
- for (TorifiedApp tApp:apps)
- {
-@@ -244,9 +235,9 @@ public class TorTransProxy implements TorServiceConstants {
- {
-
- TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")");
--
-- // Set up port redirection
-- script.append(ipTablesPath);
-+
-+ // Set up port redirection
-+ script.append(ipTablesPath);
- script.append(" -t nat");
- script.append(" -A OUTPUT -p tcp");
- script.append(" ! -d 127.0.0.1"); //allow access to localhost
-@@ -260,28 +251,14 @@ public class TorTransProxy implements TorServiceConstants {
- // Same for DNS
- script.append(ipTablesPath);
- script.append(" -t nat");
-- script.append(" -A OUTPUT -p udp");
-- script.append(" -m owner --uid-owner ");
-+ script.append(" -A OUTPUT -p udp -m owner --uid-owner ");
- script.append(tApp.getUid());
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
- script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_DNS_PORT);
- script.append(" || exit\n");
--
-- // Allow loopback
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(tApp.getUid());
-- script.append(" -o lo");
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
-- /*
-- //Outgoing loopback already allowed (23/7/12)
--
-+
- int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP};
-
- for (int port : ports)
-@@ -299,8 +276,30 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" -j ACCEPT");
- script.append(" || exit\n");
- }
-- */
--
-+
-+ // Allow loopback
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(tApp.getUid());
-+ script.append(" -p tcp");
-+ script.append(" -o lo");
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
-+ // Reject DNS that is not from Tor (order is important - first matched rule counts!)
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(tApp.getUid());
-+ script.append(" -p udp");
-+ script.append(" --dport ");
-+ script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REJECT");
-+ script.append(" || exit\n");
-+
- // Reject all other outbound TCP packets
- script.append(ipTablesPath);
- script.append(" -t filter");
-@@ -321,10 +320,19 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" -j REJECT");
- script.append(" || exit\n");
-
--
- }
- }
-+
-
-+ // Allow everything for Tor
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-+
- String[] cmdAdd = {script.toString()};
-
- code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
-@@ -452,8 +460,8 @@ public class TorTransProxy implements TorServiceConstants {
-
- int torUid = context.getApplicationInfo().uid;
-
-- // Set up port redirection
-- script.append(ipTablesPath);
-+ // Set up port redirection
-+ script.append(ipTablesPath);
- script.append(" -t nat");
- script.append(" -A OUTPUT -p tcp");
- script.append(" ! -d 127.0.0.1"); //allow access to localhost
-@@ -467,36 +475,14 @@ public class TorTransProxy implements TorServiceConstants {
- // Same for DNS
- script.append(ipTablesPath);
- script.append(" -t nat");
-- script.append(" -A OUTPUT -p udp");
-- script.appent(" -m owner ! --uid-owner ");
-+ script.append(" -A OUTPUT -p udp -m owner ! --uid-owner ");
- script.append(torUid);
- script.append(" -m udp --dport ");
- script.append(STANDARD_DNS_PORT);
- script.append(" -j REDIRECT --to-ports ");
- script.append(TOR_DNS_PORT);
- script.append(" || exit\n");
--
-- // Allow loopback
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -o lo");
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
-
-- // Allow everything for Tor
-- script.append(ipTablesPath);
-- script.append(" -t filter");
-- script.append(" -A OUTPUT");
-- script.append(" -m owner --uid-owner ");
-- script.append(torUid);
-- script.append(" -j ACCEPT");
-- script.append(" || exit\n");
--
--
-- /*
-- //Outgoing loopback already allowed (23/7/12)
--
- int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP};
-
- for (int port : ports)
-@@ -514,8 +500,25 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" -j ACCEPT");
- script.append(" || exit\n");
-
-- } */
-+ }
-+
-+ // Allow loopback
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -o lo");
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-
-+ // Allow everything for Tor
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -m owner --uid-owner ");
-+ script.append(torUid);
-+ script.append(" -j ACCEPT");
-+ script.append(" || exit\n");
-
- if (TorService.ENABLE_DEBUG_LOG)
- {
-@@ -539,13 +542,34 @@ public class TorTransProxy implements TorServiceConstants {
- script.append(" --log-uid");
- script.append(" || exit\n");
- }
--
-- // Reject all other outbound packets by default
-+
-+ // Reject DNS that is not from Tor (order is important - first matched rule counts!)
- script.append(ipTablesPath);
- script.append(" -t filter");
-- script.append(" -P OUTPUT DROP");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p udp");
-+ script.append(" --dport ");
-+ script.append(STANDARD_DNS_PORT);
-+ script.append(" -j REJECT");
- script.append(" || exit\n");
-
-+ // Reject all other outbound TCP packets
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p tcp");
-+ script.append(" -j REJECT");
-+ script.append(" || exit\n");
-+
-+ // Reject all other outbound UDP packets
-+ script.append(ipTablesPath);
-+ script.append(" -t filter");
-+ script.append(" -A OUTPUT");
-+ script.append(" -p udp");
-+ script.append(" -j REJECT");
-+ script.append(" || exit\n");
-+
-+
- String[] cmdAdd = {script.toString()};
-
- code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
---
-1.7.9.5
-
diff --git a/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png b/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png
deleted file mode 100644
index e4099106..00000000
Binary files a/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png and /dev/null differ
diff --git a/external/patches/update_GibberBot_info/update_GibberBot_info.diff b/external/patches/update_GibberBot_info/update_GibberBot_info.diff
deleted file mode 100644
index 404b5240..00000000
--- a/external/patches/update_GibberBot_info/update_GibberBot_info.diff
+++ /dev/null
@@ -1,285 +0,0 @@
-Index: res/values-ca/strings.xml
-===================================================================
---- res/values-ca/strings.xml (revision 24406)
-+++ res/values-ca/strings.xml (working copy)
-@@ -97,7 +97,7 @@
-
- <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
- <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Client de missatgeria instantània segura per a Android</string>
- <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string>
- <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
-
-@@ -115,7 +115,7 @@
- <string name="wizard_final">Orbot és a punt!</string>
- <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/drawable/icon_otrchat.png
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: res/drawable/ic_launcher_gibberbot.png
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-
-Property changes on: res/drawable/ic_launcher_gibberbot.png
-___________________________________________________________________
-Added: svn:mime-type
- + application/octet-stream
-
-Index: res/values-fa/strings.xml
-===================================================================
---- res/values-fa/strings.xml (revision 24406)
-+++ res/values-fa/strings.xml (working copy)
-@@ -95,7 +95,7 @@
-
- <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string>
- <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string>
-- <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string>
-+ <string name="wizard_tips_otrchat">GibberBot - کاربر ایمن انتقال پیام فوری برای آندروید</string>
- <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string>
- <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string>
-
-@@ -105,7 +105,7 @@
- <string name="wizard_final">اوربات آماده استفاده میباشد!</string>
- <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-ru/strings.xml
-===================================================================
---- res/values-ru/strings.xml (revision 24406)
-+++ res/values-ru/strings.xml (working copy)
-@@ -95,7 +95,7 @@
-
- <string name="wizard_tips_tricks">Orbot-задействованные приложения</string>
- <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string>
- <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string>
- <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string>
-
-@@ -109,7 +109,7 @@
- <string name="wizard_final">Программа Orbot готова к использованию!</string>
- <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-de/strings.xml
-===================================================================
---- res/values-de/strings.xml (revision 24406)
-+++ res/values-de/strings.xml (working copy)
-@@ -97,7 +97,7 @@
-
- <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string>
- <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Ein sicheres Instant-Messaging-Programm für Android</string>
- <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string>
- <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
-
-@@ -115,7 +115,7 @@
- <string name="wizard_final">Orbot ist bereit!</string>
- <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values/strings.xml
-===================================================================
---- res/values/strings.xml (revision 24406)
-+++ res/values/strings.xml (working copy)
-@@ -94,7 +94,7 @@
-
- <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
- <string name="wizard_tips_msg">We encourage you to download & use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Secure instant messaging client for Android</string>
-+ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
- <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot</string>
- <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-
-@@ -108,7 +108,7 @@
- <string name="wizard_final">Orbot is ready!</string>
- <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-ar/strings.xml
-===================================================================
---- res/values-ar/strings.xml (revision 24406)
-+++ res/values-ar/strings.xml (working copy)
-@@ -97,7 +97,7 @@
-
- <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string>
- <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string>
-+ <string name="wizard_tips_otrchat">GibberBot - عميل التراسل الفوري الآمن للأندرويد</string>
- <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string>
- <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string>
-
-@@ -115,7 +115,7 @@
- <string name="wizard_final">أوربوت جاهز!</string>
- <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-es/strings.xml
-===================================================================
---- res/values-es/strings.xml (revision 24406)
-+++ res/values-es/strings.xml (working copy)
-@@ -97,7 +97,7 @@
-
- <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string>
- <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajería instantánea seguro para Android</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Cliente de mensajería instantánea seguro para Android</string>
- <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
- <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
-
-@@ -115,7 +115,7 @@
- <string name="wizard_final">¡Orbot está listo!</string>
- <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-mk/strings.xml
-===================================================================
---- res/values-mk/strings.xml (revision 24406)
-+++ res/values-mk/strings.xml (working copy)
-@@ -95,7 +95,7 @@
-
- <string name="wizard_tips_tricks">Орбот-вклучени апликации</string>
- <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Безбеден клиент за инстант-пораки за Андроид</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Безбеден клиент за инстант-пораки за Андроид</string>
- <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string>
- <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string>
-
-@@ -109,7 +109,7 @@
- <string name="wizard_final">Орбот е спремен!</string>
- <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-nl/strings.xml
-===================================================================
---- res/values-nl/strings.xml (revision 24406)
-+++ res/values-nl/strings.xml (working copy)
-@@ -97,7 +97,7 @@
-
- <string name="wizard_tips_tricks">Orbot-beschikbare Apps</string>
- <string name="wizard_tips_msg">We raden u aan om te apps te downloaden welke zich zich automatisch verbinden met Orbot. Klik op de buttons hier beneden om te installeren.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Veilige instant message programma voor Android</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Veilige instant message programma voor Android</string>
- <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string>
- <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe u uw apps kunt configureren voor Orbot</string>
-
-@@ -114,7 +114,7 @@
- <string name="wizard_final">Orbot is klaar!</string>
- <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/values-pl/strings.xml
-===================================================================
---- res/values-pl/strings.xml (revision 24406)
-+++ res/values-pl/strings.xml (working copy)
-@@ -95,7 +95,7 @@
-
- <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
- <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Bezpieczny klieny rozmów dla Androida</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Bezpieczny klieny rozmów dla Androida</string>
- <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string>
- <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string>
-
-@@ -109,7 +109,7 @@
- <string name="wizard_final">Orbot jest gotowy!</string>
- <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: res/layout/layout_wizard_tips.xml
-===================================================================
---- res/layout/layout_wizard_tips.xml (revision 24406)
-+++ res/layout/layout_wizard_tips.xml (working copy)
-@@ -17,7 +17,7 @@
-
- <TextView android:text="@string/wizard_tips_msg" android:layout_gravity="left" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-
--<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/icon_otrchat" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-+<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-
- <Button android:text="@string/wizard_tips_orweb" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-
-Index: res/values-zh/strings.xml
-===================================================================
---- res/values-zh/strings.xml (revision 24406)
-+++ res/values-zh/strings.xml (working copy)
-@@ -95,7 +95,7 @@
-
- <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string>
- <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string>
-- <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全即时消息客户端</string>
-+ <string name="wizard_tips_otrchat">GibberBot - Android 上的安全即时消息客户端</string>
- <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string>
- <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
-
-@@ -108,7 +108,7 @@
- <string name="wizard_final">Orbot 已就绪！</string>
- <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string>
-
-- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
-+ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
- <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
-
- <!-- END Welcome Wizard strings (DJH) -->
-Index: .classpath
-===================================================================
---- .classpath (revision 24406)
-+++ .classpath (working copy)
-@@ -1,9 +1,9 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
-- <classpathentry kind="src" path="src"/>
-- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="lib" path="libs/asocks.jar"/>
- <classpathentry kind="lib" path="libs/jtorctrl.jar"/>
-+ <classpathentry kind="src" path="src"/>
-+ <classpathentry kind="src" path="gen"/>
- <classpathentry kind="output" path="bin"/>
- </classpath>
1
0
[orbot/master] removed unused submodules, moved to gradle tor-android
by n8fr8＠torproject.org 07 Dec '17
by n8fr8＠torproject.org 07 Dec '17
07 Dec '17
commit b07d4febeb79d4b423513e6a319e08188fc56694
Author: n8fr8 <nathan(a)freitas.net>
Date: Sun Dec 3 15:36:28 2017 +0530
removed unused submodules, moved to gradle tor-android
---
.gitmodules | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index d8f0459a..67daeac2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,7 @@
-[submodule "external/tor"]
- path = external/tor
- url = https://git.torproject.org/git/tor.git
- ignore = dirty
-[submodule "external/libevent"]
- path = external/libevent
- url = https://github.com/libevent/libevent.git
- ignore = dirty
[submodule "external/jtorctl"]
path = external/jtorctl
url = https://github.com/guardianproject/jtorctl
ignore = dirty
-[submodule "external/openssl"]
- path = external/openssl
- url = https://github.com/openssl/openssl.git
- ignore = dirty
-[submodule "external/iptables"]
- path = external/iptables
- url = git://git.netfilter.org/iptables
- ignore = dirty
-[submodule "external/polipo"]
- path = external/polipo
- url = https://github.com/jech/polipo.git
- ignore = dirty
[submodule "external/badvpn"]
path = external/badvpn
url = https://github.com/guardianproject/badvpn.git
@@ -34,11 +14,3 @@
path = external/jsocks
url = https://github.com/guardianproject/jsocks.git
ignore = dirty
-[submodule "external/zstd"]
- path = external/zstd
- url = https://github.com/facebook/zstd.git
- ignore = dirty
-[submodule "external/xz"]
- path = external/xz
- url = https://git.tukaani.org/xz.git
- ignore = dirty
1
0
07 Dec '17
commit 3d729fc867666f68598965506d9d69476968a15c
Author: n8fr8 <nathan(a)freitas.net>
Date: Sun Dec 3 15:11:10 2017 +0530
switch to using tor-android binary in TorService
---
.../org/torproject/android/service/TorService.java | 10 +-
...eInstaller.java => OtherResourceInstaller.java} | 201 ++++++---------------
2 files changed, 62 insertions(+), 149 deletions(-)
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 6c20a23e..b7e48f95 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -41,12 +41,13 @@ import android.widget.RemoteViews;
import com.jrummyapps.android.shell.CommandResult;
import com.jrummyapps.android.shell.Shell;
+import org.torproject.android.binary.TorResourceInstaller;
import org.torproject.android.control.ConfigEntry;
import org.torproject.android.control.TorControlConnection;
+import org.torproject.android.service.util.OtherResourceInstaller;
import org.torproject.android.service.vpn.TorifiedApp;
import org.torproject.android.service.util.DummyActivity;
import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorResourceInstaller;
import org.torproject.android.service.util.TorServiceUtils;
import org.torproject.android.service.util.Utils;
import org.torproject.android.service.vpn.OrbotVpnManager;
@@ -626,14 +627,17 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
boolean success = installer.installResources();
if (success)
- prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit();
+ prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit();
+
+ OtherResourceInstaller oInstaller = new OtherResourceInstaller(this, appBinHome);
+ oInstaller.installResources();
}
updateTorConfigFile ();
isTorUpgradeAndConfigComplete = true;
}
- private boolean updateTorConfigFile () throws FileNotFoundException, IOException, TimeoutException
+ private boolean updateTorConfigFile () throws IOException, TimeoutException
{
SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
similarity index 59%
rename from orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java
rename to orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
index 8e2a6e02..6c1506b3 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
@@ -1,6 +1,3 @@
-/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
-/* See LICENSE for licensing information */
-
package org.torproject.android.service.util;
import java.io.DataInputStream;
@@ -26,19 +23,19 @@ import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.R;
import org.torproject.android.service.TorServiceConstants;
-public class TorResourceInstaller implements TorServiceConstants {
+public class OtherResourceInstaller implements TorServiceConstants {
+
-
File installFolder;
Context context;
-
- public TorResourceInstaller (Context context, File installFolder)
+
+ public OtherResourceInstaller (Context context, File installFolder)
{
this.installFolder = installFolder;
-
+
this.context = context;
}
-
+
public void deleteDirectory(File file) {
if( file.exists() ) {
if (file.isDirectory()) {
@@ -52,153 +49,65 @@ public class TorResourceInstaller implements TorServiceConstants {
}
}
}
-
+
file.delete();
}
}
-
+
private final static String COMMAND_RM_FORCE = "rm -f ";
private final static String MP3_EXT = ".mp3";
- //
+ //
/*
* Extract the Tor resources from the APK file using ZIP
*/
public boolean installResources () throws IOException, FileNotFoundException, TimeoutException
{
-
+
InputStream is;
File outFile;
String cpuPath = "armeabi";
-
+
if (Build.CPU_ABI.contains("x86"))
- cpuPath = "x86";
+ cpuPath = "x86";
deleteDirectory(installFolder);
-
- installFolder.mkdirs();
- is = context.getResources().openRawResource(R.raw.torrc);
- outFile = new File(installFolder, TORRC_ASSET_KEY);
- streamToFile(is,outFile, false, false);
-
- is = context.getResources().openRawResource(R.raw.torpolipo);
- outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY);
- streamToFile(is,outFile, false, false);
+ installFolder.mkdirs();
is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + MP3_EXT);
outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
streamToFile(is,outFile, false, true);
setExecutable(outFile);
- is = context.getAssets().open(cpuPath + '/' + TOR_ASSET_KEY + MP3_EXT);
- outFile = new File(installFolder, TOR_ASSET_KEY);
- streamToFile(is,outFile, false, true);
- setExecutable(outFile);
-
- is = context.getAssets().open(cpuPath + '/' + POLIPO_ASSET_KEY + MP3_EXT);
- outFile = new File(installFolder, POLIPO_ASSET_KEY);
- streamToFile(is,outFile, false, true);
- setExecutable(outFile);
-
is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + MP3_EXT);
outFile = new File(installFolder, PDNSD_ASSET_KEY);
streamToFile(is,outFile, false, true);
setExecutable(outFile);
-
- installGeoIP();
-
+
+
return true;
}
-
+
public boolean updateTorConfigCustom (File fileTorRcCustom, String extraLines) throws IOException, FileNotFoundException, TimeoutException
{
- if (fileTorRcCustom.exists())
- {
- fileTorRcCustom.delete();
- Log.d("torResources","deleting existing torrc.custom");
- }
- else
- fileTorRcCustom.createNewFile();
-
- FileOutputStream fos = new FileOutputStream(fileTorRcCustom, false);
- PrintStream ps = new PrintStream(fos);
- ps.print(extraLines);
- ps.close();
-
- return true;
- }
-
- public boolean updatePolipoConfig (File filePolipo, String extraLines) throws IOException, FileNotFoundException, TimeoutException
- {
-
- InputStream is;
-
-
- is = context.getResources().openRawResource(R.raw.torpolipo);
- streamToFile(is,filePolipo, false, false);
-
- if (extraLines != null && extraLines.length() > 0)
+ if (fileTorRcCustom.exists())
{
- StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n');
- streamToFile(sbis,filePolipo,true,false);
+ fileTorRcCustom.delete();
+ Log.d("torResources","deleting existing torrc.custom");
}
-
+ else
+ fileTorRcCustom.createNewFile();
- return true;
- }
-
- public boolean installPolipoConf () throws IOException, FileNotFoundException, TimeoutException
- {
-
- InputStream is;
- File outFile;
-
+ FileOutputStream fos = new FileOutputStream(fileTorRcCustom, false);
+ PrintStream ps = new PrintStream(fos);
+ ps.print(extraLines);
+ ps.close();
- is = context.getResources().openRawResource(R.raw.torpolipo);
- outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY);
- streamToFile(is,outFile, false, false);
-
- return true;
- }
-
- /*
- * Extract the Tor binary from the APK file using ZIP
- */
-
- private boolean installGeoIP () throws IOException, FileNotFoundException
- {
-
- InputStream is;
- File outFile;
-
- outFile = new File(installFolder, GEOIP_ASSET_KEY);
- is = context.getResources().openRawResource(R.raw.geoip);
- streamToFile(is, outFile, false, true);
-
- is = context.getResources().openRawResource(R.raw.geoip6);
- outFile = new File(installFolder, GEOIP6_ASSET_KEY);
- streamToFile(is, outFile, false, true);
-
return true;
}
-
- /*
- private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException
- {
-
- DataOutputStream out = new DataOutputStream(new FileOutputStream(file));
- InputStream is = new GZIPInputStream(ctx.getAssets().open(asset));
-
- byte buf[] = new byte[8172];
- int len;
- while ((len = is.read(buf)) > 0) {
- out.write(buf, 0, len);
- }
- out.close();
- is.close();
- }*/
-
+
+
/*
* Write the inputstream contents to the file
*/
@@ -211,15 +120,15 @@ public class TorResourceInstaller implements TorServiceConstants {
OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append);
ZipInputStream zis = null;
-
+
if (zip)
{
- zis = new ZipInputStream(stm);
+ zis = new ZipInputStream(stm);
ZipEntry ze = zis.getNextEntry();
stm = zis;
-
+
}
-
+
while ((bytecount = stm.read(buffer)) > 0)
{
@@ -229,55 +138,55 @@ public class TorResourceInstaller implements TorServiceConstants {
stmOut.close();
stm.close();
-
+
if (zis != null)
zis.close();
-
-
+
+
return true;
}
-
+
//copy the file from inputstream to File output - alternative impl
public static boolean copyFile (InputStream is, File outputFile)
{
-
+
try {
- if (outputFile.exists())
- outputFile.delete();
-
+ if (outputFile.exists())
+ outputFile.delete();
+
boolean newFile = outputFile.createNewFile();
DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile));
DataInputStream in = new DataInputStream(is);
-
+
int b = -1;
byte[] data = new byte[1024];
-
+
while ((b = in.read(data)) != -1) {
out.write(data);
}
-
+
if (b == -1); //rejoice
-
+
//
out.flush();
out.close();
in.close();
// chmod?
-
+
return newFile;
-
-
+
+
} catch (IOException ex) {
Log.e(OrbotConstants.TAG, "error copying binary", ex);
return false;
}
}
-
-
-
+
+
+
/**
* Copies a raw resource file, given its ID to the given location
* @param ctx context
@@ -293,14 +202,14 @@ public class TorResourceInstaller implements TorServiceConstants {
// Write the iptables binary
final FileOutputStream out = new FileOutputStream(file);
InputStream is = ctx.getResources().openRawResource(resid);
-
+
if (isZipd)
{
- ZipInputStream zis = new ZipInputStream(is);
+ ZipInputStream zis = new ZipInputStream(is);
ZipEntry ze = zis.getNextEntry();
is = zis;
}
-
+
byte buf[] = new byte[1024];
int len;
while ((len = is.read(buf)) > 0) {
@@ -320,14 +229,14 @@ public class TorResourceInstaller implements TorServiceConstants {
/*
public static boolean assertIpTablesBinaries(Context ctx, boolean showErrors) throws Exception {
boolean changed = false;
-
+
// Check iptables_g1
File file = new File(ctx.getDir("bin",0), "iptables");
copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false);
-
+
return true;
}*/
-
+
private void setExecutable(File fileBin) {
fileBin.setReadable(true);
1
0
07 Dec '17
commit fc4d6aab215ce0f613e193de25d43bae0e45c3f1
Author: n8fr8 <nathan(a)freitas.net>
Date: Thu Dec 7 12:53:52 2017 -0500
improve app loading time for VPN app dialog
---
.../main/java/org/torproject/android/ui/AppManagerActivity.java | 8 +-------
app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java | 5 -----
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 30e52ebc..0acef3e7 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -200,10 +200,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
tordApps[tordIdx++] = st.nextToken();
}
- Arrays.sort(tordApps);
-
- //else load the apps up
-
List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0);
Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator();
@@ -212,7 +208,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
ApplicationInfo aInfo = null;
- int appIdx = 0;
TorifiedApp app = null;
while (itAppInfo.hasNext())
@@ -285,10 +280,9 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
app.setTorified(false);
}
- appIdx++;
}
- Collections.sort(apps);
+ // Collections.sort(apps);
return apps;
}
diff --git a/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java b/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java
deleted file mode 100644
index d8674c00..00000000
--- a/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.torproject.android.ui;
-
-public class VPNSetupActivity {
-
-}
1
0
commit fbeff251521f7c3353008b68c8710c4438030a7a
Author: Igor Oliveira <igor.oliveira(a)posteo.net>
Date: Thu Dec 7 11:57:10 2017 -0200
Remove leftover Java file
The file was not allowing the project to build
---
.../android/ui/OrbotDiagnosticsActivity.java | 328 ---------------------
1 file changed, 328 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java b/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java
deleted file mode 100644
index 63c54378..00000000
--- a/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package org.torproject.android.ui;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.torproject.android.R;
-import org.torproject.android.service.util.TorResourceInstaller;
-import org.torproject.android.service.TorServiceConstants;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.os.StatFs;
-import android.text.format.Formatter;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-
-public class OrbotDiagnosticsActivity extends Activity {
-
- private TextView mTextView = null;
- private final static String TAG = "OrbotDiag";
- private StringBuffer log = new StringBuffer();
- Process mProcess;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.layout_diag);
-
- mTextView = (TextView)findViewById(R.id.diaglog);
-
- }
-
- private String getFreeStorage ()
- {
- File path = Environment.getDataDirectory();
- StatFs stat = new StatFs(path.getPath());
- long blockSize = stat.getBlockSize();
- long availableBlocks = stat.getAvailableBlocks();
- return Formatter.formatFileSize(this, availableBlocks * blockSize);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
-
- stopTor();
- }
-
- @Override
- protected void onDestroy() {
-
- super.onDestroy();
-
- }
-
- private void stopTor ()
- {
- File appBinHome = this.getDir("bin", Context.MODE_PRIVATE);
-
- File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
-
- if (mProcess != null)
- mProcess.destroy();
-
-
- }
-
-
-
- @Override
- protected void onResume() {
- super.onResume();
-
-
- log("Hello, Orbot!");
-
- try
- {
- log(android.os.Build.DEVICE);
- log(android.os.Build.HARDWARE);
- log(android.os.Build.MANUFACTURER);
- log(android.os.Build.MODEL);
- log(android.os.Build.VERSION.CODENAME);
- log(android.os.Build.VERSION.RELEASE);
- }
- catch (Exception e)
- {
- log("error getting device info");
- }
-
- showFileTree ();
-
- runTorTest();
- }
-
- private void runTorTest ()
- {
- try
- {
- File appBinHome = this.getDir("bin", Context.MODE_PRIVATE);
- File appDataHome = this.getDir("data", Context.MODE_PRIVATE);
-
- File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
- enableBinExec (fileTor, appBinHome);
-
- InputStream is = getResources().openRawResource(R.raw.torrc);
- File fileTorrc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY + "diag");
- TorResourceInstaller.streamToFile(is,fileTorrc, false, false);
-
- /**
- ArrayList<String> alEnv = new ArrayList<String>();
- alEnv.add("HOME=" + appBinHome.getAbsolutePath());
- Shell shell = Shell.startShell(alEnv,appBinHome.getAbsolutePath());
- SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath());
- shell.add(cmdTor);
- **/
-
- String cmd = fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath();
-
- log ("Executing command> " + cmd);
-
- mProcess = Runtime.getRuntime().exec(cmd);
-
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
- StreamGobbler sg = new StreamGobbler();
- sg.reader = bufferedReader;
- sg.process = mProcess;
- new Thread(sg).start();
-
- if (mProcess.getErrorStream() != null)
- {
- bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getErrorStream()));
- sg = new StreamGobbler();
- sg.reader = bufferedReader;
- sg.process = mProcess;
- new Thread(sg).start();
- }
-
-
- }
- catch (Exception e)
- {
- Log.d(TAG,"runTorTest exception",e);
- }
-
- }
-
- class StreamGobbler implements Runnable
- {
- BufferedReader reader;
- Process process;
-
- public void run ()
- {
- String line = null;
- try {
- while ( (line = reader.readLine()) != null)
- {
- Message msg = mHandler.obtainMessage(0);
- msg.getData().putString("log", line);
- mHandler.sendMessage(msg);
- }
-
- } catch (IOException e) {
- Log.d(TAG, "error reading line",e);
- }
-
- //log("Tor exit code=" + process.exitValue() + ";");
-
- }
- }
-
- private boolean enableBinExec (File fileBin, File appBinHome) throws Exception
- {
-
- log(fileBin.getName() + ": PRE: Is binary exec? " + fileBin.canExecute());
-
- if (!fileBin.canExecute())
- {
- log("(re)Setting permission on binary: " + fileBin.getAbsolutePath());
-
- Runtime.getRuntime().exec("chmod " + TorServiceConstants.CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath()).waitFor();
-
- File fileTest = new File(fileBin.getAbsolutePath());
- log(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute());
-
- }
-
- return fileBin.canExecute();
- }
-
- private void showFileTree ()
- {
-
- File fileDir = this.getDir("bin", Context.MODE_PRIVATE);
-
- if (fileDir.exists())
- {
- log("checking file tree: " + fileDir.getAbsolutePath());
- printDir (fileDir.getName(), fileDir);
- }
- else
- {
- log("app_bin does not exist");
- }
-
- fileDir = this.getDir("data", Context.MODE_PRIVATE);
- if (fileDir.exists())
- {
- log("checking file tree: " + fileDir.getAbsolutePath());
- printDir (fileDir.getName(), fileDir);
- }
- else
- {
- log ("app_data does not exist");
- }
-
-
- }
-
- private void printDir (String path, File fileDir)
- {
- File[] files = fileDir.listFiles();
-
- if (files != null && files.length > 0)
- {
- for (File file : files)
- {
-
- try
- {
- if (file.isDirectory())
- {
- printDir(path + '/' + file.getName(), file);
- }
- else
- {
- log(path + '/' + file.getName() + " len:" + file.length() + " exec:" + file.canExecute());
-
- }
- }
- catch (Exception e)
- {
- log("problem printing out file information");
- }
-
- }
- }
- }
-
- Handler mHandler = new Handler ()
- {
-
- @Override
- public void handleMessage(Message msg) {
-
- super.handleMessage(msg);
-
- String logMsg = msg.getData().getString("log");
- log(logMsg);
- }
-
- };
-
- private void log (String msg)
- {
- Log.d(TAG, msg);
- mTextView.append(msg + '\n');
- log.append(msg + '\n');
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate menu resource file.
- getMenuInflater().inflate(R.menu.share_menu, menu);
-
- // Locate MenuItem with ShareActionProvider
- MenuItem item = menu.findItem(R.id.menu_item_share);
-
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
-
- case R.id.menu_item_share:
- sendLog();
- return true;
-
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- private void sendLog ()
- {
- int maxLength = 5000;
-
- String logShare = null;
-
- if (log.length() > maxLength)
- logShare = log.substring(0, maxLength);
- else
- logShare = log.toString();
-
- Intent sendIntent = new Intent();
- sendIntent.setAction(Intent.ACTION_SEND);
- sendIntent.putExtra(Intent.EXTRA_TEXT, logShare);
- sendIntent.setType("text/plain");
- startActivity(sendIntent);
- }
-
-
-}
1
0
[orbot/master] Merge pull request #104 from igortoliveira/remove-java-file
by n8fr8＠torproject.org 07 Dec '17
by n8fr8＠torproject.org 07 Dec '17
07 Dec '17
commit 6493d8d8b76f28c6d572ca14502698e519b3ff78
Merge: fc4d6aab fbeff251
Author: Nathan Freitas <nathan(a)freitas.net>
Date: Thu Dec 7 23:24:53 2017 +0530
Merge pull request #104 from igortoliveira/remove-java-file
Remove leftover Java file
1
0
[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Dec '17
by translation＠torproject.org 07 Dec '17
07 Dec '17
commit d0c6228702fbf29fd9da1fc9c12d6ff600f66aeb
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Dec 7 17:45:13 2017 +0000
Update translations for bridgedb_completed
---
fa/LC_MESSAGES/bridgedb.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index 0e434b25f..0877ae43d 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-10-02 07:00+0000\n"
+"PO-Revision-Date: 2017-12-07 17:42+0000\n"
"Last-Translator: Amir Moezzi <amirreza.mz(a)yahoo.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
1
0
07 Dec '17
commit 70d4d33c28f6bf58a5df7b84173e3294865a97c9
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Dec 7 17:45:06 2017 +0000
Update translations for bridgedb
---
fa/LC_MESSAGES/bridgedb.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index 0e434b25f..0877ae43d 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-10-02 07:00+0000\n"
+"PO-Revision-Date: 2017-12-07 17:42+0000\n"
"Last-Translator: Amir Moezzi <amirreza.mz(a)yahoo.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
1
0
[tor-browser-build/master] Bug 24475: Add support for Windows 64 to update-responses
by gk＠torproject.org 07 Dec '17
by gk＠torproject.org 07 Dec '17
07 Dec '17
commit 5a274fb97d317860e59592ec37a6ce9f3a007fd9
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Wed Dec 6 13:38:49 2017 +0100
Bug 24475: Add support for Windows 64 to update-responses
---
projects/release/update_responses_config.yml | 4 +++-
tools/update-responses/update_responses | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 8d945dc..01c6950 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -3,7 +3,8 @@ tmp_dir: '[% c("tmp_dir") %]'
appname_marfile: tor-browser
appname_bundle_osx: TorBrowser
appname_bundle_linux: tor-browser
-appname_bundle_win: torbrowser-install
+appname_bundle_win32: torbrowser-install
+appname_bundle_win64: torbrowser-install-win64
releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %]
download:
archive_url: https://archive.torproject.org/tor-package-archive/torbrowser
@@ -17,6 +18,7 @@ build_targets:
- WINNT_x86-gcc3
- WINNT_x86-gcc3-x86
- WINNT_x86-gcc3-x64
+ win64: WINNT_x86_64-gcc3-x64
osx32: Darwin_x86-gcc3
osx64: Darwin_x86_64-gcc3
channels:
diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index 9303ed1..b68e46a 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -136,7 +136,9 @@ sub get_version_downloads {
($os, $lang) = ('osx64', $1);
} elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) {
($os, $lang) = ($1, $2);
- } elsif ($file =~ m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) {
+ } elsif ($file =~ m/^$config->{appname_bundle_win64}-${version}_(.+).exe$/) {
+ ($os, $lang) = ('win64', $1);
+ } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) {
($os, $lang) = ('win32', $1);
} else {
next;
1
0