From d56a6940e5ea98267c3d4503450fd981e7b543c1 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Mon, 10 Sep 2018 20:51:47 +0000 Subject: [PATCH] Tor: bump to 0.3.3.10. Move GLOBAL_WRITABLE_FILES & USER_SETTINGS_FILES before PROVIDES. --- ...r-0.3.3.9.patchset => tor-0.3.3.10.patchset} | 4 ++-- .../{tor-0.3.3.9.recipe => tor-0.3.3.10.recipe} | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) rename net-vpn/tor/patches/{tor-0.3.3.9.patchset => tor-0.3.3.10.patchset} (96%) rename net-vpn/tor/{tor-0.3.3.9.recipe => tor-0.3.3.10.recipe} (96%) diff --git a/net-vpn/tor/patches/tor-0.3.3.9.patchset b/net-vpn/tor/patches/tor-0.3.3.10.patchset similarity index 96% rename from net-vpn/tor/patches/tor-0.3.3.9.patchset rename to net-vpn/tor/patches/tor-0.3.3.10.patchset index 5bf38effb..fc752d602 100644 --- a/net-vpn/tor/patches/tor-0.3.3.9.patchset +++ b/net-vpn/tor/patches/tor-0.3.3.10.patchset @@ -5,7 +5,7 @@ Subject: fix missing IFF_RUNNING diff --git a/src/common/address.c b/src/common/address.c -index ecdbbab..de98e81 100644 +index 5074c1c..febcb90 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -85,6 +85,10 @@ @@ -35,5 +35,5 @@ index 9c88d37..74f2e48 100644 * the same IP address and port combination. Otherwise, return 0. */ -- -2.7.0 +2.16.4 diff --git a/net-vpn/tor/tor-0.3.3.9.recipe b/net-vpn/tor/tor-0.3.3.10.recipe similarity index 96% rename from net-vpn/tor/tor-0.3.3.9.recipe rename to net-vpn/tor/tor-0.3.3.10.recipe index ebb8620fa..700ee4517 100644 --- a/net-vpn/tor/tor-0.3.3.9.recipe +++ b/net-vpn/tor/tor-0.3.3.10.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2007-2018 The Tor Project, Inc. LICENSE="Tor" REVISION="1" SOURCE_URI="https://www.torproject.org/dist/tor-$portVersion.tar.gz" -CHECKSUM_SHA256="85346b4d026e6a041c8e326d2cc64b5f5361b032075c89c5854f16dbc02fce6f" +CHECKSUM_SHA256="6203f1159f3ea875a7b2a3e8364050671108e37ae5d6d41be1424b7a61b4cc53" PATCHES="tor-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -26,6 +26,13 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +GLOBAL_WRITABLE_FILES=" + settings/tor/torrc.sample auto-merge + " +USER_SETTINGS_FILES=" + settings/tor directory + " + PROVIDES=" tor$secondaryArchSuffix = $portVersion cmd:tor$commandSuffix @@ -61,14 +68,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -USER_SETTINGS_FILES=" - settings/tor directory - " - -GLOBAL_WRITABLE_FILES=" - settings/tor/torrc.sample auto-merge - " - defineDebugInfoPackage tor$secondaryArchSuffix \ "$commandBinDir"/tor \ "$commandBinDir"/tor-gencert \