[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[Sam James]

commit:     3892b973f9dabb5a5f0cd304d96475223ccbc34d
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed May 31 14:16:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  7 16:19:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3892b973

net-vpn/tor: update upstream libressl patch

With LibreSSL 3.8.0 some functions which have been deprecated in OpenSSL
3.0 were removed for security reasons. This patch which was accepted
upstream by Tor disables some code that uses one of these functions with
the newer LibreSSL 3.8.0 version.

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/713
Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/9850dc59c0db5cbcadc314be8d324a992880fce1
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31245
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/tor/files/tor-0.4.7.13-libressl.patch | 41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/net-vpn/tor/files/tor-0.4.7.13-libressl.patch b/net-vpn/tor/files/tor-0.4.7.13-libressl.patch
index 76d52fd1c54e..bba0c45f3fc3 100644
--- a/net-vpn/tor/files/tor-0.4.7.13-libressl.patch
+++ b/net-vpn/tor/files/tor-0.4.7.13-libressl.patch
@@ -1,5 +1,7 @@
 Upstream-MR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/598
 Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/da52d7206a4a8e4fa8b5e80b5ed73de50fbe8692
+Upstream-MR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/713
+Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/9850dc59c0db5cbcadc314be8d324a992880fce1
 
 From f3dabd705f26c56076934323f24b5b05ecdfd39c Mon Sep 17 00:00:00 2001
 From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
@@ -159,3 +161,42 @@ index 0000000000..faf04941b6
 -- 
 GitLab
 
+From 9850dc59c0db5cbcadc314be8d324a992880fce1 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 29 May 2023 12:56:37 -0700
+Subject: [PATCH] tls: Disable a warning with LibreSSL >= 3.8.0
+
+Skip a warning using EC_GFp_nist_method() which was removed in LibreSSL
+3.8.
+
+Based on a patch from OpenBSD.
+
+https://github.com/openbsd/ports/commit/33fe251a08cb11f30ce6094a2e0759c3bb63ed16
+
+These functions are deprecated since OpenSSL 3.0.
+
+https://www.openssl.org/docs/man3.1/man3/EC_GFp_nist_method.html
+---
+ src/lib/tls/tortls_openssl.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
+index 12260c09d3..c0a89ac272 100644
+--- a/src/lib/tls/tortls_openssl.c
++++ b/src/lib/tls/tortls_openssl.c
+@@ -340,8 +340,10 @@ tor_tls_init(void)
+     SSL_load_error_strings();
+ #endif /* defined(OPENSSL_1_1_API) */
+ 
+-#if (SIZEOF_VOID_P >= 8 &&                              \
+-     OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1))
++#if (SIZEOF_VOID_P >= 8 &&                                \
++     OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1) && \
++     (!defined(LIBRESSL_VERSION_NUMBER) ||                \
++      LIBRESSL_VERSION_NUMBER < 0x3080000fL))
+     long version = tor_OpenSSL_version_num();
+ 
+     /* LCOV_EXCL_START : we can't test these lines on the same machine */
+-- 
+GitLab
+

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[Conrad Kostecki]

commit:     8c6c131d3fa2d58c5b3ed38ceeee86372a0227c3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 23 17:43:21 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 19:01:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6c131d

net-vpn/tor: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22372
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch   | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch b/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
deleted file mode 100644
index 31234c735bc..00000000000
--- a/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/770370
-diff --git a/src/app/include.am b/src/app/include.am
-index 8bb315fff1..2e2180deca 100644
---- a/src/app/include.am
-+++ b/src/app/include.am
-@@ -28,7 +28,7 @@ src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES)
- src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
- src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
- src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
--	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
-+	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
- src_app_tor_cov_LDADD = src/test/libtor-testing.a \
- 	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
- 	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
-diff --git a/Makefile.in b/Makefile.in
-index 8e29bf3..5c9d3e5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -6674,7 +6674,7 @@ src_app_tor_LDADD = libtor.a \
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
--@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
-+@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
- 
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDADD = src/test/libtor-testing.a \
- @COVERAGE_ENABLED_TRUE@	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[Conrad Kostecki]

commit:     d68f1209ab883cedb6882c8be8140f21061ed156
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 27 19:56:01 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 20:16:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68f1209

net-vpn/tor: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21811
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch
deleted file mode 100644
index 76e88bbaba9..00000000000
--- a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/contrib/dist/tor.service.in	2017-11-11 13:40:46.000000000 -0500
-+++ b/contrib/dist/tor.service.in	2018-02-24 19:06:12.307506884 -0500
-@@ -21,6 +21,9 @@
- LimitNOFILE=32768
- 
- # Hardening
-+Group=tor
-+RuntimeDirectory=tor
-+RuntimeDirectoryMode=0770
- PrivateTmp=yes
- PrivateDevices=yes
- ProtectHome=yes

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[Anthony G. Basile]

commit:     f227722412f34dc65619bbfaa71a14991bf13797
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Feb  5 08:16:06 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 22:05:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2277224

net-vpn/tor: remove unused files

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 net-vpn/tor/files/tor.initd-r8 | 37 -------------------------------------
 net-vpn/tor/files/torrc-r1     |  7 -------
 2 files changed, 44 deletions(-)

diff --git a/net-vpn/tor/files/tor.initd-r8 b/net-vpn/tor/files/tor.initd-r8
deleted file mode 100644
index de9b66eb555..00000000000
--- a/net-vpn/tor/files/tor.initd-r8
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/tor
-pidfile=/var/run/tor/tor.pid
-command_args="--hush --runasdaemon 1 --pidfile \"${pidfile}\""
-retry=${GRACEFUL_TIMEOUT:-60}
-stopsig=INT
-command_progress=yes
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-description="Anonymizing overlay network for TCP"
-description_checkconfig="Check for valid config file"
-description_reload="Reload the configuration"
-
-checkconfig() {
-	${command} --verify-config --hush > /dev/null 2>&1
-	if [ $? -ne 0 ] ; then
-		eerror "Tor configuration (/etc/tor/torrc) is not valid."
-		eerror "Example is in /etc/tor/torrc.sample"
-		return 1
-	fi
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon -s HUP --pidfile ${pidfile}
-	eend $?
-}

diff --git a/net-vpn/tor/files/torrc-r1 b/net-vpn/tor/files/torrc-r1
deleted file mode 100644
index 322a794aa1d..00000000000
--- a/net-vpn/tor/files/torrc-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-PIDFile /var/run/tor/tor.pid
-Log notice syslog
-DataDirectory /var/lib/tor/data

[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/

[Anthony G. Basile]

commit:     29ca1f7819b2cf56d049dd81c24fe4214a9f500f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 11:51:27 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 11:51:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ca1f78

net-vpn/tor: remove orphaned files, bug #640466

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-vpn/tor/files/tor.conf    |  1 -
 net-vpn/tor/files/tor.service | 21 ---------------------
 2 files changed, 22 deletions(-)

diff --git a/net-vpn/tor/files/tor.conf b/net-vpn/tor/files/tor.conf
deleted file mode 100644
index 188c041e544..00000000000
--- a/net-vpn/tor/files/tor.conf
+++ /dev/null
@@ -1 +0,0 @@
-d       /var/run/tor        0775    tor     tor     -       -

diff --git a/net-vpn/tor/files/tor.service b/net-vpn/tor/files/tor.service
deleted file mode 100644
index 8fcc6740ed9..00000000000
--- a/net-vpn/tor/files/tor.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=The Onion Router
-
-[Service]
-ExecStartPre=/usr/bin/tor --verify-config -f /etc/tor/torrc
-ExecStart=/usr/bin/tor --RunAsDaemon 0 -f /etc/tor/torrc
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-TimeoutStopSec=32
-LimitNOFILE=30000
-
-# Hardening options:
-CapabilityBoundingSet = CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
-PrivateTmp = yes
-PrivateDevices = yes
-ProtectHome = yes
-ProtectSystem = full
-NoNewPrivileges = yes
-
-[Install]
-WantedBy=multi-user.target