[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-build/maint-8.5] Bug 30162: Tor Browser bootstrap process got stuck after interrupting it
commit 05c9f970270441c071dc66b51034f4343a83c7de
Author: sisbell <shane.isbell@xxxxxxxxx>
Date: Sun May 5 22:52:33 2019 -0700
Bug 30162: Tor Browser bootstrap process got stuck after interrupting it
Bug 30166: If custom bridges are specified, only use those bridges for connecting
---
projects/tor-android-service/config | 2 +-
projects/tor-android-service/gradle.patch | 21 +++++++--------
projects/tor-onion-proxy-library/config | 2 +-
projects/tor-onion-proxy-library/maven-repo.patch | 32 +++++++++++++++++------
4 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
index 5454c94..4708da4 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000
+git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d
git_url: https://git.torproject.org/tor-android-service.git
git_submodule: 1
diff --git a/projects/tor-android-service/gradle.patch b/projects/tor-android-service/gradle.patch
index 89347c9..3fff3e6 100644
--- a/projects/tor-android-service/gradle.patch
+++ b/projects/tor-android-service/gradle.patch
@@ -1,28 +1,28 @@
diff --git a/build.gradle b/build.gradle
-index 178278e..d80d0b5 100644
+index 671edab..d9ecfef 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -4,6 +4,7 @@ buildscript {
+@@ -5,6 +5,7 @@ buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
-@@ -19,6 +20,7 @@ allprojects {
- jcenter()
- maven { url "https://jitpack.io"; }
+@@ -20,5 +21,6 @@ allprojects {
+ mavenCentral()
+ maven { url "https://repo.spring.io/plugins-release"; }
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"; }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
}
-
+\ No newline at end of file
diff --git a/service/build.gradle b/service/build.gradle
-index b414557..f57d9b3 100644
+index b414557..ae3e203 100644
--- a/service/build.gradle
+++ b/service/build.gradle
-@@ -16,13 +16,6 @@ android {
+@@ -16,12 +16,6 @@ android {
}
}
@@ -32,7 +32,6 @@ index b414557..f57d9b3 100644
- buildStagingDirectory "./outputs/ndk-build"
- }
- }
--
+
lintOptions {
abortOnError false
- }
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index b9e1aa0..afd800f 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-git_hash: be7206bba357bda11455b012bfcc0d42cc16c99d
+git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e
git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git
git_submodule: 1
diff --git a/projects/tor-onion-proxy-library/maven-repo.patch b/projects/tor-onion-proxy-library/maven-repo.patch
index 7062f8b..4c78aec 100644
--- a/projects/tor-onion-proxy-library/maven-repo.patch
+++ b/projects/tor-onion-proxy-library/maven-repo.patch
@@ -1,35 +1,51 @@
diff --git a/android/build.gradle b/android/build.gradle
-index 1549581..ab919cf 100644
+index b6d8608..38093be 100644
--- a/android/build.gradle
+++ b/android/build.gradle
-@@ -8,6 +8,7 @@ buildscript {
+@@ -7,6 +7,7 @@ buildscript {
+ mavenLocal()
mavenCentral()
google()
- jcenter()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
+@@ -82,6 +83,7 @@ repositories {
+ mavenCentral()
+ google()
+ maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"; }
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+
+ /**
diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle
-index d2c02cf..d846254 100644
+index 1bc0343..7d8e886 100644
--- a/android_tor_installer/build.gradle
+++ b/android_tor_installer/build.gradle
-@@ -8,6 +8,7 @@ buildscript {
+@@ -7,6 +7,7 @@ buildscript {
+ mavenLocal()
mavenCentral()
google()
- jcenter()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
+@@ -50,5 +51,6 @@ repositories {
+ google()
+ maven { url "https://repo.spring.io/plugins-release"; }
+ maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"; }
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+
+ }
diff --git a/build.gradle b/build.gradle
-index 43b9e13..8087ab7 100644
+index a269024..430f3e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ subprojects {
mavenLocal()
mavenCentral()
- jcenter()
+ maven { url "https://repo.spring.io/plugins-release"; }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
}
+
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits