diff options
Diffstat (limited to 'net')
-rwxr-xr-x | net/tor/DETAILS | 8 | ||||
-rw-r--r-- | net/tor/HISTORY | 6 | ||||
-rwxr-xr-x | net/tor/PREPARE | 2 | ||||
-rwxr-xr-x | net/tor/PRE_BUILD | 7 | ||||
-rw-r--r-- | net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch | 65 |
5 files changed, 10 insertions, 78 deletions
diff --git a/net/tor/DETAILS b/net/tor/DETAILS index 78e4742155..5e678fb6c7 100755 --- a/net/tor/DETAILS +++ b/net/tor/DETAILS @@ -1,12 +1,6 @@ SPELL=tor -case "$TOR_BRANCH" -in devel) - VERSION=0.4.5.5-rc - SECURITY_PATCH=6 -;; stable) - VERSION=0.4.4.7 + VERSION=0.4.5.8 SECURITY_PATCH=16 -;; esac SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE2=${SOURCE}.asc SOURCE_URL[0]=https://www.torproject.org/dist/${SOURCE} diff --git a/net/tor/HISTORY b/net/tor/HISTORY index ebc5de8bee..2585215e1c 100644 --- a/net/tor/HISTORY +++ b/net/tor/HISTORY @@ -1,3 +1,9 @@ +2021-05-13 Florian Franzmann <bwlf@bandrate.org> + * DETAILS: version 0.4.5.8 + * DETAILS, PREPARE, PRE_BUILD: remove option for devel version 0.4.5.8 + has been declared stable + * 0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch: removed + 2021-02-14 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated TOR_BRANCH=stable to 0.4.4.7 fixed typo diff --git a/net/tor/PREPARE b/net/tor/PREPARE deleted file mode 100755 index b340e9672b..0000000000 --- a/net/tor/PREPARE +++ /dev/null @@ -1,2 +0,0 @@ -. "$GRIMOIRE"/FUNCTIONS && -prepare_select_branch stable devel diff --git a/net/tor/PRE_BUILD b/net/tor/PRE_BUILD index f974e5eb0b..335732967a 100755 --- a/net/tor/PRE_BUILD +++ b/net/tor/PRE_BUILD @@ -1,5 +1,4 @@ -default_pre_build && +default_pre_build && cd "$SOURCE_DIRECTORY" && -case "$TOR_BRANCH" in - (stable) apply_patch_dir patches ;; -esac + +apply_patch_dir patches diff --git a/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch b/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch deleted file mode 100644 index 4c8a263603..0000000000 --- a/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b22568a54506e4b79b72530f89f21032e6435414 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson <nickm@torproject.org> -Date: Fri, 6 Nov 2020 10:29:28 -0500 -Subject: [PATCH] Rename OpenSSL_version_num() as defined in Tor - -This way, if we guess wrong about whether the library has it, -we don't conflict with the library's headers. - -Fixes #40181; bug not in any released version. ---- - src/lib/crypt_ops/compat_openssl.h | 3 ++- - src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- - src/lib/tls/tortls_openssl.c | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/lib/crypt_ops/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h -index c2e1459078..aa66e0c3fa 100644 ---- a/src/lib/crypt_ops/compat_openssl.h -+++ b/src/lib/crypt_ops/compat_openssl.h -@@ -34,7 +34,7 @@ - - #ifndef OPENSSL_1_1_API - #define OpenSSL_version(v) SSLeay_version(v) --#define OpenSSL_version_num() SSLeay() -+#define tor_OpenSSL_version_num() SSLeay() - #define RAND_OpenSSL() RAND_SSLeay() - #define STATE_IS_SW_SERVER_HELLO(st) \ - (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ -@@ -42,6 +42,7 @@ - #define OSSL_HANDSHAKE_STATE int - #define CONST_IF_OPENSSL_1_1_API - #else /* defined(OPENSSL_1_1_API) */ -+#define tor_OpenSSL_version_num() OpenSSL_version_num() - #define STATE_IS_SW_SERVER_HELLO(st) \ - ((st) == TLS_ST_SW_SRVR_HELLO) - #define CONST_IF_OPENSSL_1_1_API const -diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c -index 065cbca1cc..e763491a11 100644 ---- a/src/lib/crypt_ops/crypto_openssl_mgt.c -+++ b/src/lib/crypt_ops/crypto_openssl_mgt.c -@@ -222,7 +222,7 @@ crypto_openssl_early_init(void) - - setup_openssl_threading(); - -- unsigned long version_num = OpenSSL_version_num(); -+ unsigned long version_num = tor_OpenSSL_version_num(); - const char *version_str = crypto_openssl_get_version_str(); - if (version_num == OPENSSL_VERSION_NUMBER && - !strcmp(version_str, OPENSSL_VERSION_TEXT)) { -diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c -index 2269714141..ad9b49ab4f 100644 ---- a/src/lib/tls/tortls_openssl.c -+++ b/src/lib/tls/tortls_openssl.c -@@ -342,7 +342,7 @@ tor_tls_init(void) - - #if (SIZEOF_VOID_P >= 8 && \ - OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) -- long version = OpenSSL_version_num(); -+ long version = tor_OpenSSL_version_num(); - - /* LCOV_EXCL_START : we can't test these lines on the same machine */ - if (version >= OPENSSL_V_SERIES(1,0,1)) { --- -GitLab - |