summaryrefslogtreecommitdiff
path: root/net/tor
diff options
context:
space:
mode:
Diffstat (limited to 'net/tor')
-rw-r--r--net/tor/Makefile33
-rw-r--r--net/tor/PLIST5
-rw-r--r--net/tor/distinfo10
-rw-r--r--net/tor/options.mk65
4 files changed, 44 insertions, 69 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile
index f5cd40eb3dd..261dc9d9800 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.169 2021/06/14 17:46:43 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2021/06/27 21:18:38 wiz Exp $
-DISTNAME= tor-0.4.5.9
+DISTNAME= tor-0.4.6.5
CATEGORIES= net security
MASTER_SITES= https://dist.torproject.org/
@@ -11,18 +11,24 @@ LICENSE= modified-bsd
USE_LANGUAGES= c99
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= perl:test pkg-config
-# There are multiple reports of failure to build with BSD make, due to
-# an apparent lack of firing the rule to create micro-revision.i.
-# Work around this by using gmake, which is tiny compared to the
-# existing perl dependency, and unlikely to be needed on any given
-# system just for tor.
-USE_TOOLS+= gmake bash:test
+USE_TOOLS+= perl:test pkg-config bash:test
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ENV+= CPP=${CPP:Q}
-
+CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
+
+#============================================================================
+#Testsuite summary for tor 0.4.6.5
+#============================================================================
+## TOTAL: 33
+## PASS: 29
+## SKIP: 4
+## XFAIL: 0
+## FAIL: 0
+## XPASS: 0
+## ERROR: 0
+#============================================================================
TEST_TARGET= check
TOR_USER?= tor
@@ -56,7 +62,12 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
CHECK_PORTABILITY_SKIP+= contrib/*
+REPLACE_BASH+= scripts/maint/checkShellScripts.sh
+REPLACE_BASH+= scripts/maint/run_check_subsystem_order.sh
+
+REPLACE_PERL+= scripts/maint/checkOptionDocs.pl.in
REPLACE_PERL+= scripts/maint/checkSpace.pl
+REPLACE_PERL+= scripts/coccinelle/test-operator-cleanup
.include "options.mk"
@@ -66,9 +77,9 @@ REPLACE_PERL+= scripts/maint/checkSpace.pl
CFLAGS+= -c99
.endif
+.include "../../archivers/zstd/buildlink3.mk"
BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tor/PLIST b/net/tor/PLIST
index b9914c95f02..767a572cb12 100644
--- a/net/tor/PLIST
+++ b/net/tor/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2021/02/15 19:01:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/06/27 21:18:38 wiz Exp $
bin/tor
-${PLIST.gencert}bin/tor-gencert
+${PLIST.openssl}bin/tor-gencert
bin/tor-print-ed-signing-cert
bin/tor-resolve
bin/torify
@@ -14,7 +14,6 @@ ${PLIST.doc}share/doc/tor/tor-print-ed-signing-cert.html
${PLIST.doc}share/doc/tor/tor-resolve.html
${PLIST.doc}share/doc/tor/tor.html
${PLIST.doc}share/doc/tor/torify.html
-share/examples/rc.d/tor
share/examples/tor/torrc.sample
share/tor/geoip
share/tor/geoip6
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 721b8acef4f..6a4fe095538 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.115 2021/06/14 17:46:43 wiz Exp $
+$NetBSD: distinfo,v 1.116 2021/06/27 21:18:38 wiz Exp $
-SHA1 (tor-0.4.5.9.tar.gz) = adbfefa54a23c6e7418561bd042442ee6fc50bfc
-RMD160 (tor-0.4.5.9.tar.gz) = c3933bbd8ceec45813ae736ad72b65d7935a76b2
-SHA512 (tor-0.4.5.9.tar.gz) = b3c3b5cce30c881fb1e705ec6183513f625ddb9d076671b9cd6299e81a410bc12f59a30677636371c336e397211432f0831bdcb2105c9aed8dcb608eae54e2b2
-Size (tor-0.4.5.9.tar.gz) = 7840294 bytes
+SHA1 (tor-0.4.6.5.tar.gz) = 49bfc6faa704302e41cd2f577a9feedae1370db5
+RMD160 (tor-0.4.6.5.tar.gz) = e773423c05ea9557c109a85cdee15b731ce4340b
+SHA512 (tor-0.4.6.5.tar.gz) = 62bcd8d446199cdd397a688d454730a057ef20be4152e6d0632f64df27c993c70be0dbde0a2e7679a8a20850371a503b8daf777296d555760d8aae3286e48050
+Size (tor-0.4.6.5.tar.gz) = 7754823 bytes
diff --git a/net/tor/options.mk b/net/tor/options.mk
index 955b36d13a9..b0694f2df76 100644
--- a/net/tor/options.mk
+++ b/net/tor/options.mk
@@ -1,13 +1,15 @@
-# $NetBSD: options.mk,v 1.18 2021/02/20 09:08:58 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2021/06/27 21:18:38 wiz Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.tor
-PKG_SUPPORTED_OPTIONS= doc lzma nss zstd # rust
-PKG_SUGGESTED_OPTIONS+= doc lzma zstd
+# XXX Add rust to supported options.
+PKG_OPTIONS_VAR= PKG_OPTIONS.tor
+PKG_SUPPORTED_OPTIONS= doc
+PKG_OPTIONS_REQUIRED_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl= nss openssl
+PKG_SUGGESTED_OPTIONS+= doc openssl
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= doc
-PLIST_VARS+= gencert
+PLIST_VARS+= doc openssl
###
### This enables the build of manual pages. It requires asciidoc
@@ -22,54 +24,17 @@ PLIST.doc= yes
CONFIGURE_ARGS+= --disable-asciidoc
.endif
-### This enables building tor with rust as per
-### https://trac.torproject.org/projects/tor/wiki/RustInTor
-### XXX:
-### As of 0.4.4.6 I am not sure how this is supposed to work.
-### https://gitlab.torproject.org/tpo/core/tor/-/issues/40191
-#.if !empty(PKG_OPTIONS:Mrust)
-#CONFIGURE_ENV+= TOR_RUST_DEPENDENCIES=${WRKDIR}/vendor
-#CONFIGURE_ARGS+= --enable-rust
-#CARGO_CRATE_DEPENDS+= digest-0.7.2
-#CARGO_CRATE_DEPENDS+= generic-array-0.9.0
-#CARGO_CRATE_DEPENDS+= libc-0.2.39
-#CARGO_CRATE_DEPENDS+= rand-0.5.0-pre.2
-#CARGO_CRATE_DEPENDS+= rand_core-0.2.0-pre.0
-#CARGO_CRATE_DEPENDS+= typenum-1.9.0
-
-#RUST_REQ= 1.34.0
-#.include "../../lang/rust/cargo.mk"
-
-#pre-configure:
-# cd ${WRKSRC} && ${MKDIR} -p src/rust/target/release
-
-#.PHONY: show-tor-cargo-depends
-## \todo: Maybe we should add a path option to show-cargo-depends.
-#show-tor-cargo-depends:
-# ${RUN}${AWK} '/^\"checksum/ { print "CARGO_CRATE_DEPENDS+=\t" $$2 "-" $$3""; next } ' ${WRKSRC}/src/rust/Cargo.lock
-
-#.else
-CONFIGURE_ARGS+= --disable-rust
-#.endif
-
-.if !empty(PKG_OPTIONS:Mlzma)
-CONFIGURE_ARGS+= --enable-lzma
-.include "../../archivers/xz/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-lzma
+.if !empty(PKG_OPTIONS:Mopenssl)
+PLIST.openssl= yes
+.include "../../security/openssl/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mnss)
CONFIGURE_ARGS+= --enable-nss
.include "../../devel/nss/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-nss
-PLIST.gencert= yes
.endif
-.if !empty(PKG_OPTIONS:Mzstd)
-CONFIGURE_ARGS+= --enable-zstd
-.include "../../archivers/zstd/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-zstd
-.endif
+#.if !empty(PKG_OPTIONS:Mrust)
+#CONFIGURE_ARGS+= --enable-rust
+#.include "../../lang/rust/buildlink3.mk"
+#.endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 20:47:52 +0000