Tor: bump version (#3807)

This commit is contained in:
miqlas
2019-05-02 09:32:34 +02:00
committed by Jérôme Duval
parent 65393d310b
commit 55a8077028
3 changed files with 69 additions and 41 deletions

View File

@@ -1,39 +0,0 @@
From ace4c6a7aa783023ee84bc1a7d8bdc031aaabc36 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 3 Jul 2017 23:28:37 +0200
Subject: fix missing IFF_RUNNING
diff --git a/src/common/address.c b/src/common/address.c
index 5074c1c..febcb90 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -85,6 +85,10 @@
#include <string.h>
#include <assert.h>
+#ifndef IFF_RUNNING
+#define IFF_RUNNING 0x0001
+#endif
+
/* tor_addr_is_null() and maybe other functions rely on AF_UNSPEC being 0 to
* work correctly. Bail out here if we've found a platform where AF_UNSPEC
* isn't 0. */
diff --git a/src/test/test_address.c b/src/test/test_address.c
index 9c88d37..74f2e48 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -28,6 +28,10 @@
#include "test.h"
#include "log_test_helpers.h"
+#ifndef IFF_RUNNING
+#define IFF_RUNNING 0x0001
+#endif
+
/** Return 1 iff <b>sockaddr1</b> and <b>sockaddr2</b> represent
* the same IP address and port combination. Otherwise, return 0.
*/
--
2.16.4

View File

@@ -0,0 +1,64 @@
From ace4c6a7aa783023ee84bc1a7d8bdc031aaabc36 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 3 Jul 2017 23:28:37 +0200
Subject: fix missing IFF_RUNNING
diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index 28c8e3f..ca5d640 100644
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -92,6 +92,10 @@
#include <stdlib.h>
#include <string.h>
+#ifndef IFF_RUNNING
+#define IFF_RUNNING 0x0001
+#endif
+
/* tor_addr_is_null() and maybe other functions rely on AF_UNSPEC being 0 to
* work correctly. Bail out here if we've found a platform where AF_UNSPEC
* isn't 0. */
diff --git a/src/test/test_address.c b/src/test/test_address.c
index cfb32b8..05c200f 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -29,6 +29,10 @@
#include "test/test.h"
#include "test/log_test_helpers.h"
+#ifndef IFF_RUNNING
+#define IFF_RUNNING 0x0001
+#endif
+
/** Return 1 iff <b>sockaddr1</b> and <b>sockaddr2</b> represent
* the same IP address and port combination. Otherwise, return 0.
*/
--
2.21.0
From 5f49108382889de7bb49a1cc54aa464011aec26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 28 Apr 2019 18:34:38 +0200
Subject: Build fix
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index 1d1b3bc..fec953f 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -65,6 +65,10 @@
#define NO_BACKTRACE_IMPL
#endif
+#ifndef SIGIO
+#define SIGIO -1
+#endif
+
// Redundant with util.h, but doing it here so we can avoid that dependency.
#define raw_free free
--
2.21.0

View File

@@ -6,13 +6,13 @@ Tor provides the foundation for a range of applications that allow \
organizations and individuals to share information over public networks \
without compromising their privacy."
HOMEPAGE="https://www.torproject.org/"
COPYRIGHT="2007-2018 The Tor Project, Inc.
COPYRIGHT="2007-2019 The Tor Project, Inc.
2004-2006 Nick Mathewson
2001-2006 Roger Dingledine"
LICENSE="Tor"
REVISION="1"
SOURCE_URI="https://www.torproject.org/dist/tor-$portVersion.tar.gz"
CHECKSUM_SHA256="6203f1159f3ea875a7b2a3e8364050671108e37ae5d6d41be1424b7a61b4cc53"
CHECKSUM_SHA256="d5c56603942a8927670f50a4a469fb909e29d3571fdd013389d567e57abc0b47"
PATCHES="tor-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -37,12 +37,14 @@ PROVIDES="
tor$secondaryArchSuffix = $portVersion
cmd:tor$commandSuffix
cmd:tor_gencert$commandSuffix
cmd:tor_print_ed_signing_cert$commandSuffix
cmd:tor_resolve$commandSuffix
cmd:torify$commandSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libevent_2.1$secondaryArchSuffix
lib:liblzma$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
@@ -52,6 +54,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libexecinfo$secondaryArchSuffix
devel:libevent_2.1$secondaryArchSuffix
devel:liblzma$secondaryArchSuffix
devel:libssl$secondaryArchSuffix