CVS commit: pkgsrc

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Sun Nov 24 18:42:16 UTC 2019

Modified Files:
        pkgsrc/mk/defaults: options.description
        pkgsrc/net/tor: distinfo options.mk

Log Message:
net/tor: Add rust option to build the rust features in tor.


To generate a diff of this commit:
cvs rdiff -u -r1.598 -r1.599 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/tor/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/tor/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.598 pkgsrc/mk/defaults/options.description:1.599
--- pkgsrc/mk/defaults/options.description:1.598        Mon Nov  4 05:53:29 2019
+++ pkgsrc/mk/defaults/options.description      Sun Nov 24 18:42:15 2019
@@ -662,6 +662,7 @@ rtmp                        Enable rtmp:// support using rtmp
 rtree                  Enable R-tree support.
 ruby                   Enable Ruby support.
 ruby-build-ri-db       Build and install database for Ruby's ri utility.
+rust                   Enable Rust support.
 samba                  Enable Samba file and print services support.
 samplerate             Enable libsamplerate support.
 sane                   Enable support for SANE scanners.

Index: pkgsrc/net/tor/distinfo
diff -u pkgsrc/net/tor/distinfo:1.101 pkgsrc/net/tor/distinfo:1.102
--- pkgsrc/net/tor/distinfo:1.101       Sat Sep 21 23:57:17 2019
+++ pkgsrc/net/tor/distinfo     Sun Nov 24 18:42:16 2019
@@ -1,6 +1,30 @@
-$NetBSD: distinfo,v 1.101 2019/09/21 23:57:17 alnsn Exp $
+$NetBSD: distinfo,v 1.102 2019/11/24 18:42:16 ng0 Exp $
 
+SHA1 (digest-0.7.2.crate) = 5b9c88bbbd10db277eb81489d4fd98222c81f654
+RMD160 (digest-0.7.2.crate) = e1754858a8cc3376e4b1faaa2ab950f5c5a9ff26
+SHA512 (digest-0.7.2.crate) = 8232be4fbc7a77d437933d18423ed6c113abbc84084ceb998fac26413b374266975fd3c00e90131985c800dd0b83ff006dd9e77629d2e6ee19638bd67295ff85
+Size (digest-0.7.2.crate) = 8386 bytes
+SHA1 (generic-array-0.9.0.crate) = 1cd2878b30397e19cd189367dd8a4ea71a14e2ec
+RMD160 (generic-array-0.9.0.crate) = 45975a0df06c24fe628f007f7cd77fc1c8ceb1d9
+SHA512 (generic-array-0.9.0.crate) = e2a00d8856a4231a5c29bae592b2a84b98c70737058104fd67570af1220259994d11cb4506f1a1412f3c8a04576fe2617ef015600f677ecfccc8ff7a07425400
+Size (generic-array-0.9.0.crate) = 10702 bytes
+SHA1 (libc-0.2.39.crate) = 426579d6ce98e82c0531ebff2464582d0aea0567
+RMD160 (libc-0.2.39.crate) = 19f01e69a28f2d606d09eb8a8661e8ddceed782f
+SHA512 (libc-0.2.39.crate) = 4b399306da2f4d85e84db5a0a2212bc784b6ab1fb0d4731b58256e47684b5a244dcad8a12088035985e933ca2880dca5ada7dc822443d1cf474f4e73bbe59aa1
+Size (libc-0.2.39.crate) = 325829 bytes
+SHA1 (rand-0.5.0-pre.2.crate) = e55aa9ab4bb44ac92d40da0d99a64efdb2e33464
+RMD160 (rand-0.5.0-pre.2.crate) = 74a094353fee28574d1ec86b9587ca30701685a0
+SHA512 (rand-0.5.0-pre.2.crate) = 7f7f9c77367c2f6c310ad8f15074b85af615c8c0777a1bcbdd2e56410ea057e932fe20263e747d78e1b940abe02d6ada9e4d66ec743b169eb78895b220f5aa7b
+Size (rand-0.5.0-pre.2.crate) = 132485 bytes
+SHA1 (rand_core-0.2.0-pre.0.crate) = 21ea25e01766a26dbbd71997c5c3f358f3454980
+RMD160 (rand_core-0.2.0-pre.0.crate) = cbd3dc9ad06727ca36c296f4d33ec695e25b7bb9
+SHA512 (rand_core-0.2.0-pre.0.crate) = b14f88e529fe99b7b9774fc8e1233b44192e253a8a27bfc4da1a7ae99104b6b697068bd19faab85df3427e557a5182892f81f481dd89e8eb6921ec390ca752e9
+Size (rand_core-0.2.0-pre.0.crate) = 19211 bytes
 SHA1 (tor-0.4.1.6.tar.gz) = 43dbea19932ec589c498d27f64df41816d9043c7
 RMD160 (tor-0.4.1.6.tar.gz) = 4d4ccc798a057a75e6d5282d01ddaf306341e0f4
 SHA512 (tor-0.4.1.6.tar.gz) = 9e4625216e25b9498d6054a9920e5a8932ca7b28c5131062eac637b69c80cdf05bc3fd008b833e5359d8849e256f1f405abd56b07f50fd91077b153ba60503da
 Size (tor-0.4.1.6.tar.gz) = 7390096 bytes
+SHA1 (typenum-1.9.0.crate) = 76b18bc10204c28798cd32d10fd0df349d4cb5e4
+RMD160 (typenum-1.9.0.crate) = 6468f8efe8e91edac71dfd4e28c46581a2f0d457
+SHA512 (typenum-1.9.0.crate) = 8b72af1e370cf9d9308287baf4fc7c6096c4923d1c52fe0313c23c84077d74196aa4d997ecf195842d8242c871b0fd0da111f7914664be1841c97315e3ba6abb
+Size (typenum-1.9.0.crate) = 57747 bytes

Index: pkgsrc/net/tor/options.mk
diff -u pkgsrc/net/tor/options.mk:1.8 pkgsrc/net/tor/options.mk:1.9
--- pkgsrc/net/tor/options.mk:1.8       Sat May 13 20:25:44 2017
+++ pkgsrc/net/tor/options.mk   Sun Nov 24 18:42:16 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.8 2017/05/13 20:25:44 alnsn Exp $
+# $NetBSD: options.mk,v 1.9 2019/11/24 18:42:16 ng0 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor
-PKG_SUPPORTED_OPTIONS= doc
+PKG_SUPPORTED_OPTIONS= doc rust
 PKG_SUGGESTED_OPTIONS+=        doc
 
 .include "../../mk/bsd.options.mk"
@@ -20,3 +20,27 @@ PLIST.doc=           yes
 .else
 CONFIGURE_ARGS+=       --disable-asciidoc
 .endif
+
+### This enables building tor with rust as per
+### https://trac.torproject.org/projects/tor/wiki/RustInTor
+.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
+
+.include "../../lang/rust/cargo.mk"
+BUILDLINK_DEPMETHOD.rust=      build
+BUILDLINK_API_DEPENDS.rust+=   rust>=1.34.0
+.include "../../lang/rust/buildlink3.mk"
+
+pre-configure:
+       cd ${WRKSRC} && ${MKDIR} -p src/rust/target/release
+
+.else
+CONFIGURE_ARGS+=       --disable-rust
+.endif