diff --git a/tor-dev/Makefile b/tor-dev/Makefile index c5c254380be..28e5de91b95 100644 --- a/tor-dev/Makefile +++ b/tor-dev/Makefile @@ -1,6 +1,6 @@ # $NetBSD$ -DISTNAME= tor-0.4.4.3-alpha +DISTNAME= tor-0.4.5.2-alpha PKGNAME= ${DISTNAME:S/tor/tordev/:S/-alpha//:S/-rc/rc0/} CATEGORIES= net security MASTER_SITES= https://dist.torproject.org/ @@ -12,7 +12,7 @@ LICENSE= modified-bsd USE_LANGUAGES= c99 USE_PKGLOCALEDIR= yes -USE_TOOLS+= perl:test pkg-config +USE_TOOLS+= perl:test pkg-config bash:test GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} @@ -21,6 +21,20 @@ CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/tordev CONFIGURE_ENV+= CPP=${CPP:Q} CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR} +# as of 0.4.5.2-alpha: +# FAIL: src/test/unittest_part2.sh +# FAIL: src/test/unittest_part8.sh +# FAIL: src/test/test_include.sh +#============================================================================ +#Testsuite summary for tor 0.4.5.2-alpha +#============================================================================ +## TOTAL: 33 +## PASS: 26 +## SKIP: 4 +## XFAIL: 0 +## FAIL: 3 +## XPASS: 0 +## ERROR: 0 TEST_TARGET= check TOR_USER?= tordev @@ -54,6 +68,14 @@ 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/maint/checkOptionDocs.pl +REPLACE_PERL+= scripts/coccinelle/test-operator-cleanup + .include "options.mk" .include "../../mk/bsd.prefs.mk" diff --git a/tor-dev/distinfo b/tor-dev/distinfo index 0cacffd3eae..72e5359469c 100644 --- a/tor-dev/distinfo +++ b/tor-dev/distinfo @@ -1,8 +1,9 @@ $NetBSD$ -SHA1 (tor-0.4.4.3-alpha.tar.gz) = 4f391b4a3a391c4ae42b3546597945ecc2467b51 -RMD160 (tor-0.4.4.3-alpha.tar.gz) = b517894f605112ad8adf78845a4a6f39617ab936 -SHA512 (tor-0.4.4.3-alpha.tar.gz) = 54753191d17b25966f03f83d210b7a2e433b0810a53c6a6748bcbaa3a4f148f2c75aacdc8d4785d38e250e30559e9f1c490b7bfa1a6b283fa39b2b7fd857e8cc -Size (tor-0.4.4.3-alpha.tar.gz) = 7795304 bytes +SHA1 (tor-0.4.5.2-alpha.tar.gz) = 6cf08dc35864bdd9b46dabe45118d8937f6df8a1 +RMD160 (tor-0.4.5.2-alpha.tar.gz) = 04b2406c7c34b9787239f5b76f5ffc775f673a5d +SHA512 (tor-0.4.5.2-alpha.tar.gz) = ca3f55522b198fd69abc948ef8c9dc14106b7cf6dc38f9308ca7188c713acaa07ac41c532621fc25934bf146721db99d80ca6d0fadf4a5bae7c7931a035341b9 +Size (tor-0.4.5.2-alpha.tar.gz) = 7909432 bytes SHA1 (patch-Makefile.in) = c190295f4702bd1e69531cab1ac61dbab451e48b +SHA1 (patch-configure) = 427005f4fe1b1cc1a40467befec910a02bc5a449 SHA1 (patch-src_app_config_config.c) = bac106e382207cdf22c84a52b45c791de2bdf0f8 diff --git a/tor-dev/patches/patch-configure b/tor-dev/patches/patch-configure new file mode 100644 index 00000000000..61600dc7e34 --- /dev/null +++ b/tor-dev/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD$ + +Avoid unportable test(1) operator. + +--- configure.orig 2020-11-21 20:17:08.000000000 +0000 ++++ configure +@@ -10377,7 +10377,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