From nobody Thu Jan 23 08:56:23 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ydvtw0GvLz5lrhy; Thu, 23 Jan 2025 08:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ydvtv6XCTz3mFw; Thu, 23 Jan 2025 08:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737622583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bF8c5wihC8LAQ10vUyIchO/Vugzz9h/xEJSPGYVUIJ4=; b=LAS+eVcPy5VZDrqtwx0tavwC+OcVPhqi1tH0wzzG5LQyPLipWZsYE/kex7LnIHg1Few1UI LWndcS7gEeDD0WZuC+rUMHURqs4HiwMRLDNVQtwqYuub6BY++B1vEdbxZYzlDHqGzoN6A6 XEfGz4znZ7UyeaDTwtjltiGZ3qk/dkMmzmlGQanq3tMyi55JOxa/z0pJsUCchc9PC8YjSs rgiWix7q6Sit4AvmOoDkkF1/Qym+qI+G3UXPpuaHAH8Ci2bQ1cCfP5u65pvTTMMA60kC6N HLVo+mkahY+Z8HyPOk1NMZzBtjVTu0DQHes03Maz4cUsq4H7jnVTGcWsJa95Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737622583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bF8c5wihC8LAQ10vUyIchO/Vugzz9h/xEJSPGYVUIJ4=; b=MoBpPza/DhHNqI3tkoHSanHNeMB+TgtdWzI01+gy2xmSbJUCeB89ke6eCmmwj1QX+2DHIl xlb/GQ7hN7D9I0O2j0fnGGcRdZKTdglmOhNnjMzxmXzeJgwDkdRYdIAWYXoyFJHZu9OwXT SW8g0czfxkdrJTKxc994NtJgDSgUIlPFXyekllLqkQNWXvDLky8Pj8aycKQ7zcx/HBRl9G X3QL2RLr1fMrZ187TdZ3sZ90Tx5wh1byyOa/Y9mpAO6ihmzMscGFXqSKT712qSFC0wZ8zx M3SuQ31B35eonbrKpM+wwJgjsZRCqyJ0hGY/IZuUzcLfG8JCABvJk0dZRp8Ddw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737622583; a=rsa-sha256; cv=none; b=qTsS7WdYvlA6HOug/nTLxjE3fATpDf+kP6su7sBmYxUaAi7SRcCd8DGKP1mvi88FBruza/ sIVRwyeW0auqNyBb54OZllGGHUbqZ0/423eZF1KV0irDQtp2UmHfEH88NcC/T3f8AnZsjZ XxnUS+CFT6Vl4Vy6FwOPZ2ARYUEybn2QzO1MQlc0JTy69+L12FGMyFwFEoLXWmKhxliMMl Cz+kZFSYQT1IDWGKLd0k3mAxYPkQeszlU8/0n2nmVeCxoSNN2EZJx4/CAeYUhV4xhc1hrY +5ZlzfPyvxh9OOMlle5R5em0+UPK4YHx8+xZvN/42nTCnpguGaw9dVWtehx1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ydvtv5fZwzXWH; Thu, 23 Jan 2025 08:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50N8uN4e063725; Thu, 23 Jan 2025 08:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N8uNcA063722; Thu, 23 Jan 2025 08:56:23 GMT (envelope-from git) Date: Thu, 23 Jan 2025 08:56:23 GMT Message-Id: <202501230856.50N8uNcA063722@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: edf6afad8010 - main - security/tor: Add POW option for the Proof of Work module List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edf6afad80106bc46f2d62f81a56bee3ad2d1cb6 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=edf6afad80106bc46f2d62f81a56bee3ad2d1cb6 commit edf6afad80106bc46f2d62f81a56bee3ad2d1cb6 Author: Yuri Victorovich AuthorDate: 2025-01-23 08:49:58 +0000 Commit: Yuri Victorovich 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 --- 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