CVS commit: pkgsrc/net/tor

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar 25 00:36:06 UTC 2019

Modified Files:
        pkgsrc/net/tor: Makefile distinfo
Added Files:
        pkgsrc/net/tor/patches: patch-Makefile.in

Log Message:
net/tor: Add missing dependency to makefile

The upstream Makefile.in fails to express a dependency.  However,
instead of the usual situation where a -j1 build works and a parallel
build sometimes fails, the -j1 build reliably fails and a -j4 or -j10
occasionally works.


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/net/tor/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/net/tor/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/tor/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/net/tor/Makefile
diff -u pkgsrc/net/tor/Makefile:1.138 pkgsrc/net/tor/Makefile:1.139
--- pkgsrc/net/tor/Makefile:1.138       Tue Mar 19 15:44:19 2019
+++ pkgsrc/net/tor/Makefile     Mon Mar 25 00:36:06 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2019/03/19 15:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2019/03/25 00:36:06 gdt Exp $
 
 DISTNAME=      tor-0.3.5.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net security
 MASTER_SITES=  https://dist.torproject.org/
 

Index: pkgsrc/net/tor/distinfo
diff -u pkgsrc/net/tor/distinfo:1.97 pkgsrc/net/tor/distinfo:1.98
--- pkgsrc/net/tor/distinfo:1.97        Fri Feb 22 08:47:51 2019
+++ pkgsrc/net/tor/distinfo     Mon Mar 25 00:36:06 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.97 2019/02/22 08:47:51 adam Exp $
+$NetBSD: distinfo,v 1.98 2019/03/25 00:36:06 gdt Exp $
 
 SHA1 (tor-0.3.5.8.tar.gz) = 43ce6638a54190b58b62537e1c0892f95552d407
 RMD160 (tor-0.3.5.8.tar.gz) = f94869f6f11277a7c786f8355c528912ab55733b
 SHA512 (tor-0.3.5.8.tar.gz) = 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
 Size (tor-0.3.5.8.tar.gz) = 6994335 bytes
+SHA1 (patch-Makefile.in) = 112331d65db45e9282110148b2e6f2bd1b8169ad

Added files:

Index: pkgsrc/net/tor/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/tor/patches/patch-Makefile.in:1.1
--- /dev/null   Mon Mar 25 00:36:06 2019
+++ pkgsrc/net/tor/patches/patch-Makefile.in    Mon Mar 25 00:36:06 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/03/25 00:36:06 gdt Exp $
+
+In addition to the two files said to depend on micro-revision.i, there
+is a third not listed, causing frequent build failures.
+
+\todo Send upstream after evaluating the fix for correctness.
+
+--- Makefile.in.orig   2019-02-21 15:27:23.000000000 +0000
++++ Makefile.in
+@@ -20088,6 +20088,7 @@ uninstall-man: uninstall-man1
+ # Declare that these object files depend on micro-revision.i.  Without this
+ # rule, we could try to build them before micro-revision.i was created.
+ src/lib/log/git_revision.$(OBJEXT) \
++  src/lib/log/libtor_log_testing_a-git_revision.$(OBJEXT) \
+   src/lib/log/src_lib_libtor_log_testing_a-git_revision.$(OBJEXT): \
+       micro-revision.i
+