NetBSD Problem Report #52930

From www@NetBSD.org  Wed Jan 17 13:44:23 2018
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 3540B7A1DC
	for <gnats-bugs@gnats.NetBSD.org>; Wed, 17 Jan 2018 13:44:23 +0000 (UTC)
Message-Id: <20180117134421.F149D80384@mollari.NetBSD.org>
Date: Wed, 17 Jan 2018 13:44:21 +0000 (UTC)
From: tr@vispaul.me
Reply-To: tr@vispaul.me
To: gnats-bugs@NetBSD.org
Subject: Update SUBST_SED.fix-paths for sysutils/salt 
X-Send-Pr-Version: www-1.0

>Number:         52930
>Category:       pkg
>Synopsis:       Update SUBST_SED.fix-paths for sysutils/salt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsiegert
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 17 13:45:00 +0000 2018
>Closed-Date:    Sun Jan 21 13:38:09 +0000 2018
>Last-Modified:  Sun Jan 21 13:38:09 +0000 2018
>Originator:     Travis Paul
>Release:        current
>Organization:
>Environment:
NetBSD pkgbuild.local 7.1.1 NetBSD 7.1.1 (GENERIC.201712222334Z) amd64
>Description:
The salt master and salt minion configuration files have many options commented out by default. A commented out option on a new install suggests that option's value is the default.

Without this change, the commented out values for a few options contain paths to /var/log and /var/cache instead of ${VARBASE}/log or ${VARBASE}/cache which are the correct paths and the paths that are used by the package.

This can be slightly confusing to a user installing the package if they expect all /var related paths to be within the ${VARBASE}.
>How-To-Repeat:
Install salt-2017.7.2, view the contents of ${PREFIX}/etc/salt/master or ${PREFIX}/etc/salt/minion. They will contain references to /var/cache and /var/run instead of the ${VARBASE} paths.
>Fix:
The attached patch updates SUBST_SED.fix-paths in the salt makefile to match the correct values passed into PYSETUPARGS and that are used by the package.

Link to patch: https://us-east.manta.joyent.com/tpaul/public/patches/pkgsrc/salt-subs-var.patch.txt

And also inline below:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/salt/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile	11 Oct 2017 09:40:28 -0000	1.55
+++ Makefile	17 Jan 2018 04:39:44 -0000
@@ -68,6 +68,9 @@
 SUBST_SED.fix-paths+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.fix-paths+=	-e 's,/opt/local/lib,${PREFIX}/lib,g'
 SUBST_SED.fix-paths+=	-e 's,/opt/local/etc,${PKG_SYSCONFBASEDIR},g'
+SUBST_SED.fix-paths+=	-e 's,/var/run,${VARBASE}/run,g'
+SUBST_SED.fix-paths+=	-e 's,/var/cache,${VARBASE}/cache,g'
+SUBST_SED.fix-paths+=	-e 's,/var/log,${VARBASE}/log,g'

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/

>Release-Note:

>Audit-Trail:
From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/52930 CVS commit: pkgsrc/sysutils/salt
Date: Sun, 21 Jan 2018 13:28:08 +0000

 Module Name:	pkgsrc
 Committed By:	bsiegert
 Date:		Sun Jan 21 13:28:07 UTC 2018

 Modified Files:
 	pkgsrc/sysutils/salt: Makefile

 Log Message:
 Add ${VARBASE} replacements in example config.

 Patch from Travis Paul in PR pkg/52930.
 Bump revision.


 To generate a diff of this commit:
 cvs rdiff -u -r1.55 -r1.56 pkgsrc/sysutils/salt/Makefile

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

Responsible-Changed-From-To: pkg-manager->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Sun, 21 Jan 2018 13:38:09 +0000
Responsible-Changed-Why:
take


State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Sun, 21 Jan 2018 13:38:09 +0000
State-Changed-Why:
Patch committed, thanks!


>Unformatted:

Home	PR Database Search