Skip to content
Snippets Groups Projects
Verified Commit 947f06a7 authored by Torsten Grote's avatar Torsten Grote
Browse files

Don't package geoip as it isn't needed for what Briar's use-cases

E.g. needed for restricting Tor path to certain countries
parent 9d0b0f0f
No related branches found
No related tags found
1 merge request!19Build 0.4.x series of Tor
Pipeline #10192 passed with warnings
......@@ -17,7 +17,6 @@ def build():
build_android(versions)
utils.package_geoip(versions)
package_android(versions)
......@@ -118,7 +117,6 @@ def package_android(versions):
os.path.join(OUTPUT_DIR, 'tor_arm64_pie.zip'),
os.path.join(OUTPUT_DIR, 'tor_x86_pie.zip'),
os.path.join(OUTPUT_DIR, 'tor_x86_64_pie.zip'),
os.path.join(OUTPUT_DIR, 'geoip.zip'),
]
zip_name_android = utils.pack(versions, file_list_android, PLATFORM)
pom_name_android = utils.create_pom_file(versions, PLATFORM)
......
......@@ -15,7 +15,6 @@ def build():
build_linux(versions)
utils.package_geoip(versions)
package_linux(versions, jar_name)
......@@ -128,7 +127,6 @@ def package_linux(versions, jar_name):
os.path.join(OUTPUT_DIR, 'tor_linux-aarch64.zip'),
os.path.join(OUTPUT_DIR, 'tor_linux-armhf.zip'),
os.path.join(OUTPUT_DIR, 'tor_linux-x86_64.zip'),
os.path.join(OUTPUT_DIR, 'geoip.zip'),
]
zip_name = pack(versions, file_list, PLATFORM)
......
......@@ -15,7 +15,6 @@ def build():
build_windows(versions)
utils.package_geoip(versions)
package_windows(versions, jar_name)
......@@ -127,7 +126,6 @@ def package_windows(versions, jar_name):
# zip binaries together
file_list = [
os.path.join(OUTPUT_DIR, 'tor_windows-x86_64.zip'),
os.path.join(OUTPUT_DIR, 'geoip.zip'),
]
zip_name = utils.pack(versions, file_list, PLATFORM)
......
......@@ -77,14 +77,6 @@ def setup(platform):
return versions, jar_name
def package_geoip(versions):
# zip geoip database
geoip_path = os.path.join(OUTPUT_DIR, 'geoip')
copy(os.path.join(BUILD_DIR, 'tor', 'src', 'config', 'geoip'), geoip_path)
reset_time(geoip_path, versions)
check_call(['zip', '-X', 'geoip.zip', 'geoip'], cwd=OUTPUT_DIR)
def prepare_repos(versions):
prepare_repo(os.path.join(BUILD_DIR, "tor"), versions['tor']['url'], versions['tor']['commit'])
prepare_repo(os.path.join(BUILD_DIR, "libevent"), versions['libevent']['url'], versions['libevent']['commit'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment