diff options
| -rw-r--r-- | net/tor/Makefile | 5 | ||||
| -rw-r--r-- | net/tor/PLIST | 4 | ||||
| -rw-r--r-- | net/tor/distinfo | 11 | ||||
| -rw-r--r-- | net/tor/options.mk | 29 | ||||
| -rw-r--r-- | net/tor/patches/patch-configure | 15 |
5 files changed, 51 insertions, 13 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile index 9ec973ca540..4cdd3c3a38b 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.159 2021/02/03 19:55:27 wiz Exp $ +# $NetBSD: Makefile,v 1.160 2021/02/15 19:01:31 wiz Exp $ -DISTNAME= tor-0.4.4.7 +DISTNAME= tor-0.4.5.6 CATEGORIES= net security MASTER_SITES= https://dist.torproject.org/ @@ -66,7 +66,6 @@ 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" diff --git a/net/tor/PLIST b/net/tor/PLIST index c93fb70decf..b9914c95f02 100644 --- a/net/tor/PLIST +++ b/net/tor/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.14 2019/01/08 08:39:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2021/02/15 19:01:31 wiz Exp $ bin/tor -bin/tor-gencert +${PLIST.gencert}bin/tor-gencert bin/tor-print-ed-signing-cert bin/tor-resolve bin/torify diff --git a/net/tor/distinfo b/net/tor/distinfo index 37eac74ea82..c96ff9cd655 100644 --- a/net/tor/distinfo +++ b/net/tor/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.111 2021/02/03 19:55:27 wiz Exp $ +$NetBSD: distinfo,v 1.112 2021/02/15 19:01:31 wiz Exp $ -SHA1 (tor-0.4.4.7.tar.gz) = 5e360c61792320e8306db3c5d12ff81780b03104 -RMD160 (tor-0.4.4.7.tar.gz) = 6a9fa849da4229a417c24e52dfe67ec0d8a96614 -SHA512 (tor-0.4.4.7.tar.gz) = 356e9569eb79d81bccba1360d10af7d78f3824d5a4827fc95272a952fc8e5bebdfa9ec99fa82992c025625d6da963c15803acbabd66cd59c587c1e042af16acc -Size (tor-0.4.4.7.tar.gz) = 7812645 bytes +SHA1 (tor-0.4.5.6.tar.gz) = 4bcb5cbe8aeb857615b2c9107de6980e4b416d81 +RMD160 (tor-0.4.5.6.tar.gz) = 5c76b6154e2156241b195ce743d8085e1dabfc81 +SHA512 (tor-0.4.5.6.tar.gz) = 3759657a997f4aabdfef6ad3f5da16085a1dd3353015db8283a21fcb1d658ca390bc3c36387a89c99baf2069c6e1d392a1fef4b3eba24ee1f2b408acbc103f9d +Size (tor-0.4.5.6.tar.gz) = 7926711 bytes +SHA1 (patch-configure) = 59d0245fc0c21f4dedf62df396100a899361611c diff --git a/net/tor/options.mk b/net/tor/options.mk index c99de6531ca..afc8fcadc0a 100644 --- a/net/tor/options.mk +++ b/net/tor/options.mk @@ -1,12 +1,13 @@ -# $NetBSD: options.mk,v 1.15 2021/02/03 19:55:27 wiz Exp $ +# $NetBSD: options.mk,v 1.16 2021/02/15 19:01:31 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor -PKG_SUPPORTED_OPTIONS= doc # rust -PKG_SUGGESTED_OPTIONS+= doc +PKG_SUPPORTED_OPTIONS= doc lzma nss zstd # rust +PKG_SUGGESTED_OPTIONS+= doc zstd .include "../../mk/bsd.options.mk" PLIST_VARS+= doc +PLIST_VARS+= gencert ### ### This enables the build of manual pages. It requires asciidoc @@ -50,3 +51,25 @@ CONFIGURE_ARGS+= --disable-asciidoc #.else CONFIGURE_ARGS+= --disable-rust #.endif + +.if !empty(PKG_OPTIONS:Mlzma) +CONFIGURE_ARGS+= --enable-lzma +.include "../../archivers/lzmalib/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-lzma +.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 diff --git a/net/tor/patches/patch-configure b/net/tor/patches/patch-configure new file mode 100644 index 00000000000..a2c9fbefef5 --- /dev/null +++ b/net/tor/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.3 2021/02/15 19:01:31 wiz Exp $ + +Fix unportable test(1) operator. + +--- configure.orig 2021-02-15 15:47:45.000000000 +0000 ++++ configure +@@ -10385,7 +10385,7 @@ else + + # This is a kludge to figure out whether compilation failed, or whether + # running the program failed. +- if test "$ac_retval" == "1"; then ++ if test "$ac_retval" = "1"; then + openssl_ver_mismatch=inconclusive + else + openssl_ver_mismatch=yes |