Skip to content

Commit

Permalink
Merge pull request #178 from TheTorProject/update/libraries
Browse files Browse the repository at this point in the history
Update/libraries
  • Loading branch information
lorenzoPrimi authored May 14, 2018
2 parents 2e99d44 + 06213f5 commit 26b9750
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ platform :ios, '9.0'
target 'ooniprobe' do
pod 'measurement_kit',
:git => 'https://github.com/measurement-kit/measurement-kit.git',
:tag => 'v0.8.1'
:tag => 'v0.8.3'
pod 'Toast'
pod 'PBRevealViewController'
pod 'UIBarButtonItem-Badge-Coding'
Expand Down
22 changes: 11 additions & 11 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- Crashlytics (3.9.3):
- Fabric (~> 1.7.2)
- Crashlytics (3.10.1):
- Fabric (~> 1.7.5)
- DZNEmptyDataSet (1.8.1)
- Fabric (1.7.2)
- Fabric (1.7.6)
- MBProgressHUD (1.1.0)
- measurement_kit (0.8.1)
- measurement_kit (0.8.3)
- NTYCSVTable (0.3.1)
- PBRevealViewController (1.2.9):
- PBRevealViewController/ObjC (= 1.2.9)
Expand All @@ -17,7 +17,7 @@ DEPENDENCIES:
- DZNEmptyDataSet
- Fabric
- MBProgressHUD
- measurement_kit (from `https://github.com/measurement-kit/measurement-kit.git`, tag `v0.8.1`)
- measurement_kit (from `https://github.com/measurement-kit/measurement-kit.git`, tag `v0.8.3`)
- NTYCSVTable
- PBRevealViewController
- Toast
Expand All @@ -26,24 +26,24 @@ DEPENDENCIES:
EXTERNAL SOURCES:
measurement_kit:
:git: https://github.com/measurement-kit/measurement-kit.git
:tag: v0.8.1
:tag: v0.8.3

CHECKOUT OPTIONS:
measurement_kit:
:git: https://github.com/measurement-kit/measurement-kit.git
:tag: v0.8.1
:tag: v0.8.3

SPEC CHECKSUMS:
Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c
Crashlytics: aee1a064cbbf99b32efa3f056a5f458d846bc8ff
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15
Fabric: f8d42c893bb187326a7968b62abe55c36a987a46
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
measurement_kit: 6ba384d6352526c3711979ff3db66af794ef8b35
measurement_kit: b26424a2dabda0c5de70033c0cc64f2a3d3bef0b
NTYCSVTable: bad087d30f329f587c4557baa234719ac36c8448
PBRevealViewController: 1ca9d511f1b0be4f6f5ca46046f86251be9cad9a
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
UIBarButtonItem-Badge-Coding: 3f8e96f75f7d7c7516c1a1706b566892bf2db134

PODFILE CHECKSUM: 3b5f7a906c2bf43f4ba098c397946aff48f57c26
PODFILE CHECKSUM: 3d00c9b2a5adef2e4aedb58a98e9fd02380a1197

COCOAPODS: 1.4.0
22 changes: 12 additions & 10 deletions ooniprobe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
D4A2F5D81A6C3244001B8460 = {
CreatedOnToolsVersion = 6.1.1;
DevelopmentTeam = MADPSAYN6T;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
Expand Down Expand Up @@ -786,9 +786,9 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CODE_SIGN_ENTITLEMENTS = ooniprobe/ooniprobe.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer: Lorenzo Primiterra (584LT894QR)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "iPhone Distribution: The Tor Project, Inc (MADPSAYN6T)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: The Tor Project, Inc (MADPSAYN6T)";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = MADPSAYN6T;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand All @@ -806,11 +806,12 @@
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.openobservatory.ooniprobe;
PRODUCT_NAME = ooniprobe;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "25f0c818-9519-4c51-b389-1d1450850b33";
PROVISIONING_PROFILE_SPECIFIER = "ooniprobe appstore distribution profile";
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "arm64 armv7s i386 x84_64";
};
name = Debug;
};
Expand All @@ -824,8 +825,8 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CODE_SIGN_ENTITLEMENTS = ooniprobe/ooniprobe.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: The Tor Project, Inc (MADPSAYN6T)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: The Tor Project, Inc (MADPSAYN6T)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = MADPSAYN6T;
ENABLE_BITCODE = NO;
Expand All @@ -849,11 +850,12 @@
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.openobservatory.ooniprobe;
PRODUCT_NAME = ooniprobe;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "25f0c818-9519-4c51-b389-1d1450850b33";
PROVISIONING_PROFILE_SPECIFIER = "ooniprobe appstore distribution profile";
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "arm64 armv7s i386 x84_64";
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions ooniprobe.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ooniprobe/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>42</string>
<string>45</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand Down
Binary file modified ooniprobe/Resources/GeoIP.dat
Binary file not shown.
Binary file modified ooniprobe/Resources/GeoIPASNum.dat
Binary file not shown.
12 changes: 9 additions & 3 deletions ooniprobe/Resources/test-lists/global.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ https://2600.org/,HACK,Hacking Tools,2014-04-15,citizenlab,Updated by OONI on 20
http://4genderjustice.org/,HUMR,Human Rights Issues,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://666games.net,GAME,Gaming,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://8thstreetlatinas.com,PORN,Pornography,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://911lies.org,CULTR,Culture,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://a1408.g.akamai.net/5/1408/1388/2005110406/1a1a1ad948be278cff2d96046ad90768d848b41947aa1986/sample_sorenson.mov.zip,MMED,Media sharing,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://abpr2.railfan.net,MMED,Media sharing,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://addons.mozilla.org,FILE,File-sharing,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
Expand Down Expand Up @@ -94,7 +93,7 @@ https://encrypted.google.com,SRCH,Search Engines,2014-04-15,citizenlab,Updated b
https://epic.org/,HUMR,Human Rights Issues,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://evernote.com,MMED,Media sharing,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://exitinternational.net/,HUMR,Human Rights Issues,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://explorer.ooni.torproject.org,ANON,Anonymization and circumvention tools,2017-05-31,ADEF,probably blocked in Egypt as of 2017-05-31
https://explorer.ooni.io,HUMR,Human Rights Issues,2017-05-31,ADEF,probably blocked in Egypt as of 2017-05-31
http://exscn.net,REL,Religion,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://extratorrent.cc,FILE,File-sharing,2016-08-11,sinarproject,Updated by OONI on 2017-02-14
https://www.fanfiction.net/,CULTR,Culture,2017-10-12,sinarproject,
Expand Down Expand Up @@ -411,7 +410,6 @@ http://www.blacksandjews.com/Welcome.html,HATE,Hate Speech,2014-04-15,citizenlab
http://www.blizzard.com,GAME,Gaming,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.blogeasy.com,HOST,Hosting and Blogging Platforms,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://www.blogger.com/,HOST,Hosting and Blogging Platforms,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.bloglines.com,HOST,Hosting and Blogging Platforms,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.blogsome.com,HOST,Hosting and Blogging Platforms,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.blubster.com,FILE,File-sharing,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://www.bme.com/,CULTR,Culture,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
Expand Down Expand Up @@ -592,6 +590,7 @@ http://www.geocities.com,HOST,Hosting and Blogging Platforms,2014-04-15,citizenl
http://www.ghostrecon.com,GAME,Gaming,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.giganews.com,GRP,Social Networking,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.ginvodka.org,ALDR,Alcohol & Drugs,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
https://github.com,HOST,Hosting and Blogging Platforms,2018-02-06,EvasivePangolin,
http://www.glaad.org,LGBT,LGBT,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.glbtqarchive.com/,LGBT,LGBT,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
http://www.glil.org,LGBT,LGBT,2014-04-15,citizenlab,Updated by OONI on 2017-02-14
Expand Down Expand Up @@ -1116,3 +1115,10 @@ http://zoomshare.com/,HOST,Hosting and Blogging Platforms,2014-04-15,citizenlab,
https://www.opentech.fund/,HUMR,Human Rights Issues,2017-09-26,OONI,
https://www.womenonwaves.org/,HUMR,Human Rights Issues,2017-10-26,OONI,
https://www.womenonweb.org/,HUMR,Human Rights Issues,2017-10-26,OONI,
https://amp.cloudflare.com/v0/amp-iframe-0.1.js,HOST,Hosting and Blogging Platforms,2018-02-08,OONI,AMP is reportedly blocked in EG: https://cpj.org/amp/028977.html
https://cdn.ampproject.org/v0/amp-iframe-0.1.js,HOST,Hosting and Blogging Platforms,2018-02-08,OONI,AMP is reportedly blocked in EG: https://cpj.org/amp/028977.html
https://www.uber.com/,COMM,E-commerce,2018-02-13,OONI,Reportedly blocked in Argentina
https://pastebin.com/,HOST,Hosting and Blogging Platforms,2017-02-12,Anonymous,Often blocked website
https://yandex.com/,SRCH,Search Engines,2018-02-23,igorv,
https://protonmail.com/,HACK,Hacking Tools,2018-03-19,OONI,
https://getoutline.org/,ANON,Anonymization and circumvention tools,2018-04-06,Duplika,

0 comments on commit 26b9750

Please sign in to comment.