pkgsrc-Users archive

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

Overly broad SUBST in net/rabbitmq/Makefile



There is a overly broad SUBST in net/rabbitmq/Makefile that will cause
rabbitmq-server to fail to start.  I believe that this diff fixs it:

--- Makefile.DIST	2022-10-23 14:08:14.133635529 -0400
+++ Makefile	2022-11-13 11:24:28.724994924 -0500
@@ -70,7 +70,7 @@
 SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
 SUBST_SED.paths+=	-e 's|/var/log|${VARBASE}/log|g'
-SUBST_SED.paths+=	-e 's|erl|${PREFIX}/bin/erl|g'
+SUBST_SED.paths+=	-e 's|exec erl|exec ${PREFIX}/bin/erl|g'
 SUBST_SED.paths+=	-e 's|@RABBITMQ_HOME@|${PREFIX}/${RABBITMQ_HOME}|g'
 
 SUBST_CLASSES+=		prefix

I believe that the intent of the SUBST was to change "exec erl" to "exec
/some/prefix/bin/erl" and as it is now it is catching a whole lot more
than just that.

This problem is present in PKGSRC 2022Q3 and -HEAD.


Any comments?? Ok to commit??





-- 
Brad Spencer - brad%anduin.eldar.org@localhost - KC8VKS - http://anduin.eldar.org


Home | Main Index | Thread Index | Old Index