Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jan 2025 08:56:23 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: edf6afad8010 - main - security/tor: Add POW option for the Proof of Work module
Message-ID:  <202501230856.50N8uNcA063722@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=edf6afad80106bc46f2d62f81a56bee3ad2d1cb6

commit edf6afad80106bc46f2d62f81a56bee3ad2d1cb6
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-01-23 08:49:58 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-01-23 08:49:58 +0000

    security/tor: Add POW option for the Proof of Work module
    
    POW=ON changes icense to GPL.
    
    Suggested by:   antonialli <antonialli@proton.me>
---
 security/tor/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/security/tor/Makefile b/security/tor/Makefile
index 052e6a760d28..fbc3533067df 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tor
 DISTVERSION=	0.4.8.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	TOR
 
@@ -9,7 +9,6 @@ COMMENT=	Anonymizing overlay network for TCP
 WWW=		https://www.torproject.org/
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 cpe gmake pkgconfig # should be compiler:c99 or compiler:gnu99
 USE_CSTD=	gnu99 # until this bug report is closed: https://trac.torproject.org/projects/tor/ticket/27900
@@ -22,11 +21,11 @@ CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC
+OPTIONS_DEFINE=	DOCS MANPAGES POW STATIC_TOR TCMALLOC
 OPTIONS_GROUP=	COMPRESSION TRACING
 OPTIONS_GROUP_COMPRESSION=	ZSTD LZMA
 OPTIONS_GROUP_TRACING=	LTTNG USDT LOG_DEBUG
-OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
+OPTIONS_DEFAULT=	MANPAGES POW LZMA ZSTD
 OPTIONS_SUB=	yes
 STATIC_TOR_DESC=	Build a static tor
 COMPRESSION_DESC=	Supported compression libraries
@@ -42,6 +41,9 @@ USERS=		_tor
 
 CONFLICTS_INSTALL=	tor-devel
 
+POW_DESC=		Enable PoW (Proof of Work) module (licence changes to GPL)
+POW_CONFIGURE_ENABLE=	gpl # gpl enables POW
+
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
@@ -70,6 +72,12 @@ BUILD_DEPENDS+=	asciidoc:textproc/asciidoc
 CONFIGURE_ARGS+=	--disable-asciidoc
 .endif
 
+.if ${PORT_OPTIONS:MPOW}
+LICENSE=	GPLv3
+.else
+LICENSE_FILE=	${WRKSRC}/LICENSE # BSD license file
+.endif
+
 .if !defined(USE_GCC) && \
 empty(PORT_OPTIONS:MSTATIC_TOR)
 CONFIGURE_ARGS+=	--enable-gcc-hardening



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501230856.50N8uNcA063722>