0002-Fix-cjson-include-paths.patch 9.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305
  1. From 791c63372b1e0a8818845a22c54a555843e06891 Mon Sep 17 00:00:00 2001
  2. From: "Roger A. Light" <roger@atchoo.org>
  3. Date: Fri, 4 Dec 2020 22:15:19 +0000
  4. Subject: [PATCH] Fix cjson include paths.
  5. [Peter: drop cmake/, snap/ changes as those are not in tarball]
  6. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  7. ---
  8. ChangeLog.txt | 3 +++
  9. apps/mosquitto_ctrl/dynsec.c | 2 +-
  10. apps/mosquitto_ctrl/dynsec_client.c | 2 +-
  11. apps/mosquitto_ctrl/dynsec_group.c | 2 +-
  12. apps/mosquitto_ctrl/dynsec_role.c | 2 +-
  13. apps/mosquitto_ctrl/example.c | 2 +-
  14. apps/mosquitto_ctrl/mosquitto_ctrl.h | 2 +-
  15. client/sub_client_output.c | 2 +-
  16. config.h | 2 +-
  17. config.mk | 2 +-
  18. plugins/dynamic-security/Makefile | 2 +-
  19. plugins/dynamic-security/clientlist.c | 2 +-
  20. plugins/dynamic-security/clients.c | 2 +-
  21. plugins/dynamic-security/dynamic_security.h | 2 +-
  22. plugins/dynamic-security/grouplist.c | 2 +-
  23. plugins/dynamic-security/groups.c | 2 +-
  24. plugins/dynamic-security/json_help.c | 2 +-
  25. plugins/dynamic-security/json_help.h | 2 +-
  26. plugins/dynamic-security/plugin.c | 2 +-
  27. plugins/dynamic-security/rolelist.c | 2 +-
  28. plugins/dynamic-security/roles.c | 2 +-
  29. 21 files changed, 25 insertions(+), 24 deletions(-)
  30. diff --git a/ChangeLog.txt b/ChangeLog.txt
  31. index 240f4a80..030ea8c5 100644
  32. --- a/ChangeLog.txt
  33. +++ b/ChangeLog.txt
  34. @@ -1,3 +1,6 @@
  35. +- Fix cjson include paths.
  36. +
  37. +
  38. 2.0.0 - 2020-12-03
  39. ==================
  40. diff --git a/apps/mosquitto_ctrl/dynsec.c b/apps/mosquitto_ctrl/dynsec.c
  41. index 96aae993..35d29e9d 100644
  42. --- a/apps/mosquitto_ctrl/dynsec.c
  43. +++ b/apps/mosquitto_ctrl/dynsec.c
  44. @@ -17,7 +17,7 @@ Contributors:
  45. */
  46. #include "config.h"
  47. -#include <cJSON.h>
  48. +#include <cjson/cJSON.h>
  49. #include <stdio.h>
  50. #include <stdlib.h>
  51. #include <string.h>
  52. diff --git a/apps/mosquitto_ctrl/dynsec_client.c b/apps/mosquitto_ctrl/dynsec_client.c
  53. index 1dea7862..45b6d6af 100644
  54. --- a/apps/mosquitto_ctrl/dynsec_client.c
  55. +++ b/apps/mosquitto_ctrl/dynsec_client.c
  56. @@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
  57. Contributors:
  58. Roger Light - initial implementation and documentation.
  59. */
  60. -#include <cJSON.h>
  61. +#include <cjson/cJSON.h>
  62. #include <stdio.h>
  63. #include <stdlib.h>
  64. #include <string.h>
  65. diff --git a/apps/mosquitto_ctrl/dynsec_group.c b/apps/mosquitto_ctrl/dynsec_group.c
  66. index b0faf27b..4b5ceca5 100644
  67. --- a/apps/mosquitto_ctrl/dynsec_group.c
  68. +++ b/apps/mosquitto_ctrl/dynsec_group.c
  69. @@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
  70. Contributors:
  71. Roger Light - initial implementation and documentation.
  72. */
  73. -#include <cJSON.h>
  74. +#include <cjson/cJSON.h>
  75. #include <stdio.h>
  76. #include <stdlib.h>
  77. #include <string.h>
  78. diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c
  79. index 10b26efa..2bc5a03d 100644
  80. --- a/apps/mosquitto_ctrl/dynsec_role.c
  81. +++ b/apps/mosquitto_ctrl/dynsec_role.c
  82. @@ -17,7 +17,7 @@ Contributors:
  83. */
  84. #include "config.h"
  85. -#include <cJSON.h>
  86. +#include <cjson/cJSON.h>
  87. #include <stdio.h>
  88. #include <stdlib.h>
  89. #include <string.h>
  90. diff --git a/apps/mosquitto_ctrl/example.c b/apps/mosquitto_ctrl/example.c
  91. index 63ba3eb0..1027fb60 100644
  92. --- a/apps/mosquitto_ctrl/example.c
  93. +++ b/apps/mosquitto_ctrl/example.c
  94. @@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
  95. Contributors:
  96. Roger Light - initial implementation and documentation.
  97. */
  98. -#include <cJSON.h>
  99. +#include <cjson/cJSON.h>
  100. #include <stdio.h>
  101. #include <stdlib.h>
  102. #include <string.h>
  103. diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.h b/apps/mosquitto_ctrl/mosquitto_ctrl.h
  104. index 52bbc9a8..0c9c931a 100644
  105. --- a/apps/mosquitto_ctrl/mosquitto_ctrl.h
  106. +++ b/apps/mosquitto_ctrl/mosquitto_ctrl.h
  107. @@ -18,7 +18,7 @@ Contributors:
  108. #ifndef MOSQUITTO_CTRL_H
  109. #define MOSQUITTO_CTRL_H
  110. -#include <cJSON.h>
  111. +#include <cjson/cJSON.h>
  112. #include <stdbool.h>
  113. #include "mosquitto.h"
  114. diff --git a/client/sub_client_output.c b/client/sub_client_output.c
  115. index 167071f8..a70d59ec 100644
  116. --- a/client/sub_client_output.c
  117. +++ b/client/sub_client_output.c
  118. @@ -38,7 +38,7 @@ Contributors:
  119. #endif
  120. #ifdef WITH_CJSON
  121. -# include <cJSON.h>
  122. +# include <cjson/cJSON.h>
  123. #endif
  124. #ifdef __APPLE__
  125. diff --git a/config.h b/config.h
  126. index 77da39df..bdce7469 100644
  127. --- a/config.h
  128. +++ b/config.h
  129. @@ -74,7 +74,7 @@
  130. #endif
  131. #ifdef WITH_CJSON
  132. -# include <cJSON.h>
  133. +# include <cjson/cJSON.h>
  134. # define CJSON_VERSION_FULL (CJSON_VERSION_MAJOR*1000000+CJSON_VERSION_MINOR*1000+CJSON_VERSION_PATCH)
  135. #endif
  136. diff --git a/config.mk b/config.mk
  137. index 3e0c3240..e8be1aa1 100644
  138. --- a/config.mk
  139. +++ b/config.mk
  140. @@ -364,7 +364,7 @@ ifeq ($(WITH_COVERAGE),yes)
  141. endif
  142. ifeq ($(WITH_CJSON),yes)
  143. - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson
  144. + CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON
  145. CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson
  146. CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson
  147. CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib
  148. diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
  149. index 6fc50edd..559f531e 100644
  150. --- a/plugins/dynamic-security/Makefile
  151. +++ b/plugins/dynamic-security/Makefile
  152. @@ -3,7 +3,7 @@ include ../../config.mk
  153. .PHONY : all binary check clean reallyclean test install uninstall
  154. PLUGIN_NAME=mosquitto_dynamic_security
  155. -LOCAL_CPPFLAGS=-I/usr/include/cjson -I/usr/local/include/cjson -I../../src/
  156. +LOCAL_CPPFLAGS=-I../../src/
  157. LOCAL_LDFLAGS=-L/usr/local/lib
  158. OBJS= \
  159. diff --git a/plugins/dynamic-security/clientlist.c b/plugins/dynamic-security/clientlist.c
  160. index 97957e07..d362a9b8 100644
  161. --- a/plugins/dynamic-security/clientlist.c
  162. +++ b/plugins/dynamic-security/clientlist.c
  163. @@ -18,7 +18,7 @@ Contributors:
  164. #include "config.h"
  165. -#include <cJSON.h>
  166. +#include <cjson/cJSON.h>
  167. #include <stdio.h>
  168. #include <uthash.h>
  169. diff --git a/plugins/dynamic-security/clients.c b/plugins/dynamic-security/clients.c
  170. index 5ae03b47..50a0922e 100644
  171. --- a/plugins/dynamic-security/clients.c
  172. +++ b/plugins/dynamic-security/clients.c
  173. @@ -18,7 +18,7 @@ Contributors:
  174. #include "config.h"
  175. -#include <cJSON.h>
  176. +#include <cjson/cJSON.h>
  177. #include <stdio.h>
  178. #include <uthash.h>
  179. diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h
  180. index fcf39579..57c814b8 100644
  181. --- a/plugins/dynamic-security/dynamic_security.h
  182. +++ b/plugins/dynamic-security/dynamic_security.h
  183. @@ -18,7 +18,7 @@ Contributors:
  184. Roger Light - initial implementation and documentation.
  185. */
  186. -#include <cJSON.h>
  187. +#include <cjson/cJSON.h>
  188. #include <uthash.h>
  189. #include "mosquitto.h"
  190. #include "password_mosq.h"
  191. diff --git a/plugins/dynamic-security/grouplist.c b/plugins/dynamic-security/grouplist.c
  192. index 85df7199..afdc0186 100644
  193. --- a/plugins/dynamic-security/grouplist.c
  194. +++ b/plugins/dynamic-security/grouplist.c
  195. @@ -18,7 +18,7 @@ Contributors:
  196. #include "config.h"
  197. -#include <cJSON.h>
  198. +#include <cjson/cJSON.h>
  199. #include <stdio.h>
  200. #include <uthash.h>
  201. diff --git a/plugins/dynamic-security/groups.c b/plugins/dynamic-security/groups.c
  202. index 5157113a..144b3244 100644
  203. --- a/plugins/dynamic-security/groups.c
  204. +++ b/plugins/dynamic-security/groups.c
  205. @@ -18,7 +18,7 @@ Contributors:
  206. #include "config.h"
  207. -#include <cJSON.h>
  208. +#include <cjson/cJSON.h>
  209. #include <stdio.h>
  210. #include <uthash.h>
  211. diff --git a/plugins/dynamic-security/json_help.c b/plugins/dynamic-security/json_help.c
  212. index 04e5b3cf..dd8379c9 100644
  213. --- a/plugins/dynamic-security/json_help.c
  214. +++ b/plugins/dynamic-security/json_help.c
  215. @@ -18,7 +18,7 @@ Contributors:
  216. #include "config.h"
  217. -#include <cJSON.h>
  218. +#include <cjson/cJSON.h>
  219. #include <stdbool.h>
  220. #include <stdlib.h>
  221. #include <stdio.h>
  222. diff --git a/plugins/dynamic-security/json_help.h b/plugins/dynamic-security/json_help.h
  223. index f80f1447..b1b6aed0 100644
  224. --- a/plugins/dynamic-security/json_help.h
  225. +++ b/plugins/dynamic-security/json_help.h
  226. @@ -17,7 +17,7 @@ SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
  227. Contributors:
  228. Roger Light - initial implementation and documentation.
  229. */
  230. -#include <cJSON.h>
  231. +#include <cjson/cJSON.h>
  232. #include <stdbool.h>
  233. /* "optional==false" can also be taken to mean "only return success if the key exists and is valid" */
  234. diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
  235. index 76aae115..c41e498c 100644
  236. --- a/plugins/dynamic-security/plugin.c
  237. +++ b/plugins/dynamic-security/plugin.c
  238. @@ -18,7 +18,7 @@ Contributors:
  239. #include "config.h"
  240. -#include <cJSON.h>
  241. +#include <cjson/cJSON.h>
  242. #include <errno.h>
  243. #include <stdio.h>
  244. #include <stdlib.h>
  245. diff --git a/plugins/dynamic-security/rolelist.c b/plugins/dynamic-security/rolelist.c
  246. index f2c4cda2..6df19d21 100644
  247. --- a/plugins/dynamic-security/rolelist.c
  248. +++ b/plugins/dynamic-security/rolelist.c
  249. @@ -18,7 +18,7 @@ Contributors:
  250. #include "config.h"
  251. -#include <cJSON.h>
  252. +#include <cjson/cJSON.h>
  253. #include <stdio.h>
  254. #include <string.h>
  255. #include <uthash.h>
  256. diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c
  257. index 7b33bdc0..635ddefd 100644
  258. --- a/plugins/dynamic-security/roles.c
  259. +++ b/plugins/dynamic-security/roles.c
  260. @@ -18,7 +18,7 @@ Contributors:
  261. #include "config.h"
  262. -#include <cJSON.h>
  263. +#include <cjson/cJSON.h>
  264. #include <stdio.h>
  265. #include <string.h>
  266. #include <uthash.h>
  267. --
  268. 2.20.1