From 5004d8ec41f3f5c13b8a29dfbe8170db6ac0f6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Fri, 3 Apr 2015 15:25:46 +0200 Subject: [PATCH] Delete unneeded files and reorganise existing files --- .gitmodules | 9 --- README.rst | 2 +- apt.key | Bin 6624 -> 0 bytes ooniprobe-dev => bin/ooniprobe-dev | 0 debian/README | 5 -- debian/changelog | 41 -------------- debian/compat | 1 - debian/control | 53 ------------------ debian/copyright | 51 ----------------- debian/rules | 6 -- debian/source/format | 1 - fabfile.py => scripts/fabfile.py | 0 .../setup-dependencies.sh | 0 {example_inputs => var/example_inputs}/README | 0 var/example_inputs/alexa-head.txt | 10 ++++ .../example_inputs}/alexa-top-1k.txt | 0 var/example_inputs/bad_input.txt | 1 + var/example_inputs/bridges.txt | 4 ++ .../example_inputs}/daph3_yaml_file.txt | 0 .../example_inputs}/dns_tamper_file.txt | 0 .../dns_tamper_test_resolvers.txt | 0 var/example_inputs/domains.txt | 3 + .../example_inputs}/http_host_file.txt | 0 .../keyword_filtering_file.txt | 0 .../example_inputs}/tcpconnect_host_file.txt | 0 .../example_inputs}/url_lists_file.txt | 0 26 files changed, 19 insertions(+), 168 deletions(-) delete mode 100644 .gitmodules delete mode 100644 apt.key rename ooniprobe-dev => bin/ooniprobe-dev (100%) delete mode 100644 debian/README delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/rules delete mode 100644 debian/source/format rename fabfile.py => scripts/fabfile.py (100%) rename setup-dependencies.sh => scripts/setup-dependencies.sh (100%) rename {example_inputs => var/example_inputs}/README (100%) create mode 100644 var/example_inputs/alexa-head.txt rename {example_inputs => var/example_inputs}/alexa-top-1k.txt (100%) create mode 100644 var/example_inputs/bad_input.txt create mode 100644 var/example_inputs/bridges.txt rename {example_inputs => var/example_inputs}/daph3_yaml_file.txt (100%) rename {example_inputs => var/example_inputs}/dns_tamper_file.txt (100%) rename {example_inputs => var/example_inputs}/dns_tamper_test_resolvers.txt (100%) create mode 100644 var/example_inputs/domains.txt rename {example_inputs => var/example_inputs}/http_host_file.txt (100%) rename {example_inputs => var/example_inputs}/keyword_filtering_file.txt (100%) rename {example_inputs => var/example_inputs}/tcpconnect_host_file.txt (100%) rename {example_inputs => var/example_inputs}/url_lists_file.txt (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index daddf8f4..00000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "ooni/lib/txscapy"] - path = ooni/lib/txscapy - url = https://github.com/isislovecruft/txscapy.git -[submodule "ooni/lib/txtraceroute"] - path = ooni/lib/txtraceroute - url = https://github.com/isislovecruft/txtraceroute.git -[submodule "ooni/lib/txtorcon"] - path = ooni/lib/txtorcon - url = https://github.com/isislovecruft/txtorcon.git diff --git a/README.rst b/README.rst index f4ce39f3..92cc532d 100644 --- a/README.rst +++ b/README.rst @@ -126,7 +126,7 @@ without installing it is supported with the following commands:: git clone https://git.torproject.org/ooni-probe.git cd ooni-probe - ./setup-dependencies.sh + ./scripts/setup-dependencies.sh python setup.py install OSX diff --git a/apt.key b/apt.key deleted file mode 100644 index 2ce211045568bfbe63c6c39e64e634ddb53d398d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6624 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 diff --git a/ooniprobe-dev b/bin/ooniprobe-dev similarity index 100% rename from ooniprobe-dev rename to bin/ooniprobe-dev diff --git a/debian/README b/debian/README deleted file mode 100644 index a816b35b..00000000 --- a/debian/README +++ /dev/null @@ -1,5 +0,0 @@ -Debian package for ooni-probe -============================= - -The Debian package is currently missing the graphical user interface as it -needs several JavaScript libraries that are currently not available in Debian. diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 45128cc0..00000000 --- a/debian/changelog +++ /dev/null @@ -1,41 +0,0 @@ -ooniprobe (1.2.2-1) stable; urgency=low - - * ooniprobe 1.2.2 - - -- OONI Developers (signing key) Fri, 17 Oct 2014 16:07:00 +0200 - -ooniprobe (1.2.0-1) stable; urgency=low - - * ooniprobe 1.2.0 - - -- OONI Developers (signing key) Wed, 1 Oct 2014 16:07:00 +0200 - -ooniprobe (1.1.1-1) stable; urgency=low - - * ooniprobe 1.1.1 - - -- OONI Developers (signing key) Sun, 24 Aug 2014 20:01:46 +0200 - -ooniprobe (1.1.0-1) stable; urgency=low - - * ooniprobe 1.1.0 - - -- OONI Developers (signing key) Tue, 19 Aug 2014 15:14:46 +0200 - -ooniprobe (1.0.2-1) stable; urgency=low - - * ooniprobe 1.0.2 - - -- OONI Developers (signing key) Fri, 9 May 2014 10:14:46 +0200 - -ooniprobe (1.0.1-1) stable; urgency=low - - * ooniprobe 1.0.1 - - -- OONI Developers (signing key) Fri, 14 Mar 2014 17:14:46 +0200 - -ooniprobe (1.0.0-rc6-1) stable; urgency=low - - * ooniprobe 1.0.0-rc6 - - -- OONI Developers (signing key) Mon, 13 Jan 2014 14:14:46 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 9bdf6414..00000000 --- a/debian/control +++ /dev/null @@ -1,53 +0,0 @@ -Source: ooniprobe -Maintainer: Open Observatory of Network Interference -Section: net -Priority: extra -Build-Depends: debhelper (>= 8), - python-all (>= 2.6.6-3~), - python-dnspython, - python-dumbnet, - python-docutils (>= 0.9.1), - python-ipaddr (>= 2.1.10), - python-openssl, - python-pypcap, - python-scapy (>= 2.2), - python-setuptools, - python-twisted (>= 12.2.0), - python-txsocksx, - python-txtorcon (>= 0.7), - python-yaml (>= 3.10), - python-zope.interface (>= 3.6), -Standards-Version: 3.9.4 -X-Python-Version: >= 2.7 -Vcs-Git: git://anonscm.debian.org/git/collab-maint/ooni-probe.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ooni-probe.git -Homepage: https://ooni.torproject.org/ - -Package: ooniprobe -Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, - tcpdump, - tor, - python-all (>= 2.6.6-3~), - python-dumbnet, - python-geoip (>= 0.2.5), - python-ipaddr (>= 2.1.10), - python-openssl, - python-pypcap, - python-scapy (>= 2.2), - python-setuptools, - python-twisted (>= 12.2.0), - python-txsocksx, - python-txtorcon (>= 0.7), - python-yaml (>= 3.10), - python-zope.interface (>= 3.6), -Suggests: obfsproxy -Description: probe for the Open Observatory of Network Interference (OONI) - OONI, the Open Observatory of Network Interference, is a global observation - network which aims is to collect high quality data using open methodologies - and free software to share observations and data about the various types, - methods, and amounts of network tampering in the world. - . - ooniprobe is a program to probe a network and collect data for the OONI - project. It will test the current network for signs of surveillance and - censorship. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index cbe2380c..00000000 --- a/debian/copyright +++ /dev/null @@ -1,51 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ooniprobe -Source: https://gitweb.torproject.org/ooni-probe.git - -Files: * -Copyright: 2012-2013 Jacob Appelbaum, Arturo Filastò, Isis Lovecruft, - Aaron Gibson -License: BSD-2-clause - -Files: data/nettests/experimental/tls_handshake.py -Copyright: 2013 Isis Lovecruft, The Tor Project Inc. -License: BSD-2-clause - -Files: ooni/utils/onion.py -Copyright: 2012 The Tor Project, Inc. -License: BSD-2-clause - -Files: debian/* -Copyright: 2013 Jerémy Bobbio -License: permissive - Copying and distribution of this package, with or without - modification, are permitted in any medium without royalty - provided the copyright notice and this notice are - preserved. - -Files: data/Geo*.dat -Copyright: 2013 MaxMind -License: CC BY-SA - This product includes GeoLite data created by MaxMind, available from - http://www.maxmind.com. - -License: BSD-2-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 9f48e791..00000000 --- a/debian/rules +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ --buildsystem=python_distutils --with=python2 -override_dh_python2: - dh_python2 --no-guessing-deps diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/fabfile.py b/scripts/fabfile.py similarity index 100% rename from fabfile.py rename to scripts/fabfile.py diff --git a/setup-dependencies.sh b/scripts/setup-dependencies.sh similarity index 100% rename from setup-dependencies.sh rename to scripts/setup-dependencies.sh diff --git a/example_inputs/README b/var/example_inputs/README similarity index 100% rename from example_inputs/README rename to var/example_inputs/README diff --git a/var/example_inputs/alexa-head.txt b/var/example_inputs/alexa-head.txt new file mode 100644 index 00000000..1ddf9822 --- /dev/null +++ b/var/example_inputs/alexa-head.txt @@ -0,0 +1,10 @@ +http://google.com/ +http://facebook.com/ +http://youtube.com/ +http://yahoo.com/ +http://baidu.com/ +http://wikipedia.org/ +http://live.com/ +http://twitter.com/ +http://qq.com/ +http://amazon.com/ diff --git a/example_inputs/alexa-top-1k.txt b/var/example_inputs/alexa-top-1k.txt similarity index 100% rename from example_inputs/alexa-top-1k.txt rename to var/example_inputs/alexa-top-1k.txt diff --git a/var/example_inputs/bad_input.txt b/var/example_inputs/bad_input.txt new file mode 100644 index 00000000..45a981ad --- /dev/null +++ b/var/example_inputs/bad_input.txt @@ -0,0 +1 @@ +http://zimbio.com/ diff --git a/var/example_inputs/bridges.txt b/var/example_inputs/bridges.txt new file mode 100644 index 00000000..4a7fa887 --- /dev/null +++ b/var/example_inputs/bridges.txt @@ -0,0 +1,4 @@ +obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0 +obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 +obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239 +obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED diff --git a/example_inputs/daph3_yaml_file.txt b/var/example_inputs/daph3_yaml_file.txt similarity index 100% rename from example_inputs/daph3_yaml_file.txt rename to var/example_inputs/daph3_yaml_file.txt diff --git a/example_inputs/dns_tamper_file.txt b/var/example_inputs/dns_tamper_file.txt similarity index 100% rename from example_inputs/dns_tamper_file.txt rename to var/example_inputs/dns_tamper_file.txt diff --git a/example_inputs/dns_tamper_test_resolvers.txt b/var/example_inputs/dns_tamper_test_resolvers.txt similarity index 100% rename from example_inputs/dns_tamper_test_resolvers.txt rename to var/example_inputs/dns_tamper_test_resolvers.txt diff --git a/var/example_inputs/domains.txt b/var/example_inputs/domains.txt new file mode 100644 index 00000000..cdeaad10 --- /dev/null +++ b/var/example_inputs/domains.txt @@ -0,0 +1,3 @@ +www.twitter.com +facebook.com +youtube.com diff --git a/example_inputs/http_host_file.txt b/var/example_inputs/http_host_file.txt similarity index 100% rename from example_inputs/http_host_file.txt rename to var/example_inputs/http_host_file.txt diff --git a/example_inputs/keyword_filtering_file.txt b/var/example_inputs/keyword_filtering_file.txt similarity index 100% rename from example_inputs/keyword_filtering_file.txt rename to var/example_inputs/keyword_filtering_file.txt diff --git a/example_inputs/tcpconnect_host_file.txt b/var/example_inputs/tcpconnect_host_file.txt similarity index 100% rename from example_inputs/tcpconnect_host_file.txt rename to var/example_inputs/tcpconnect_host_file.txt diff --git a/example_inputs/url_lists_file.txt b/var/example_inputs/url_lists_file.txt similarity index 100% rename from example_inputs/url_lists_file.txt rename to var/example_inputs/url_lists_file.txt