rugged 1.3.2 → 1.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (547) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +34 -2
  3. data/ext/rugged/extconf.rb +7 -4
  4. data/ext/rugged/rugged.c +16 -0
  5. data/ext/rugged/rugged.h +4 -0
  6. data/ext/rugged/rugged_blame.c +2 -0
  7. data/ext/rugged/rugged_blob.c +3 -0
  8. data/ext/rugged/rugged_commit.c +1 -0
  9. data/ext/rugged/rugged_config.c +9 -2
  10. data/ext/rugged/rugged_diff.c +1 -0
  11. data/ext/rugged/rugged_index.c +2 -0
  12. data/ext/rugged/rugged_patch.c +1 -0
  13. data/ext/rugged/rugged_rebase.c +1 -0
  14. data/ext/rugged/rugged_reference.c +1 -0
  15. data/ext/rugged/rugged_remote.c +28 -10
  16. data/ext/rugged/rugged_repo.c +7 -9
  17. data/ext/rugged/rugged_revwalk.c +5 -1
  18. data/ext/rugged/rugged_settings.c +5 -0
  19. data/ext/rugged/rugged_submodule.c +1 -0
  20. data/ext/rugged/rugged_tag.c +1 -0
  21. data/ext/rugged/rugged_tree.c +4 -0
  22. data/lib/rugged/index.rb +1 -1
  23. data/lib/rugged/tree.rb +5 -1
  24. data/lib/rugged/version.rb +1 -1
  25. data/vendor/libgit2/CMakeLists.txt +132 -288
  26. data/vendor/libgit2/COPYING +106 -19
  27. data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
  28. data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
  29. data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
  30. data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
  31. data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
  32. data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
  33. data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
  34. data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
  35. data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
  36. data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
  37. data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
  38. data/vendor/libgit2/cmake/FindPCRE.cmake +12 -13
  39. data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
  40. data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
  41. data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
  42. data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
  43. data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
  44. data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
  45. data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
  46. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
  47. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
  48. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
  49. data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
  50. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
  51. data/vendor/libgit2/cmake/SelectHashes.cmake +91 -53
  52. data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
  53. data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
  54. data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
  55. data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
  56. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
  57. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
  58. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +3 -1
  59. data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
  60. data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
  61. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
  62. data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
  63. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
  64. data/vendor/libgit2/deps/zlib/adler32.c +7 -0
  65. data/vendor/libgit2/deps/zlib/crc32.c +975 -288
  66. data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
  67. data/vendor/libgit2/deps/zlib/deflate.c +83 -31
  68. data/vendor/libgit2/deps/zlib/deflate.h +12 -15
  69. data/vendor/libgit2/deps/zlib/gzguts.h +3 -2
  70. data/vendor/libgit2/deps/zlib/infback.c +2 -1
  71. data/vendor/libgit2/deps/zlib/inffast.c +14 -14
  72. data/vendor/libgit2/deps/zlib/inflate.c +39 -8
  73. data/vendor/libgit2/deps/zlib/inflate.h +3 -2
  74. data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
  75. data/vendor/libgit2/deps/zlib/trees.c +27 -48
  76. data/vendor/libgit2/deps/zlib/zlib.h +126 -100
  77. data/vendor/libgit2/deps/zlib/zutil.c +2 -2
  78. data/vendor/libgit2/deps/zlib/zutil.h +12 -9
  79. data/vendor/libgit2/include/git2/apply.h +16 -2
  80. data/vendor/libgit2/include/git2/attr.h +11 -2
  81. data/vendor/libgit2/include/git2/blame.h +4 -1
  82. data/vendor/libgit2/include/git2/blob.h +14 -1
  83. data/vendor/libgit2/include/git2/branch.h +4 -2
  84. data/vendor/libgit2/include/git2/buffer.h +18 -78
  85. data/vendor/libgit2/include/git2/cert.h +2 -2
  86. data/vendor/libgit2/include/git2/checkout.h +5 -2
  87. data/vendor/libgit2/include/git2/clone.h +3 -3
  88. data/vendor/libgit2/include/git2/commit.h +2 -0
  89. data/vendor/libgit2/include/git2/common.h +28 -7
  90. data/vendor/libgit2/include/git2/config.h +25 -9
  91. data/vendor/libgit2/include/git2/credential.h +2 -1
  92. data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
  93. data/vendor/libgit2/include/git2/deprecated.h +9 -1
  94. data/vendor/libgit2/include/git2/describe.h +7 -2
  95. data/vendor/libgit2/include/git2/diff.h +18 -10
  96. data/vendor/libgit2/include/git2/email.h +1 -1
  97. data/vendor/libgit2/include/git2/errors.h +17 -3
  98. data/vendor/libgit2/include/git2/experimental.h +20 -0
  99. data/vendor/libgit2/include/git2/filter.h +7 -2
  100. data/vendor/libgit2/include/git2/graph.h +1 -0
  101. data/vendor/libgit2/include/git2/ignore.h +1 -1
  102. data/vendor/libgit2/include/git2/index.h +11 -5
  103. data/vendor/libgit2/include/git2/indexer.h +48 -0
  104. data/vendor/libgit2/include/git2/merge.h +24 -4
  105. data/vendor/libgit2/include/git2/message.h +2 -0
  106. data/vendor/libgit2/include/git2/object.h +49 -0
  107. data/vendor/libgit2/include/git2/odb.h +94 -13
  108. data/vendor/libgit2/include/git2/odb_backend.h +107 -19
  109. data/vendor/libgit2/include/git2/oid.h +115 -15
  110. data/vendor/libgit2/include/git2/pack.h +24 -8
  111. data/vendor/libgit2/include/git2/patch.h +8 -0
  112. data/vendor/libgit2/include/git2/pathspec.h +1 -1
  113. data/vendor/libgit2/include/git2/proxy.h +1 -1
  114. data/vendor/libgit2/include/git2/rebase.h +9 -1
  115. data/vendor/libgit2/include/git2/refdb.h +3 -0
  116. data/vendor/libgit2/include/git2/reflog.h +1 -1
  117. data/vendor/libgit2/include/git2/refs.h +2 -2
  118. data/vendor/libgit2/include/git2/remote.h +184 -37
  119. data/vendor/libgit2/include/git2/repository.h +34 -10
  120. data/vendor/libgit2/include/git2/reset.h +2 -2
  121. data/vendor/libgit2/include/git2/revparse.h +1 -1
  122. data/vendor/libgit2/include/git2/revwalk.h +4 -1
  123. data/vendor/libgit2/include/git2/signature.h +1 -1
  124. data/vendor/libgit2/include/git2/stash.h +61 -7
  125. data/vendor/libgit2/include/git2/status.h +14 -5
  126. data/vendor/libgit2/include/git2/strarray.h +0 -13
  127. data/vendor/libgit2/include/git2/submodule.h +7 -2
  128. data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
  129. data/vendor/libgit2/include/git2/sys/odb_backend.h +3 -6
  130. data/vendor/libgit2/include/git2/sys/remote.h +46 -0
  131. data/vendor/libgit2/include/git2/sys/stream.h +1 -1
  132. data/vendor/libgit2/include/git2/sys/transport.h +46 -39
  133. data/vendor/libgit2/include/git2/tag.h +1 -0
  134. data/vendor/libgit2/include/git2/tree.h +4 -3
  135. data/vendor/libgit2/include/git2/types.h +7 -7
  136. data/vendor/libgit2/include/git2/version.h +27 -6
  137. data/vendor/libgit2/include/git2/worktree.h +12 -2
  138. data/vendor/libgit2/include/git2.h +1 -0
  139. data/vendor/libgit2/src/CMakeLists.txt +177 -419
  140. data/vendor/libgit2/src/README.md +12 -0
  141. data/vendor/libgit2/src/cli/CMakeLists.txt +57 -0
  142. data/vendor/libgit2/src/cli/README.md +26 -0
  143. data/vendor/libgit2/src/cli/cli.h +20 -0
  144. data/vendor/libgit2/src/cli/cmd.c +21 -0
  145. data/vendor/libgit2/src/cli/cmd.h +33 -0
  146. data/vendor/libgit2/src/cli/cmd_cat_file.c +204 -0
  147. data/vendor/libgit2/src/cli/cmd_clone.c +176 -0
  148. data/vendor/libgit2/src/cli/cmd_hash_object.c +154 -0
  149. data/vendor/libgit2/src/cli/cmd_help.c +86 -0
  150. data/vendor/libgit2/src/cli/error.h +51 -0
  151. data/vendor/libgit2/src/cli/main.c +106 -0
  152. data/vendor/libgit2/src/cli/opt.c +669 -0
  153. data/vendor/libgit2/src/cli/opt.h +349 -0
  154. data/vendor/libgit2/src/cli/opt_usage.c +194 -0
  155. data/vendor/libgit2/src/cli/opt_usage.h +35 -0
  156. data/vendor/libgit2/src/cli/progress.c +345 -0
  157. data/vendor/libgit2/src/cli/progress.h +117 -0
  158. data/vendor/libgit2/src/cli/sighandler.h +20 -0
  159. data/vendor/libgit2/src/cli/unix/sighandler.c +36 -0
  160. data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
  161. data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
  162. data/vendor/libgit2/src/libgit2/CMakeLists.txt +141 -0
  163. data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +1 -1
  164. data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
  165. data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +18 -18
  166. data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
  167. data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +18 -18
  168. data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +18 -18
  169. data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +4 -4
  170. data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +18 -13
  171. data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +2 -0
  172. data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -1
  173. data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
  174. data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
  175. data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
  176. data/vendor/libgit2/src/{branch.h → libgit2/branch.h} +15 -3
  177. data/vendor/libgit2/src/libgit2/buf.c +126 -0
  178. data/vendor/libgit2/src/libgit2/buf.h +50 -0
  179. data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +74 -68
  180. data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +13 -13
  181. data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +96 -67
  182. data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +178 -73
  183. data/vendor/libgit2/src/libgit2/commit.h +87 -0
  184. data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +122 -89
  185. data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +14 -4
  186. data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +7 -4
  187. data/vendor/libgit2/src/libgit2/common.h +55 -0
  188. data/vendor/libgit2/src/{config.c → libgit2/config.c} +101 -69
  189. data/vendor/libgit2/src/{config.h → libgit2/config.h} +15 -2
  190. data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +105 -93
  191. data/vendor/libgit2/src/{config_mem.c → libgit2/config_mem.c} +9 -9
  192. data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +27 -23
  193. data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
  194. data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +35 -27
  195. data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +30 -9
  196. data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +2 -4
  197. data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +34 -36
  198. data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +3 -3
  199. data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +44 -26
  200. data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +47 -18
  201. data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
  202. data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +112 -100
  203. data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
  204. data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
  205. data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +13 -8
  206. data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
  207. data/vendor/libgit2/src/{email.c → libgit2/email.c} +55 -39
  208. data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
  209. data/vendor/libgit2/src/{errors.c → libgit2/errors.c} +18 -18
  210. data/vendor/libgit2/src/{errors.h → libgit2/errors.h} +1 -2
  211. data/vendor/libgit2/src/libgit2/experimental.h.in +13 -0
  212. data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +72 -27
  213. data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -1
  214. data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +23 -23
  215. data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +127 -53
  216. data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
  217. data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
  218. data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +35 -34
  219. data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
  220. data/vendor/libgit2/src/{index.c → libgit2/index.c} +91 -90
  221. data/vendor/libgit2/src/{index.h → libgit2/index.h} +6 -3
  222. data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +173 -92
  223. data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +71 -61
  224. data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +5 -5
  225. data/vendor/libgit2/src/{libgit2.c → libgit2/libgit2.c} +46 -11
  226. data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +38 -36
  227. data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +30 -30
  228. data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
  229. data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +2 -2
  230. data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -3
  231. data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
  232. data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +112 -92
  233. data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +5 -4
  234. data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +15 -12
  235. data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +5 -2
  236. data/vendor/libgit2/src/{netops.c → libgit2/netops.c} +1 -2
  237. data/vendor/libgit2/src/{netops.h → libgit2/netops.h} +1 -1
  238. data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +25 -34
  239. data/vendor/libgit2/src/{object.c → libgit2/object.c} +135 -30
  240. data/vendor/libgit2/src/{object.h → libgit2/object.h} +12 -3
  241. data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +228 -81
  242. data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
  243. data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
  244. data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +18 -5
  245. data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +137 -85
  246. data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +136 -90
  247. data/vendor/libgit2/src/libgit2/oid.h +273 -0
  248. data/vendor/libgit2/src/{oidmap.c → libgit2/oidmap.c} +1 -1
  249. data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +56 -30
  250. data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +11 -6
  251. data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +114 -84
  252. data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +31 -16
  253. data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +4 -3
  254. data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
  255. data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +1 -0
  256. data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +27 -11
  257. data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
  258. data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +29 -29
  259. data/vendor/libgit2/src/libgit2/path.c +375 -0
  260. data/vendor/libgit2/src/libgit2/path.h +68 -0
  261. data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +6 -6
  262. data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
  263. data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
  264. data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
  265. data/vendor/libgit2/src/{push.c → libgit2/push.c} +43 -38
  266. data/vendor/libgit2/src/{push.h → libgit2/push.h} +4 -16
  267. data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
  268. data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
  269. data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +119 -107
  270. data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +506 -197
  271. data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +7 -5
  272. data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +1 -2
  273. data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +34 -32
  274. data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +2 -2
  275. data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +32 -37
  276. data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +5 -2
  277. data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +718 -420
  278. data/vendor/libgit2/src/libgit2/remote.h +100 -0
  279. data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +629 -386
  280. data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +20 -9
  281. data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
  282. data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +14 -14
  283. data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +71 -42
  284. data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +12 -8
  285. data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +12 -6
  286. data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -1
  287. data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +235 -61
  288. data/vendor/libgit2/src/{status.c → libgit2/status.c} +4 -1
  289. data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
  290. data/vendor/libgit2/src/libgit2/strarray.h +25 -0
  291. data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +8 -6
  292. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +1 -1
  293. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +7 -3
  294. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +3 -3
  295. data/vendor/libgit2/src/{streams → libgit2/streams}/socket.c +4 -1
  296. data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +177 -161
  297. data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +1 -1
  298. data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
  299. data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +53 -18
  300. data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +73 -42
  301. data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
  302. data/vendor/libgit2/src/{threadstate.c → libgit2/threadstate.c} +3 -3
  303. data/vendor/libgit2/src/{threadstate.h → libgit2/threadstate.h} +2 -2
  304. data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
  305. data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
  306. data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +1 -1
  307. data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +1 -1
  308. data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +10 -10
  309. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
  310. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +2 -3
  311. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c +12 -13
  312. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c +10 -10
  313. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +0 -1
  314. data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +9 -11
  315. data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +41 -20
  316. data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +2 -3
  317. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +75 -66
  318. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
  319. data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +138 -116
  320. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +92 -133
  321. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +35 -32
  322. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +177 -65
  323. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +97 -49
  324. data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.c +365 -198
  325. data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +58 -59
  326. data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +8 -8
  327. data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +2 -2
  328. data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +93 -83
  329. data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +4 -4
  330. data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +121 -94
  331. data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
  332. data/vendor/libgit2/src/libgit2/xdiff/git-xdiff.h +53 -0
  333. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiff.h +15 -15
  334. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.c +134 -108
  335. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.c +23 -7
  336. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xhistogram.c +87 -78
  337. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xinclude.h +1 -12
  338. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmerge.c +104 -117
  339. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xpatience.c +6 -17
  340. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.c +15 -20
  341. data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.c +18 -7
  342. data/vendor/libgit2/src/util/CMakeLists.txt +80 -0
  343. data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.h +1 -1
  344. data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
  345. data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
  346. data/vendor/libgit2/src/{array.h → util/array.h} +1 -1
  347. data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
  348. data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +1 -1
  349. data/vendor/libgit2/src/{date.c → util/date.c} +14 -20
  350. data/vendor/libgit2/src/util/date.h +33 -0
  351. data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +29 -29
  352. data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +2 -2
  353. data/vendor/libgit2/src/{path.c → util/fs_path.c} +453 -647
  354. data/vendor/libgit2/src/{path.h → util/fs_path.h} +221 -188
  355. data/vendor/libgit2/src/{futils.c → util/futils.c} +135 -90
  356. data/vendor/libgit2/src/{futils.h → util/futils.h} +28 -15
  357. data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +15 -1
  358. data/vendor/libgit2/src/{common.h → util/git2_util.h} +20 -59
  359. data/vendor/libgit2/src/util/hash/builtin.c +53 -0
  360. data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
  361. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
  362. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
  363. data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
  364. data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
  365. data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
  366. data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
  367. data/vendor/libgit2/src/util/hash/openssl.c +195 -0
  368. data/vendor/libgit2/src/util/hash/openssl.h +45 -0
  369. data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
  370. data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
  371. data/vendor/libgit2/src/util/hash/sha.h +70 -0
  372. data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
  373. data/vendor/libgit2/src/util/hash/win32.c +549 -0
  374. data/vendor/libgit2/src/util/hash/win32.h +60 -0
  375. data/vendor/libgit2/src/util/hash.c +158 -0
  376. data/vendor/libgit2/src/util/hash.h +61 -0
  377. data/vendor/libgit2/src/{khash.h → util/khash.h} +1 -1
  378. data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
  379. data/vendor/libgit2/src/util/net.c +1003 -0
  380. data/vendor/libgit2/src/{net.h → util/net.h} +18 -4
  381. data/vendor/libgit2/src/{pool.h → util/pool.h} +1 -1
  382. data/vendor/libgit2/src/{posix.c → util/posix.c} +3 -3
  383. data/vendor/libgit2/src/{posix.h → util/posix.h} +4 -1
  384. data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +2 -2
  385. data/vendor/libgit2/src/util/rand.c +234 -0
  386. data/vendor/libgit2/src/util/rand.h +37 -0
  387. data/vendor/libgit2/src/{regexp.c → util/regexp.c} +4 -4
  388. data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
  389. data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
  390. data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
  391. data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +1 -1
  392. data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +2 -2
  393. data/vendor/libgit2/src/{buffer.c → util/str.c} +157 -151
  394. data/vendor/libgit2/src/util/str.h +357 -0
  395. data/vendor/libgit2/src/{strmap.h → util/strmap.h} +1 -1
  396. data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
  397. data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
  398. data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
  399. data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
  400. data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -4
  401. data/vendor/libgit2/src/{unix → util/unix}/realpath.c +1 -3
  402. data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
  403. data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
  404. data/vendor/libgit2/src/{util.c → util/util.c} +15 -15
  405. data/vendor/libgit2/src/{util.h → util/util.h} +4 -29
  406. data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
  407. data/vendor/libgit2/src/{vector.h → util/vector.h} +2 -2
  408. data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
  409. data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
  410. data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
  411. data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
  412. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +140 -9
  413. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
  414. data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
  415. data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +12 -28
  416. data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
  417. data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
  418. data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
  419. data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h +1 -1
  420. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
  421. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
  422. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
  423. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
  424. data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
  425. data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
  426. data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
  427. metadata +402 -356
  428. data/vendor/libgit2/src/buffer.h +0 -374
  429. data/vendor/libgit2/src/commit.h +0 -46
  430. data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
  431. data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
  432. data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
  433. data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
  434. data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
  435. data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
  436. data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
  437. data/vendor/libgit2/src/hash/sha1.h +0 -38
  438. data/vendor/libgit2/src/hash.c +0 -110
  439. data/vendor/libgit2/src/hash.h +0 -46
  440. data/vendor/libgit2/src/message.h +0 -17
  441. data/vendor/libgit2/src/net.c +0 -540
  442. data/vendor/libgit2/src/oid.h +0 -51
  443. data/vendor/libgit2/src/remote.h +0 -55
  444. data/vendor/libgit2/src/sysdir.c +0 -347
  445. data/vendor/libgit2/src/win32/findfile.c +0 -230
  446. data/vendor/libgit2/src/win32/findfile.h +0 -19
  447. /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
  448. /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
  449. /data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +0 -0
  450. /data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +0 -0
  451. /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
  452. /data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +0 -0
  453. /data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +0 -0
  454. /data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -0
  455. /data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +0 -0
  456. /data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +0 -0
  457. /data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +0 -0
  458. /data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +0 -0
  459. /data/vendor/libgit2/src/{config_entries.c → libgit2/config_entries.c} +0 -0
  460. /data/vendor/libgit2/src/{config_entries.h → libgit2/config_entries.h} +0 -0
  461. /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
  462. /data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +0 -0
  463. /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
  464. /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
  465. /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
  466. /data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +0 -0
  467. /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
  468. /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
  469. /data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +0 -0
  470. /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
  471. /data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +0 -0
  472. /data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +0 -0
  473. /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
  474. /data/vendor/libgit2/src/{idxmap.c → libgit2/idxmap.c} +0 -0
  475. /data/vendor/libgit2/src/{idxmap.h → libgit2/idxmap.h} +0 -0
  476. /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
  477. /data/vendor/libgit2/src/{libgit2.h → libgit2/libgit2.h} +0 -0
  478. /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
  479. /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
  480. /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
  481. /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
  482. /data/vendor/libgit2/src/{offmap.c → libgit2/offmap.c} +0 -0
  483. /data/vendor/libgit2/src/{offmap.h → libgit2/offmap.h} +0 -0
  484. /data/vendor/libgit2/src/{oidarray.c → libgit2/oidarray.c} +0 -0
  485. /data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +0 -0
  486. /data/vendor/libgit2/src/{oidmap.h → libgit2/oidmap.h} +0 -0
  487. /data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +0 -0
  488. /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
  489. /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
  490. /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
  491. /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
  492. /data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +0 -0
  493. /data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +0 -0
  494. /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
  495. /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
  496. /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
  497. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +0 -0
  498. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
  499. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
  500. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
  501. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
  502. /data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +0 -0
  503. /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +0 -0
  504. /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
  505. /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +0 -0
  506. /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
  507. /data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +0 -0
  508. /data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +0 -0
  509. /data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +0 -0
  510. /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
  511. /data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.h +0 -0
  512. /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
  513. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.h +0 -0
  514. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.h +0 -0
  515. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmacros.h +0 -0
  516. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.h +0 -0
  517. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xtypes.h +0 -0
  518. /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.h +0 -0
  519. /data/vendor/libgit2/src/{alloc.c → util/alloc.c} +0 -0
  520. /data/vendor/libgit2/src/{alloc.h → util/alloc.h} +0 -0
  521. /data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.c +0 -0
  522. /data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.c +0 -0
  523. /data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.c +0 -0
  524. /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
  525. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
  526. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
  527. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
  528. /data/vendor/libgit2/src/{integer.h → util/integer.h} +0 -0
  529. /data/vendor/libgit2/src/{pool.c → util/pool.c} +0 -0
  530. /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
  531. /data/vendor/libgit2/src/{strmap.c → util/strmap.c} +0 -0
  532. /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
  533. /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
  534. /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
  535. /data/vendor/libgit2/src/{vector.c → util/vector.c} +0 -0
  536. /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
  537. /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
  538. /data/vendor/libgit2/src/{win32 → util/win32}/error.c +0 -0
  539. /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
  540. /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
  541. /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
  542. /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
  543. /data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.c +0 -0
  544. /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
  545. /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
  546. /data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +0 -0
  547. /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -5,7 +5,7 @@
5
5
  # GSSAPI_ROOT_DIR - Set this variable to the root installation of GSSAPI
6
6
  #
7
7
  # Read-Only variables:
8
- # GSSAPI_FLAVOR_MIT - set to TURE if MIT Kerberos has been found
8
+ # GSSAPI_FLAVOR_MIT - set to TRUE if MIT Kerberos has been found
9
9
  # GSSAPI_FLAVOR_HEIMDAL - set to TRUE if Heimdal Kerberos has been found
10
10
  # GSSAPI_FOUND - system has GSSAPI
11
11
  # GSSAPI_INCLUDE_DIR - the GSSAPI include directory
@@ -25,300 +25,184 @@
25
25
  #
26
26
 
27
27
  find_path(GSSAPI_ROOT_DIR
28
- NAMES
29
- include/gssapi.h
30
- include/gssapi/gssapi.h
31
- HINTS
32
- ${_GSSAPI_ROOT_HINTS}
33
- PATHS
34
- ${_GSSAPI_ROOT_PATHS}
35
- )
28
+ NAMES include/gssapi.h include/gssapi/gssapi.h
29
+ HINTS ${_GSSAPI_ROOT_HINTS}
30
+ PATHS ${_GSSAPI_ROOT_PATHS})
36
31
  mark_as_advanced(GSSAPI_ROOT_DIR)
37
32
 
38
- if (UNIX)
39
- find_program(KRB5_CONFIG
40
- NAMES
41
- krb5-config
42
- PATHS
43
- ${GSSAPI_ROOT_DIR}/bin
44
- /opt/local/bin)
45
- mark_as_advanced(KRB5_CONFIG)
46
-
47
- if (KRB5_CONFIG)
48
- # Check if we have MIT KRB5
49
- execute_process(
50
- COMMAND
51
- ${KRB5_CONFIG} --vendor
52
- RESULT_VARIABLE
53
- _GSSAPI_VENDOR_RESULT
54
- OUTPUT_VARIABLE
55
- _GSSAPI_VENDOR_STRING)
56
-
57
- if (_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*")
58
- set(GSSAPI_FLAVOR_MIT TRUE)
59
- else()
60
- execute_process(
61
- COMMAND
62
- ${KRB5_CONFIG} --libs gssapi
63
- RESULT_VARIABLE
64
- _GSSAPI_LIBS_RESULT
65
- OUTPUT_VARIABLE
66
- _GSSAPI_LIBS_STRING)
67
-
68
- if (_GSSAPI_LIBS_STRING MATCHES ".*roken.*")
69
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
70
- endif()
71
- endif()
72
-
73
- # Get the include dir
74
- execute_process(
75
- COMMAND
76
- ${KRB5_CONFIG} --cflags gssapi
77
- RESULT_VARIABLE
78
- _GSSAPI_INCLUDE_RESULT
79
- OUTPUT_VARIABLE
80
- _GSSAPI_INCLUDE_STRING)
81
- string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}")
82
- string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}")
83
- endif()
84
-
85
- if (NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL)
86
- # Check for HEIMDAL
87
- find_package(PkgConfig)
88
- if (PKG_CONFIG_FOUND)
89
- pkg_check_modules(_GSSAPI heimdal-gssapi)
90
- endif (PKG_CONFIG_FOUND)
91
-
92
- if (_GSSAPI_FOUND)
93
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
94
- else()
95
- find_path(_GSSAPI_ROKEN
96
- NAMES
97
- roken.h
98
- PATHS
99
- ${GSSAPI_ROOT_DIR}/include
100
- ${_GSSAPI_INCLUDEDIR})
101
- if (_GSSAPI_ROKEN)
102
- set(GSSAPI_FLAVOR_HEIMDAL TRUE)
103
- endif()
104
- endif ()
105
- endif()
106
- endif (UNIX)
33
+ if(UNIX)
34
+ find_program(KRB5_CONFIG
35
+ NAMES krb5-config
36
+ PATHS ${GSSAPI_ROOT_DIR}/bin /opt/local/bin)
37
+ mark_as_advanced(KRB5_CONFIG)
38
+
39
+ if(KRB5_CONFIG)
40
+ # Check if we have MIT KRB5
41
+ execute_process(
42
+ COMMAND ${KRB5_CONFIG} --vendor
43
+ RESULT_VARIABLE _GSSAPI_VENDOR_RESULT
44
+ OUTPUT_VARIABLE _GSSAPI_VENDOR_STRING)
45
+
46
+ if(_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*")
47
+ set(GSSAPI_FLAVOR_MIT TRUE)
48
+ else()
49
+ execute_process(
50
+ COMMAND ${KRB5_CONFIG} --libs gssapi
51
+ RESULT_VARIABLE _GSSAPI_LIBS_RESULT
52
+ OUTPUT_VARIABLE _GSSAPI_LIBS_STRING)
53
+
54
+ if(_GSSAPI_LIBS_STRING MATCHES ".*roken.*")
55
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
56
+ endif()
57
+ endif()
58
+
59
+ # Get the include dir
60
+ execute_process(
61
+ COMMAND ${KRB5_CONFIG} --cflags gssapi
62
+ RESULT_VARIABLE _GSSAPI_INCLUDE_RESULT
63
+ OUTPUT_VARIABLE _GSSAPI_INCLUDE_STRING)
64
+ string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}")
65
+ string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}")
66
+ endif()
67
+
68
+ if(NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL)
69
+ # Check for HEIMDAL
70
+ find_package(PkgConfig)
71
+ if(PKG_CONFIG_FOUND)
72
+ pkg_check_modules(_GSSAPI heimdal-gssapi)
73
+ endif()
74
+
75
+ if(_GSSAPI_FOUND)
76
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
77
+ else()
78
+ find_path(_GSSAPI_ROKEN
79
+ NAMES roken.h
80
+ PATHS ${GSSAPI_ROOT_DIR}/include ${_GSSAPI_INCLUDEDIR})
81
+ if(_GSSAPI_ROKEN)
82
+ set(GSSAPI_FLAVOR_HEIMDAL TRUE)
83
+ endif()
84
+ endif()
85
+ endif()
86
+ endif()
107
87
 
108
88
  find_path(GSSAPI_INCLUDE_DIR
109
- NAMES
110
- gssapi.h
111
- gssapi/gssapi.h
112
- PATHS
113
- ${GSSAPI_ROOT_DIR}/include
114
- ${_GSSAPI_INCLUDEDIR}
115
- )
116
-
117
- if (GSSAPI_FLAVOR_MIT)
118
- find_library(GSSAPI_LIBRARY
119
- NAMES
120
- gssapi_krb5
121
- PATHS
122
- ${GSSAPI_ROOT_DIR}/lib
123
- ${_GSSAPI_LIBDIR}
124
- )
125
-
126
- find_library(KRB5_LIBRARY
127
- NAMES
128
- krb5
129
- PATHS
130
- ${GSSAPI_ROOT_DIR}/lib
131
- ${_GSSAPI_LIBDIR}
132
- )
133
-
134
- find_library(K5CRYPTO_LIBRARY
135
- NAMES
136
- k5crypto
137
- PATHS
138
- ${GSSAPI_ROOT_DIR}/lib
139
- ${_GSSAPI_LIBDIR}
140
- )
141
-
142
- find_library(COM_ERR_LIBRARY
143
- NAMES
144
- com_err
145
- PATHS
146
- ${GSSAPI_ROOT_DIR}/lib
147
- ${_GSSAPI_LIBDIR}
148
- )
149
-
150
- if (GSSAPI_LIBRARY)
151
- set(GSSAPI_LIBRARIES
152
- ${GSSAPI_LIBRARIES}
153
- ${GSSAPI_LIBRARY}
154
- )
155
- endif (GSSAPI_LIBRARY)
156
-
157
- if (KRB5_LIBRARY)
158
- set(GSSAPI_LIBRARIES
159
- ${GSSAPI_LIBRARIES}
160
- ${KRB5_LIBRARY}
161
- )
162
- endif (KRB5_LIBRARY)
163
-
164
- if (K5CRYPTO_LIBRARY)
165
- set(GSSAPI_LIBRARIES
166
- ${GSSAPI_LIBRARIES}
167
- ${K5CRYPTO_LIBRARY}
168
- )
169
- endif (K5CRYPTO_LIBRARY)
170
-
171
- if (COM_ERR_LIBRARY)
172
- set(GSSAPI_LIBRARIES
173
- ${GSSAPI_LIBRARIES}
174
- ${COM_ERR_LIBRARY}
175
- )
176
- endif (COM_ERR_LIBRARY)
177
- endif (GSSAPI_FLAVOR_MIT)
178
-
179
- if (GSSAPI_FLAVOR_HEIMDAL)
180
- find_library(GSSAPI_LIBRARY
181
- NAMES
182
- gssapi
183
- PATHS
184
- ${GSSAPI_ROOT_DIR}/lib
185
- ${_GSSAPI_LIBDIR}
186
- )
187
-
188
- find_library(KRB5_LIBRARY
189
- NAMES
190
- krb5
191
- PATHS
192
- ${GSSAPI_ROOT_DIR}/lib
193
- ${_GSSAPI_LIBDIR}
194
- )
195
-
196
- find_library(HCRYPTO_LIBRARY
197
- NAMES
198
- hcrypto
199
- PATHS
200
- ${GSSAPI_ROOT_DIR}/lib
201
- ${_GSSAPI_LIBDIR}
202
- )
203
-
204
- find_library(COM_ERR_LIBRARY
205
- NAMES
206
- com_err
207
- PATHS
208
- ${GSSAPI_ROOT_DIR}/lib
209
- ${_GSSAPI_LIBDIR}
210
- )
211
-
212
- find_library(HEIMNTLM_LIBRARY
213
- NAMES
214
- heimntlm
215
- PATHS
216
- ${GSSAPI_ROOT_DIR}/lib
217
- ${_GSSAPI_LIBDIR}
218
- )
219
-
220
- find_library(HX509_LIBRARY
221
- NAMES
222
- hx509
223
- PATHS
224
- ${GSSAPI_ROOT_DIR}/lib
225
- ${_GSSAPI_LIBDIR}
226
- )
227
-
228
- find_library(ASN1_LIBRARY
229
- NAMES
230
- asn1
231
- PATHS
232
- ${GSSAPI_ROOT_DIR}/lib
233
- ${_GSSAPI_LIBDIR}
234
- )
235
-
236
- find_library(WIND_LIBRARY
237
- NAMES
238
- wind
239
- PATHS
240
- ${GSSAPI_ROOT_DIR}/lib
241
- ${_GSSAPI_LIBDIR}
242
- )
243
-
244
- find_library(ROKEN_LIBRARY
245
- NAMES
246
- roken
247
- PATHS
248
- ${GSSAPI_ROOT_DIR}/lib
249
- ${_GSSAPI_LIBDIR}
250
- )
251
-
252
- if (GSSAPI_LIBRARY)
253
- set(GSSAPI_LIBRARIES
254
- ${GSSAPI_LIBRARIES}
255
- ${GSSAPI_LIBRARY}
256
- )
257
- endif (GSSAPI_LIBRARY)
258
-
259
- if (KRB5_LIBRARY)
260
- set(GSSAPI_LIBRARIES
261
- ${GSSAPI_LIBRARIES}
262
- ${KRB5_LIBRARY}
263
- )
264
- endif (KRB5_LIBRARY)
265
-
266
- if (HCRYPTO_LIBRARY)
267
- set(GSSAPI_LIBRARIES
268
- ${GSSAPI_LIBRARIES}
269
- ${HCRYPTO_LIBRARY}
270
- )
271
- endif (HCRYPTO_LIBRARY)
272
-
273
- if (COM_ERR_LIBRARY)
274
- set(GSSAPI_LIBRARIES
275
- ${GSSAPI_LIBRARIES}
276
- ${COM_ERR_LIBRARY}
277
- )
278
- endif (COM_ERR_LIBRARY)
279
-
280
- if (HEIMNTLM_LIBRARY)
281
- set(GSSAPI_LIBRARIES
282
- ${GSSAPI_LIBRARIES}
283
- ${HEIMNTLM_LIBRARY}
284
- )
285
- endif (HEIMNTLM_LIBRARY)
286
-
287
- if (HX509_LIBRARY)
288
- set(GSSAPI_LIBRARIES
289
- ${GSSAPI_LIBRARIES}
290
- ${HX509_LIBRARY}
291
- )
292
- endif (HX509_LIBRARY)
293
-
294
- if (ASN1_LIBRARY)
295
- set(GSSAPI_LIBRARIES
296
- ${GSSAPI_LIBRARIES}
297
- ${ASN1_LIBRARY}
298
- )
299
- endif (ASN1_LIBRARY)
300
-
301
- if (WIND_LIBRARY)
302
- set(GSSAPI_LIBRARIES
303
- ${GSSAPI_LIBRARIES}
304
- ${WIND_LIBRARY}
305
- )
306
- endif (WIND_LIBRARY)
307
-
308
- if (ROKEN_LIBRARY)
309
- set(GSSAPI_LIBRARIES
310
- ${GSSAPI_LIBRARIES}
311
- ${WIND_LIBRARY}
312
- )
313
- endif (ROKEN_LIBRARY)
314
- endif (GSSAPI_FLAVOR_HEIMDAL)
89
+ NAMES gssapi.h gssapi/gssapi.h
90
+ PATHS ${GSSAPI_ROOT_DIR}/include ${_GSSAPI_INCLUDEDIR})
91
+
92
+ if(GSSAPI_FLAVOR_MIT)
93
+ find_library(GSSAPI_LIBRARY
94
+ NAMES gssapi_krb5
95
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
96
+
97
+ find_library(KRB5_LIBRARY
98
+ NAMES krb5
99
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
100
+
101
+ find_library(K5CRYPTO_LIBRARY
102
+ NAMES k5crypto
103
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
104
+
105
+ find_library(COM_ERR_LIBRARY
106
+ NAMES com_err
107
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
108
+
109
+ if(GSSAPI_LIBRARY)
110
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${GSSAPI_LIBRARY})
111
+ endif()
112
+
113
+ if(KRB5_LIBRARY)
114
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${KRB5_LIBRARY})
115
+ endif()
116
+
117
+ if(K5CRYPTO_LIBRARY)
118
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${K5CRYPTO_LIBRARY})
119
+ endif()
120
+
121
+ if(COM_ERR_LIBRARY)
122
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${COM_ERR_LIBRARY})
123
+ endif()
124
+ endif()
125
+
126
+ if(GSSAPI_FLAVOR_HEIMDAL)
127
+ find_library(GSSAPI_LIBRARY
128
+ NAMES gssapi
129
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
130
+
131
+ find_library(KRB5_LIBRARY
132
+ NAMES krb5
133
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
134
+
135
+ find_library(HCRYPTO_LIBRARY
136
+ NAMES hcrypto
137
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
138
+
139
+ find_library(COM_ERR_LIBRARY
140
+ NAMES com_err
141
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
142
+
143
+ find_library(HEIMNTLM_LIBRARY
144
+ NAMES heimntlm
145
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
146
+
147
+ find_library(HX509_LIBRARY
148
+ NAMES hx509
149
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
150
+
151
+ find_library(ASN1_LIBRARY
152
+ NAMES asn1
153
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
154
+
155
+ find_library(WIND_LIBRARY
156
+ NAMES wind
157
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
158
+
159
+ find_library(ROKEN_LIBRARY
160
+ NAMES roken
161
+ PATHS ${GSSAPI_ROOT_DIR}/lib ${_GSSAPI_LIBDIR})
162
+
163
+ if(GSSAPI_LIBRARY)
164
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${GSSAPI_LIBRARY})
165
+ endif()
166
+
167
+ if(KRB5_LIBRARY)
168
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${KRB5_LIBRARY})
169
+ endif()
170
+
171
+ if(HCRYPTO_LIBRARY)
172
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HCRYPTO_LIBRARY})
173
+ endif()
174
+
175
+ if(COM_ERR_LIBRARY)
176
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${COM_ERR_LIBRARY})
177
+ endif()
178
+
179
+ if(HEIMNTLM_LIBRARY)
180
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HEIMNTLM_LIBRARY})
181
+ endif()
182
+
183
+ if(HX509_LIBRARY)
184
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${HX509_LIBRARY})
185
+ endif()
186
+
187
+ if(ASN1_LIBRARY)
188
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${ASN1_LIBRARY})
189
+ endif()
190
+
191
+ if(WIND_LIBRARY)
192
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${WIND_LIBRARY})
193
+ endif()
194
+
195
+ if(ROKEN_LIBRARY)
196
+ set(GSSAPI_LIBRARIES ${GSSAPI_LIBRARIES} ${WIND_LIBRARY})
197
+ endif()
198
+ endif()
315
199
 
316
200
  include(FindPackageHandleStandardArgs)
317
201
  find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIR)
318
202
 
319
- if (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
320
- set(GSSAPI_FOUND TRUE)
321
- endif (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
203
+ if(GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
204
+ set(GSSAPI_FOUND TRUE)
205
+ endif(GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES)
322
206
 
323
207
  # show the GSSAPI_INCLUDE_DIRS and GSSAPI_LIBRARIES variables only in the advanced view
324
208
  mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES)
@@ -7,21 +7,21 @@
7
7
  # GSSFRAMEWORK_LDFLAGS
8
8
  #
9
9
 
10
- FIND_PATH(GSSFRAMEWORK_INCLUDE_DIR NAMES GSS.h)
11
- FIND_LIBRARY(GSSFRAMEWORK_LIBRARIES NAMES GSS)
12
- IF (GSSFRAMEWORK_INCLUDE_DIR AND GSSFRAMEWORK_LIBRARIES)
13
- IF (NOT CoreFoundation_FIND_QUIETLY)
14
- MESSAGE(STATUS "Found GSS.framework ${GSSFRAMEWORK_LIBRARIES}")
15
- ENDIF()
16
- SET(GSSFRAMEWORK_FOUND TRUE)
17
- SET(GSSFRAMEWORK_LDFLAGS "-framework GSS")
18
- ENDIF ()
10
+ find_path(GSSFRAMEWORK_INCLUDE_DIR NAMES GSS.h)
11
+ find_library(GSSFRAMEWORK_LIBRARIES NAMES GSS)
12
+ if(GSSFRAMEWORK_INCLUDE_DIR AND GSSFRAMEWORK_LIBRARIES)
13
+ if(NOT CoreFoundation_FIND_QUIETLY)
14
+ message(STATUS "Found GSS.framework ${GSSFRAMEWORK_LIBRARIES}")
15
+ endif()
16
+ set(GSSFRAMEWORK_FOUND TRUE)
17
+ set(GSSFRAMEWORK_LDFLAGS "-framework GSS")
18
+ endif()
19
19
 
20
- IF (GSS_FIND_REQUIRED AND NOT GSSFRAMEWORK_FOUND)
21
- MESSAGE(FATAL_ERROR "CoreFoundation not found")
22
- ENDIF()
20
+ if(GSS_FIND_REQUIRED AND NOT GSSFRAMEWORK_FOUND)
21
+ message(FATAL_ERROR "CoreFoundation not found")
22
+ endif()
23
23
 
24
- MARK_AS_ADVANCED(
24
+ mark_as_advanced(
25
25
  GSSFRAMEWORK_INCLUDE_DIR
26
26
  GSSFRAMEWORK_LIBRARIES
27
27
  GSSFRAMEWORK_LDFLAGS
@@ -10,30 +10,30 @@
10
10
  # HTTP_PARSER_VERSION_STRING - the version of http-parser found
11
11
 
12
12
  # Find the header and library
13
- FIND_PATH(HTTP_PARSER_INCLUDE_DIR NAMES http_parser.h)
14
- FIND_LIBRARY(HTTP_PARSER_LIBRARY NAMES http_parser libhttp_parser)
13
+ find_path(HTTP_PARSER_INCLUDE_DIR NAMES http_parser.h)
14
+ find_library(HTTP_PARSER_LIBRARY NAMES http_parser libhttp_parser)
15
15
 
16
16
  # Found the header, read version
17
- if (HTTP_PARSER_INCLUDE_DIR AND EXISTS "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h")
18
- FILE(READ "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h" HTTP_PARSER_H)
19
- IF (HTTP_PARSER_H)
20
- STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MAJOR "${HTTP_PARSER_H}")
21
- STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MINOR "${HTTP_PARSER_H}")
22
- SET(HTTP_PARSER_VERSION_STRING "${HTTP_PARSER_VERSION_MAJOR}.${HTTP_PARSER_VERSION_MINOR}")
23
- ENDIF()
24
- UNSET(HTTP_PARSER_H)
25
- ENDIF()
17
+ if(HTTP_PARSER_INCLUDE_DIR AND EXISTS "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h")
18
+ file(READ "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h" HTTP_PARSER_H)
19
+ if(HTTP_PARSER_H)
20
+ string(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MAJOR "${HTTP_PARSER_H}")
21
+ string(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MINOR "${HTTP_PARSER_H}")
22
+ set(HTTP_PARSER_VERSION_STRING "${HTTP_PARSER_VERSION_MAJOR}.${HTTP_PARSER_VERSION_MINOR}")
23
+ endif()
24
+ unset(HTTP_PARSER_H)
25
+ endif()
26
26
 
27
27
  # Handle the QUIETLY and REQUIRED arguments and set HTTP_PARSER_FOUND
28
28
  # to TRUE if all listed variables are TRUE
29
- INCLUDE(FindPackageHandleStandardArgs)
30
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(HTTP_Parser REQUIRED_VARS HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
29
+ include(FindPackageHandleStandardArgs)
30
+ find_package_handle_standard_args(HTTP_Parser REQUIRED_VARS HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
31
31
 
32
32
  # Hide advanced variables
33
- MARK_AS_ADVANCED(HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
33
+ mark_as_advanced(HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY)
34
34
 
35
35
  # Set standard variables
36
- IF (HTTP_PARSER_FOUND)
37
- SET(HTTP_PARSER_LIBRARIES ${HTTP_PARSER_LIBRARY})
36
+ if(HTTP_PARSER_FOUND)
37
+ set(HTTP_PARSER_LIBRARIES ${HTTP_PARSER_LIBRARY})
38
38
  set(HTTP_PARSER_INCLUDE_DIRS ${HTTP_PARSER_INCLUDE_DIR})
39
- ENDIF()
39
+ endif()
@@ -6,40 +6,40 @@
6
6
  # ICONV_LIBRARIES - Link these to use Iconv
7
7
  #
8
8
 
9
- IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
9
+ if(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
10
10
  # Already in cache, be silent
11
- SET(ICONV_FIND_QUIETLY TRUE)
12
- ENDIF()
11
+ set(ICONV_FIND_QUIETLY TRUE)
12
+ endif()
13
13
 
14
- FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
15
- CHECK_FUNCTION_EXISTS(iconv_open libc_has_iconv)
16
- FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c)
14
+ find_path(ICONV_INCLUDE_DIR iconv.h)
15
+ check_function_exists(iconv_open libc_has_iconv)
16
+ find_library(iconv_lib NAMES iconv libiconv libiconv-2 c)
17
17
 
18
- IF(ICONV_INCLUDE_DIR AND libc_has_iconv)
19
- SET(ICONV_FOUND TRUE)
20
- SET(ICONV_LIBRARIES "")
21
- IF(NOT ICONV_FIND_QUIETLY)
22
- MESSAGE(STATUS "Found Iconv: provided by libc")
23
- ENDIF(NOT ICONV_FIND_QUIETLY)
24
- ELSEIF(ICONV_INCLUDE_DIR AND iconv_lib)
25
- SET(ICONV_FOUND TRUE)
18
+ if(ICONV_INCLUDE_DIR AND libc_has_iconv)
19
+ set(ICONV_FOUND TRUE)
20
+ set(ICONV_LIBRARIES "")
21
+ if(NOT ICONV_FIND_QUIETLY)
22
+ message(STATUS "Found Iconv: provided by libc")
23
+ endif(NOT ICONV_FIND_QUIETLY)
24
+ elseif(ICONV_INCLUDE_DIR AND iconv_lib)
25
+ set(ICONV_FOUND TRUE)
26
26
  # split iconv into -L and -l linker options, so we can
27
27
  # set them for pkg-config
28
- GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH)
29
- GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE)
30
- STRING(REGEX REPLACE "^lib" "" iconv_name ${iconv_name})
31
- SET(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}")
28
+ get_filename_component(iconv_path ${iconv_lib} PATH)
29
+ get_filename_component(iconv_name ${iconv_lib} NAME_WE)
30
+ string(REGEX REPLACE "^lib" "" iconv_name ${iconv_name})
31
+ set(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}")
32
32
 
33
- IF(NOT ICONV_FIND_QUIETLY)
34
- MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
35
- ENDIF(NOT ICONV_FIND_QUIETLY)
36
- ELSE()
37
- IF(Iconv_FIND_REQUIRED)
38
- MESSAGE(FATAL_ERROR "Could not find Iconv")
39
- ENDIF(Iconv_FIND_REQUIRED)
40
- ENDIF()
33
+ if(NOT ICONV_FIND_QUIETLY)
34
+ message(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
35
+ endif()
36
+ else()
37
+ if(Iconv_FIND_REQUIRED)
38
+ message(FATAL_ERROR "Could not find Iconv")
39
+ endif(Iconv_FIND_REQUIRED)
40
+ endif()
41
41
 
42
- MARK_AS_ADVANCED(
42
+ mark_as_advanced(
43
43
  ICONV_INCLUDE_DIR
44
44
  ICONV_LIBRARIES
45
45
  )
@@ -2,12 +2,12 @@
2
2
  # LIBSSH2_INCLUDE_DIR - the libssh2 include directory
3
3
  # LIBSSH2_LIBRARY - the libssh2 library name
4
4
 
5
- FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h)
5
+ find_path(LIBSSH2_INCLUDE_DIR libssh2.h)
6
6
 
7
- FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
7
+ find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
8
8
 
9
- INCLUDE(FindPackageHandleStandardArgs)
9
+ include(FindPackageHandleStandardArgs)
10
10
  find_package_handle_standard_args(LibSSH2
11
- REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR)
11
+ REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR)
12
12
 
13
- MARK_AS_ADVANCED(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)
13
+ mark_as_advanced(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)