summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/tor/Makefile3
-rw-r--r--security/tor/distinfo6
-rw-r--r--security/tor/files/patch-doc_asciidoc-helper.sh10
-rw-r--r--security/tor/files/patch-orconfig.h.in4
4 files changed, 17 insertions, 6 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 51810be98af9..6d4d0355704e 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,7 +1,7 @@
# Created by: peter.thoenen@yahoo.com
PORTNAME= tor
-DISTVERSION= 0.4.6.8
+DISTVERSION= 0.4.6.10
CATEGORIES= security net
MASTER_SITES= TOR
@@ -26,6 +26,7 @@ OPTIONS_GROUP= COMPRESSION TRACING
OPTIONS_GROUP_COMPRESSION= ZSTD LZMA
OPTIONS_GROUP_TRACING= LTTNG USDT LOG_DEBUG
OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
+OPTIONS_EXCLUDE_FreeBSD_12=DOCS MANPAGES # XXX(rene) a2x somehow broken there
OPTIONS_SUB= yes
STATIC_TOR_DESC= Build a static tor
TCMALLOC_DESC= Use the tcmalloc memory allocation library
diff --git a/security/tor/distinfo b/security/tor/distinfo
index d5e672a73eb2..9e074ac58a16 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635536034
-SHA256 (tor-0.4.6.8.tar.gz) = 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a
-SIZE (tor-0.4.6.8.tar.gz) = 7796485
+TIMESTAMP = 1644078724
+SHA256 (tor-0.4.6.10.tar.gz) = 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c
+SIZE (tor-0.4.6.10.tar.gz) = 7811644
diff --git a/security/tor/files/patch-doc_asciidoc-helper.sh b/security/tor/files/patch-doc_asciidoc-helper.sh
new file mode 100644
index 000000000000..2dcd9cd7fc2a
--- /dev/null
+++ b/security/tor/files/patch-doc_asciidoc-helper.sh
@@ -0,0 +1,10 @@
+--- doc/asciidoc-helper.sh.orig 2022-02-04 16:24:11 UTC
++++ doc/asciidoc-helper.sh
+@@ -12,7 +12,6 @@ if [ $# != 3 ]; then
+ exit 1;
+ fi
+
+-SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
+ export SOURCE_DATE_EPOCH
+
+ output=$3
diff --git a/security/tor/files/patch-orconfig.h.in b/security/tor/files/patch-orconfig.h.in
index c2deb73462ee..6b2a355e48b2 100644
--- a/security/tor/files/patch-orconfig.h.in
+++ b/security/tor/files/patch-orconfig.h.in
@@ -1,6 +1,6 @@
---- orconfig.h.in.orig 2017-11-30 20:34:49 UTC
+--- orconfig.h.in.orig 2022-02-04 16:24:11 UTC
+++ orconfig.h.in
-@@ -517,7 +517,10 @@
+@@ -610,7 +610,10 @@
#undef HAVE_TIME_H
/* Define to 1 if you have the `timingsafe_memcmp' function. */