diff --git a/net-vpn/tor/patches/tor-0.3.1.9.patchset b/net-vpn/tor/patches/tor-0.3.1.9.patchset deleted file mode 100644 index a99ab41b2..000000000 --- a/net-vpn/tor/patches/tor-0.3.1.9.patchset +++ /dev/null @@ -1,39 +0,0 @@ -From ace4c6a7aa783023ee84bc1a7d8bdc031aaabc36 Mon Sep 17 00:00:00 2001 -From: begasus -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 - #include - -+#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 sockaddr1 and sockaddr2 represent - * the same IP address and port combination. Otherwise, return 0. - */ --- -2.7.0 - diff --git a/net-vpn/tor/patches/tor-0.3.0.9.patchset b/net-vpn/tor/patches/tor-0.3.3.6.patchset similarity index 100% rename from net-vpn/tor/patches/tor-0.3.0.9.patchset rename to net-vpn/tor/patches/tor-0.3.3.6.patchset diff --git a/net-vpn/tor/tor-0.3.0.9.recipe b/net-vpn/tor/tor-0.3.0.9.recipe deleted file mode 100644 index ba9b45dc8..000000000 --- a/net-vpn/tor/tor-0.3.0.9.recipe +++ /dev/null @@ -1,84 +0,0 @@ -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="2" - -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 - 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: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 -} diff --git a/net-vpn/tor/tor-0.3.1.9.recipe b/net-vpn/tor/tor-0.3.3.6.recipe similarity index 87% rename from net-vpn/tor/tor-0.3.1.9.recipe rename to net-vpn/tor/tor-0.3.3.6.recipe index bab81b60b..c37c3df30 100644 --- a/net-vpn/tor/tor-0.3.1.9.recipe +++ b/net-vpn/tor/tor-0.3.3.6.recipe @@ -14,14 +14,14 @@ COPYRIGHT=" LICENSE="Tor" REVISION="1" SOURCE_URI="https://www.torproject.org/dist/tor-$portVersion.tar.gz" -CHECKSUM_SHA256="6e1b04f7890e782fd56014a0de5075e4ab29b52a35d8bca1f6b80c93f58f3d26" +CHECKSUM_SHA256="99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7" PATCHES="tor-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - tor = $portVersion + tor$secondaryArchSuffix = $portVersion cmd:tor$secondaryArchSuffix cmd:tor_gencert$secondaryArchSuffix cmd:tor_resolve$secondaryArchSuffix @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libevent$secondaryArchSuffix + lib:libevent_2.1$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix @@ -38,7 +38,7 @@ REQUIRES=" " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libevent$secondaryArchSuffix + devel:libevent_2.1$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:liblzma$secondaryArchSuffix @@ -68,7 +68,7 @@ BUILD() export CXXFLAGS="-D_BSD_SOURCE" export LDFLAGS="-lbsd" autoreconf -vfi - runConfigure ./configure --disable-gcc-hardening + runConfigure ./configure --disable-gcc-hardening --disable-unittests make }