Browse Source

tor: update to 0.4.8.10

Waldemar Brodkorb 3 weeks ago
parent
commit
520180c6b2

+ 4 - 5
package/tor/Makefile

@@ -4,13 +4,13 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.4.6.8
+PKG_VERSION:=		0.4.8.10
 PKG_RELEASE:=		1
-PKG_HASH:=		15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a
+PKG_HASH:=		e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86
 PKG_DESCR:=		anonymous internet communication system
 PKG_SECTION:=		net/proxy
-PKG_DEPENDS:=		libevent zlib libressl xz
-PKG_BUILDDEP:=		libevent zlib libressl xz
+PKG_DEPENDS:=		libevent zlib libressl
+PKG_BUILDDEP:=		libevent zlib libressl
 PKG_NEEDS:=		threads
 PKG_URL:=		https://www.torproject.org/
 PKG_SITES:=		https://www.torproject.org/dist/
@@ -21,7 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
 # -DNDEBUG not supported
 TARGET_CPPFLAGS:=
 CONFIGURE_ENV+=		ac_cv_libevent_normal=yes \

+ 14 - 0
package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_c

@@ -0,0 +1,14 @@
+--- tor-0.4.8.10.orig/src/lib/crypt_ops/crypto_openssl_mgt.c	2023-12-08 19:49:19.000000000 +0100
++++ tor-0.4.8.10/src/lib/crypt_ops/crypto_openssl_mgt.c	2024-04-07 11:39:44.453246186 +0200
+@@ -40,6 +40,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
+ 
+ #include <string.h>
+ 
++#ifdef OPENSSL_NO_ENGINE
++/* Android's OpenSSL seems to have removed all of its Engine support. */
++#define DISABLE_ENGINES
++#endif
++
+ #ifndef NEW_THREAD_API
+ /** A number of preallocated mutexes for use by OpenSSL. */
+ static tor_mutex_t **openssl_mutexes_ = NULL;

+ 14 - 0
package/tor/patches/patch-src_lib_crypt_ops_crypto_openssl_mgt_h

@@ -0,0 +1,14 @@
+--- tor-0.4.8.10.orig/src/lib/crypt_ops/crypto_openssl_mgt.h	2023-12-08 19:49:19.000000000 +0100
++++ tor-0.4.8.10/src/lib/crypt_ops/crypto_openssl_mgt.h	2024-04-07 11:39:44.453246186 +0200
+@@ -49,11 +49,6 @@
+ #define OPENSSL_V_SERIES(a,b,c) \
+   OPENSSL_VER((a),(b),(c),0,0)
+ 
+-#ifdef OPENSSL_NO_ENGINE
+-/* Android's OpenSSL seems to have removed all of its Engine support. */
+-#define DISABLE_ENGINES
+-#endif
+-
+ #if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5)
+ /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require
+  * setting up various callbacks.