tor: bump version (#1491)

* move to net-vpn
This commit is contained in:
Schrijvers Luc
2017-07-04 07:55:08 +02:00
committed by Jérôme Duval
parent 7b3fc418f5
commit f7bcfc69f2
5 changed files with 123 additions and 0 deletions

141
net-vpn/tor/licenses/Tor Normal file
View File

@@ -0,0 +1,141 @@
This file contains the license for Tor,
a free software project to provide anonymity on the Internet.
It also lists the licenses for other components used by Tor.
For more information about Tor, see https://www.torproject.org/.
If you got this file as a part of a larger bundle,
there may be other license terms that you should be aware of.
===============================================================================
Tor is distributed under this license:
Copyright (c) 2001-2004, Roger Dingledine
Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
Copyright (c) 2007-2013, The Tor Project, Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the names of the copyright owners nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed
under the following license:
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
src/ext/tor_queue.h is licensed under the following license:
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
===============================================================================
src/config/geoip is licensed under the following license:
OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
Copyright (c) 2008 MaxMind, Inc. All Rights Reserved.
All advertising materials and documentation mentioning features or use of
this database must display the following acknowledgment:
"This product includes GeoLite data created by MaxMind, available from
http://maxmind.com/"
Redistribution and use with or without modification, are permitted provided
that the following conditions are met:
1. Redistributions must retain the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other
materials provided with the distribution.
2. All advertising materials and documentation mentioning features or use of
this database must display the following acknowledgement:
"This product includes GeoLite data created by MaxMind, available from
http://maxmind.com/"
3. "MaxMind" may not be used to endorse or promote products derived from this
database without specific prior written permission.
THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
If you got Tor as a static binary with OpenSSL included, then you should know:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
===============================================================================

View File

@@ -0,0 +1,39 @@
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 2693239..029fc1d 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 0d142ad..54170ca 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.7.0

View File

@@ -0,0 +1,97 @@
SUMMARY="A virtual layer that helps you improve privacy and anonymity"
DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \
their privacy and security on the Internet. It also enables software \
developers to create new communication tools with built-in privacy features. \
Tor provides the foundation for a range of applications that allow \
organizations and individuals to share information over public networks \
without compromising their privacy.
Individuals use Tor to keep websites from tracking them and their family \
members, or to connect to news sites, instant messaging services, or the like \
when these are blocked by their local Internet providers. Tor's hidden \
services let users publish web sites and other services without needing to \
reveal the location of the site. Individuals also use Tor for socially \
sensitive communication: chat rooms and web forums for rape and abuse \
survivors, or people with illnesses.
Journalists use Tor to communicate more safely with whistleblowers and \
dissidents. Non-governmental organizations (NGOs) use Tor to allow their \
workers to connect to their home website while they're in a foreign country, \
without notifying everybody nearby that they're working with that organization.
Groups such as Indymedia recommend Tor for safeguarding their members' online \
privacy and security. Activist groups like the Electronic Frontier Foundation \
(EFF) recommend Tor as a mechanism for maintaining civil liberties online. \
Corporations use Tor as a safe way to conduct competitive analysis, and to \
protect sensitive procurement patterns from eavesdroppers. They also use it to \
replace traditional VPNs, which reveal the exact amount and timing of \
communication. Which locations have employees working late? Which locations \
have employees consulting job-hunting websites? Which research divisions are \
communicating with the company's patent lawyers?
A branch of the U.S. Navy uses Tor for open source intelligence gathering, and \
one of its teams used Tor while deployed in the Middle East recently. Law \
enforcement uses Tor for visiting or surveilling web sites without leaving \
government IP addresses in their web logs, and for security during sting \
operations.
The variety of people who use Tor is actually part of what makes it so secure. \
Tor hides you among the other users on the network, so the more populous and \
diverse the user base for Tor is, the more your anonymity will be protected."
HOMEPAGE="https://www.torproject.org"
SOURCE_URI="https://archive.torproject.org/tor-package-archive/tor-0.2.4.20.tar.gz"
CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f"
REVISION="1"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
tor = $portVersion
cmd:tor = $portVersion
cmd:tor_gencert = $portVersion
cmd:tor_resolve = $portVersion
cmd:torify = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libevent$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libevent$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:awk
"
LICENSE="Tor"
COPYRIGHT="
2001-2004, Roger Dingledine
2004-2006, Roger Dingledine, Nick Mathewson
2007-2013, The Tor Project, Inc.
"
#USER_SETTINGS_FILES="
# settings/tor directory
# "
#GLOBAL_WRITABLE_FILES="
# settings/tor/torrc.sample auto-merge
# "
BUILD()
{
runConfigure ./configure
make
}
INSTALL()
{
make install
}

View File

@@ -0,0 +1,75 @@
SUMMARY="A virtual layer that helps you improve privacy and anonymity"
DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \
their privacy and security on the Internet. It also enables software \
developers to create new communication tools with built-in privacy features. \
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"
SOURCE_URI="https://www.torproject.org/dist/tor-0.2.5.10.tar.gz"
CHECKSUM_SHA256="b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b"
REVISION="1"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
tor = $portVersion
cmd:tor$secondaryArchSuffix
cmd:tor_gencert$secondaryArchSuffix
cmd:tor_resolve$secondaryArchSuffix
cmd:torify$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libevent$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libevent$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
LICENSE="BSD (3-clause)"
COPYRIGHT="
2001-2004, Roger Dingledine
2004-2006, Roger Dingledine, Nick Mathewson
2007-2014, The Tor Project, Inc.
"
USER_SETTINGS_FILES="
settings/tor directory
"
GLOBAL_WRITABLE_FILES="
settings/tor/torrc.sample auto-merge
"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make
}
INSTALL()
{
make install
}

View File

@@ -0,0 +1,84 @@
SUMMARY="A virtual layer that helps you improve privacy and anonymity"
DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \
their privacy and security on the Internet. It also enables software \
developers to create new communication tools with built-in privacy features. \
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"
SOURCE_URI="https://www.torproject.org/dist/tor-$portVersion.tar.gz"
CHECKSUM_SHA256="48d4880bf6ccb19ce9af2abde6946d7cf0635cc807548badbf4a221a79581e42"
PATCHES="tor-$portVersion.patchset"
REVISION="1"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
tor = $portVersion
cmd:tor$secondaryArchSuffix
cmd:tor_gencert$secondaryArchSuffix
cmd:tor_resolve$secondaryArchSuffix
cmd:torify$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libevent$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libevent$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
LICENSE="BSD (3-clause)"
COPYRIGHT="
2001-2004, Roger Dingledine
2004-2006, Roger Dingledine, Nick Mathewson
2007-2016, The Tor Project, Inc.
"
USER_SETTINGS_FILES="
settings/tor directory
"
GLOBAL_WRITABLE_FILES="
settings/tor/torrc.sample auto-merge
"
BUILD()
{
export CFLAGS="-D_BSD_SOURCE"
export CXXFLAGS="-D_BSD_SOURCE"
export LDFLAGS="-lbsd"
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure --disable-gcc-hardening
make
}
INSTALL()
{
make install
}
TEST()
{
make check
}