[PR PATCH] tor: update to 0.4.8.9, torsocks: depends on tor, adopt.

[PR PATCH] tor: update to 0.4.8.9, torsocks: depends on tor, adopt.

[daniel-eys]

[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]

There is a new pull request by daniel-eys against master on the void-packages repository

https://github.com/daniel-eys/void-packages tor
https://github.com/void-linux/void-packages/pull/47375

tor: update to 0.4.8.9, torsocks: depends on tor, adopt.
- tor: update to 0.4.8.9.
- torsocks: depends on tor, adopt.

Enable Proof of Work DoS mitigation module, this needs `--enable-gpl`.
More information here: https://blog.torproject.org/introducing-proof-of-work-defense-for-onion-services/

Also make `torsocks` depend on `tor` and not the other way round.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47375.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tor-47375.patch --]
[-- Type: text/x-diff, Size: 2694 bytes --]

From bf13d2cd40a83179958754fdbe1e1aaae8d8c282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 24 Nov 2023 10:58:06 +0100
Subject: [PATCH 1/2] tor: update to 0.4.8.9.

---
 srcpkgs/tor/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index f9ecbcc3fbed0..f20f0dad36143 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,19 +1,20 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.8.7
+version=0.4.8.9
 revision=1
 build_style=gnu-configure
+configure_args="--enable-gpl"
 hostmakedepends="pkg-config"
 makedepends="libcap-devel libevent-devel libscrypt-devel libseccomp-devel liblzma-devel zlib-devel libzstd-devel"
-depends="ca-certificates torsocks"
+depends="ca-certificates"
 checkdepends="coccinelle python3"
 short_desc="Anonymizing overlay network"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
-license="BSD-3-Clause"
+license="BSD-3-Clause, GPL-3.0-only"
 homepage="https://www.torproject.org/"
 changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=b20d2b9c74db28a00c07f090ee5b0241b2b684f3afdecccc6b8008931c557491
+checksum=59bb7d8890f6131b4ce5344f3dcea5deb2182b7f4f10ff0cb4e4d81f11b2cf65
 
 case "${XBPS_TARGET_MACHINE}" in
 	# Tests just don't work here

From 30b939384f2d241139400fb1e9b6712a2e9c3a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 24 Nov 2023 11:01:37 +0100
Subject: [PATCH 2/2] torsocks: depends on tor, adopt.

---
 srcpkgs/torsocks/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/torsocks/template b/srcpkgs/torsocks/template
index f1986c45e3f07..3a56ddf70e8c1 100644
--- a/srcpkgs/torsocks/template
+++ b/srcpkgs/torsocks/template
@@ -1,15 +1,17 @@
 # Template file for 'torsocks'
 pkgname=torsocks
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool pkg-config"
+depends="tor"
 conf_files="/etc/tor/torsocks.conf"
 short_desc="Transparent socks proxy for use with tor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://gitlab.torproject.org/tpo/core/torsocks"
+changelog="https://gitlab.torproject.org/tpo/core/torsocks/-/raw/main/ChangeLog"
 distfiles="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${version}/torsocks-v${version}.tar.bz2"
 checksum=54b2e3255b697fb69bb92388376419bcef1f94d511da3980f9ed5cd8a41df3a8
 

Re: [PR PATCH] [Merged]: tor: update to 0.4.8.9, torsocks: depends on tor, adopt.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

There's a merged pull request on the void-packages repository

tor: update to 0.4.8.9, torsocks: depends on tor, adopt.
https://github.com/void-linux/void-packages/pull/47375

Description:
- tor: update to 0.4.8.9.
- torsocks: depends on tor, adopt.

Enable Proof of Work DoS mitigation module, this needs `--enable-gpl`.
More information here: https://blog.torproject.org/introducing-proof-of-work-defense-for-onion-services/

Also make `torsocks` depend on `tor` and not the other way round.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->