package/tor: new package
[Thomas:
- remove reference to BR2_LARGEFILE, this option has been
removed. Largefile support is now guaranteed to be present.
- rewrap Config.in help text to the appropriate length.]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls
Thomas Petazzoni
parent
2ab02505d5
commit
17d2c6d5db
|
|
@ -1291,6 +1291,7 @@ endif
|
|||
source "package/tinc/Config.in"
|
||||
source "package/tinyhttpd/Config.in"
|
||||
source "package/tn5250/Config.in"
|
||||
source "package/tor/Config.in"
|
||||
source "package/transmission/Config.in"
|
||||
source "package/tvheadend/Config.in"
|
||||
source "package/udpcast/Config.in"
|
||||
|
|
|
|||
89
package/tor/0001-openssl-libz.patch
Normal file
89
package/tor/0001-openssl-libz.patch
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
Adjust link order of libz to solve bug with static linking
|
||||
and remove host paths when looking for openssl.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr tor-0.2.5.11.org/configure.ac tor-0.2.5.11/configure.ac
|
||||
--- tor-0.2.5.11.org/configure.ac 2015-03-12 17:49:50.000000000 +0100
|
||||
+++ tor-0.2.5.11/configure.ac 2015-03-29 14:32:05.058142751 +0200
|
||||
@@ -559,11 +559,11 @@
|
||||
fi
|
||||
])
|
||||
|
||||
-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
|
||||
+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI],
|
||||
[#include <openssl/rand.h>],
|
||||
[void RAND_add(const void *buf, int num, double entropy);],
|
||||
[RAND_add((void*)0,0,0); exit(0);], [],
|
||||
- [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
|
||||
+ [])
|
||||
|
||||
dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
|
||||
|
||||
diff -uNr tor-0.2.5.11.org/src/or/include.am tor-0.2.5.11/src/or/include.am
|
||||
--- tor-0.2.5.11.org/src/or/include.am 2015-03-12 17:49:50.000000000 +0100
|
||||
+++ tor-0.2.5.11/src/or/include.am 2015-03-29 14:37:35.409997674 +0200
|
||||
@@ -115,7 +115,7 @@
|
||||
src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \
|
||||
src/common/libor-crypto.a $(LIBDONNA) \
|
||||
src/common/libor-event.a \
|
||||
- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
|
||||
if COVERAGE_ENABLED
|
||||
diff -uNr tor-0.2.5.11.org/src/test/include.am tor-0.2.5.11/src/test/include.am
|
||||
--- tor-0.2.5.11.org/src/test/include.am 2015-03-12 17:49:50.000000000 +0100
|
||||
+++ tor-0.2.5.11/src/test/include.am 2015-03-29 14:39:53.264265077 +0200
|
||||
@@ -59,16 +59,16 @@
|
||||
src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
|
||||
src/common/libor-crypto-testing.a $(LIBDONNA) \
|
||||
src/common/libor-event-testing.a \
|
||||
- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
|
||||
src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
||||
@TOR_LDFLAGS_libevent@
|
||||
src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
|
||||
src/common/libor-crypto.a $(LIBDONNA) \
|
||||
src/common/libor-event.a \
|
||||
- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
|
||||
noinst_HEADERS+= \
|
||||
src/test/test.h
|
||||
@@ -79,8 +79,8 @@
|
||||
src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
||||
src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
|
||||
src/common/libor-crypto.a $(LIBDONNA) \
|
||||
- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
|
||||
- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
+ @TOR_LIB_MATH@ \
|
||||
+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
src_test_test_ntor_cl_AM_CPPFLAGS = \
|
||||
-I"$(top_srcdir)/src/or"
|
||||
NTOR_TEST_DEPS=src/test/test-ntor-cl
|
||||
diff -uNr tor-0.2.5.11.org/src/tools/include.am tor-0.2.5.11/src/tools/include.am
|
||||
--- tor-0.2.5.11.org/src/tools/include.am 2014-06-18 21:11:45.000000000 +0200
|
||||
+++ tor-0.2.5.11/src/tools/include.am 2015-03-29 14:41:29.143058949 +0200
|
||||
@@ -9,14 +9,14 @@
|
||||
src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
||||
src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \
|
||||
$(LIBDONNA) \
|
||||
- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
+ @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
|
||||
src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c
|
||||
src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
||||
src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \
|
||||
$(LIBDONNA) \
|
||||
- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
+ @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
|
||||
|
||||
include src/tools/tor-fw-helper/include.am
|
||||
14
package/tor/Config.in
Normal file
14
package/tor/Config.in
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
config BR2_PACKAGE_TOR
|
||||
bool "tor"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBEVENT
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Tor is free software and an open network that helps you
|
||||
defend against traffic analysis, a form of network
|
||||
surveillance that threatens personal freedom and privacy,
|
||||
confidential business activities and relationships, and
|
||||
state security.
|
||||
|
||||
https://www.torproject.org
|
||||
2
package/tor/tor.hash
Normal file
2
package/tor/tor.hash
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
# Locally computed
|
||||
sha256 550fdafffeb4c1e3035bb8cc42e6e49d5af17ad79563bd118af22c1107f72b49 tor-0.2.5.12.tar.gz
|
||||
35
package/tor/tor.mk
Normal file
35
package/tor/tor.mk
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
################################################################################
|
||||
#
|
||||
# tor
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TOR_VERSION = 0.2.5.12
|
||||
TOR_SITE = https://dist.torproject.org
|
||||
TOR_LICENSE = BSD-3c
|
||||
TOR_LICENSE_FILES = LICENSE
|
||||
TOR_DEPENDENCIES = libevent openssl zlib
|
||||
TOR_AUTORECONF = YES
|
||||
|
||||
TOR_CONF_OPTS = \
|
||||
--disable-gcc-hardening \
|
||||
--with-libevent-dir=$(STAGING_DIR)/usr \
|
||||
--with-openssl-dir=$(STAGING_DIR)/usr \
|
||||
--with-zlib-dir=$(STAGING_DIR)/usr
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
TOR_CONF_OPTS += \
|
||||
--enable-static-libevent \
|
||||
--enable-static-openssl \
|
||||
--enable-static-tor \
|
||||
--enable-static-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
TOR_CONF_OPTS += --enable-seccomp
|
||||
TOR_DEPENDENCIES += libseccomp
|
||||
else
|
||||
TOR_CONF_OPTS += --disable-seccomp
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Loading…
Reference in a new issue