pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/52930: Update SUBST_SED.fix-paths for sysutils/salt



>Number:         52930
>Category:       pkg
>Synopsis:       Update SUBST_SED.fix-paths for sysutils/salt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 17 13:45:00 +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}/


Home | Main Index | Thread Index | Old Index