summaryrefslogtreecommitdiff
path: root/sysutils/cfengine2/patches
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2015-06-18 01:58:30 +0000
committerdholland <dholland@pkgsrc.org>2015-06-18 01:58:30 +0000
commit975273c90500a1165f78bdf4e7ec0867c0907b42 (patch)
tree66862ad6b62dc24b98f744c13c6673fb6b7a5dfa /sysutils/cfengine2/patches
parent13fed4efe2276ecb52ee74f06e0347cae6da3573 (diff)
downloadpkgsrc-975273c90500a1165f78bdf4e7ec0867c0907b42.tar.gz
PR 46354 Lloyd Parkes: remove unnecessary gccism for non-gcc compilers.
Diffstat (limited to 'sysutils/cfengine2/patches')
-rw-r--r--sysutils/cfengine2/patches/patch-src_do.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/sysutils/cfengine2/patches/patch-src_do.c b/sysutils/cfengine2/patches/patch-src_do.c
new file mode 100644
index 00000000000..282dc239930
--- /dev/null
+++ b/sysutils/cfengine2/patches/patch-src_do.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_do.c,v 1.1 2015/06/18 01:58:30 dholland Exp $
+
+avoid gccism (from PR 46354)
+
+--- src/do.c~ 2009-03-08 16:27:56.000000000 +0000
++++ src/do.c
+@@ -2846,7 +2846,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n
+
+ ExpandVarstring(ptr->name,name,"");
+
+- snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
++ snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ? ptr->defines : "", ptr->elsedef ? ptr->elsedef : "");
+
+ if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
+ {