git: 94ed6cbc3e83 - main - security/tor: update 0.4.7.13 → 0.4.8.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Sep 2023 00:50:43 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=94ed6cbc3e83edb1d7bc48ce7b6251b3cf87365a
commit 94ed6cbc3e83edb1d7bc48ce7b6251b3cf87365a
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-09-02 00:47:16 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-09-02 00:50:39 +0000
security/tor: update 0.4.7.13 → 0.4.8.5
PR: 273471
---
security/tor/Makefile | 2 +-
security/tor/distinfo | 6 +++---
security/tor/files/patch-doc_asciidoc-helper.sh | 14 ++++++++------
.../files/patch-src_lib_crypt__ops_compat__openssl.h | 19 -------------------
.../patch-src_lib_crypt__ops_crypto__openssl__mgt.h | 12 ------------
5 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 1b469e42357a..84a5b0380a5e 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,5 +1,5 @@
PORTNAME= tor
-DISTVERSION= 0.4.7.13
+DISTVERSION= 0.4.8.5
CATEGORIES= security net
MASTER_SITES= TOR
diff --git a/security/tor/distinfo b/security/tor/distinfo
index 2b1607ad8f0d..7cf5c70da74f 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673698675
-SHA256 (tor-0.4.7.13.tar.gz) = 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d
-SIZE (tor-0.4.7.13.tar.gz) = 8031948
+TIMESTAMP = 1693427495
+SHA256 (tor-0.4.8.5.tar.gz) = 6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119
+SIZE (tor-0.4.8.5.tar.gz) = 8237202
diff --git a/security/tor/files/patch-doc_asciidoc-helper.sh b/security/tor/files/patch-doc_asciidoc-helper.sh
index 2dcd9cd7fc2a..966f76b73f35 100644
--- a/security/tor/files/patch-doc_asciidoc-helper.sh
+++ b/security/tor/files/patch-doc_asciidoc-helper.sh
@@ -1,10 +1,12 @@
---- doc/asciidoc-helper.sh.orig 2022-02-04 16:24:11 UTC
+--- doc/asciidoc-helper.sh.orig 2023-08-30 12:58:59 UTC
+++ doc/asciidoc-helper.sh
-@@ -12,7 +12,6 @@ if [ $# != 3 ]; then
- exit 1;
+@@ -12,9 +12,6 @@ if [ $# != 3 ]; then
+ exit 1
fi
--SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
- export SOURCE_DATE_EPOCH
-
+-SOURCE_DATE_EPOCH="$(git -C "$(dirname "$0")" show --no-patch --format='%ct')"
+-export SOURCE_DATE_EPOCH
+-
output=$3
+
+ if [ "$1" = "html" ]; then
diff --git a/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h b/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h
deleted file mode 100644
index fae008ba2224..000000000000
--- a/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/crypt_ops/compat_openssl.h.orig 2022-10-17 12:38:04 UTC
-+++ src/lib/crypt_ops/compat_openssl.h
-@@ -25,14 +25,13 @@
- #error "We require OpenSSL >= 1.0.1"
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && \
-- ! defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
- /* We define this macro if we're trying to build with the majorly refactored
- * API in OpenSSL 1.1 */
- #define OPENSSL_1_1_API
- #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */
-
--#ifndef OPENSSL_1_1_API
-+#if !defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
- #define OpenSSL_version(v) SSLeay_version(v)
- #define tor_OpenSSL_version_num() SSLeay()
- #define RAND_OpenSSL() RAND_SSLeay()
diff --git a/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h b/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h
deleted file mode 100644
index 153ef20eb890..000000000000
--- a/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/crypt_ops/crypto_openssl_mgt.h.orig 2022-10-17 12:37:26 UTC
-+++ src/lib/crypt_ops/crypto_openssl_mgt.h
-@@ -54,8 +54,7 @@
- #define DISABLE_ENGINES
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+#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.
- *