pkg/46598: net/tor needs absolute path substitution for bin/torify

[bjs%NetBSD.org@localhost]

>Number:         46598
>Category:       pkg
>Synopsis:       net/tor needs absolute path substitution for bin/torify
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 14 03:25:00 +0000 2012
>Originator:     Blair Sadewitz
>Release:        6.99.7
>Organization:
>Environment:
NetBSD apoptosis 6.99.7 NetBSD 6.99.7 (XEN3_DOMU) #0: Mon Jun 11 12:46:54 UTC 
2012  
builds%b7.netbsd.org@localhost:/home/builds/ab/HEAD/amd64/201206111100Z-obj/home/builds/ab/HEAD/src/sys/arch/amd64/compile/XEN3_DOMU
 amd64

>Description:
The bin/torify script has an embedded absolute pathname, TSOCKS_CONF_FILE.
>How-To-Repeat:
Try to use it.
>Fix:
Hey, this one is right out of the manual!


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- Makefile    17 Dec 2011 12:39:43 -0000      1.85
+++ Makefile    14 Jun 2012 03:12:17 -0000
@@ -56,6 +56,12 @@
 FILES_SUBST+=          PKG_HOME=${PKG_HOME}
 FILES_SUBST+=          TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}

+SUBST_CLASSES+=                fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths=         contrib/torify.in
+SUBST_SED.fix-paths=           -e 's,"/etc/tor,"${PKG_SYSCONFDIR},g'
+
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples

 CHECK_PORTABILITY_SKIP+=contrib/*