rugged 0.28.5 → 0.99.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (379) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rugged/extconf.rb +3 -1
  3. data/ext/rugged/rugged.c +35 -31
  4. data/ext/rugged/rugged.h +13 -0
  5. data/ext/rugged/rugged_blob.c +11 -9
  6. data/ext/rugged/rugged_commit.c +17 -15
  7. data/ext/rugged/rugged_diff.c +4 -26
  8. data/ext/rugged/rugged_index.c +4 -2
  9. data/ext/rugged/rugged_note.c +5 -3
  10. data/ext/rugged/rugged_object.c +57 -10
  11. data/ext/rugged/rugged_rebase.c +3 -1
  12. data/ext/rugged/rugged_remote.c +0 -6
  13. data/ext/rugged/rugged_repo.c +222 -17
  14. data/ext/rugged/rugged_tag.c +8 -6
  15. data/ext/rugged/rugged_tree.c +18 -16
  16. data/lib/rugged/version.rb +1 -1
  17. data/vendor/libgit2/CMakeLists.txt +38 -19
  18. data/vendor/libgit2/COPYING +28 -0
  19. data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +5 -1
  20. data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
  21. data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
  22. data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
  23. data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
  24. data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
  25. data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
  26. data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
  27. data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
  28. data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
  29. data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
  30. data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
  31. data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
  32. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
  33. data/vendor/libgit2/deps/ntlmclient/compat.h +33 -0
  34. data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
  35. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
  36. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
  37. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
  38. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
  39. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
  40. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
  41. data/vendor/libgit2/deps/ntlmclient/ntlm.c +1422 -0
  42. data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
  43. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
  44. data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
  45. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
  46. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
  47. data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
  48. data/vendor/libgit2/deps/ntlmclient/util.c +21 -0
  49. data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
  50. data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
  51. data/vendor/libgit2/deps/pcre/COPYING +5 -0
  52. data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
  53. data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
  54. data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
  55. data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
  56. data/vendor/libgit2/deps/pcre/config.h.in +57 -0
  57. data/vendor/libgit2/deps/pcre/pcre.h +641 -0
  58. data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
  59. data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
  60. data/vendor/libgit2/deps/pcre/pcre_compile.c +9800 -0
  61. data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
  62. data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
  63. data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
  64. data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
  65. data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
  66. data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
  67. data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
  68. data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
  69. data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
  70. data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
  71. data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
  72. data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
  73. data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
  74. data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
  75. data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
  76. data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
  77. data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
  78. data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
  79. data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
  80. data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
  81. data/vendor/libgit2/deps/pcre/pcreposix.c +421 -0
  82. data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
  83. data/vendor/libgit2/deps/pcre/ucp.h +224 -0
  84. data/vendor/libgit2/deps/zlib/adler32.c +0 -7
  85. data/vendor/libgit2/deps/zlib/crc32.c +0 -7
  86. data/vendor/libgit2/include/git2.h +2 -0
  87. data/vendor/libgit2/include/git2/apply.h +22 -2
  88. data/vendor/libgit2/include/git2/attr.h +23 -13
  89. data/vendor/libgit2/include/git2/blame.h +2 -2
  90. data/vendor/libgit2/include/git2/blob.h +44 -12
  91. data/vendor/libgit2/include/git2/branch.h +74 -57
  92. data/vendor/libgit2/include/git2/buffer.h +20 -14
  93. data/vendor/libgit2/include/git2/cert.h +135 -0
  94. data/vendor/libgit2/include/git2/checkout.h +46 -14
  95. data/vendor/libgit2/include/git2/cherrypick.h +3 -3
  96. data/vendor/libgit2/include/git2/clone.h +2 -2
  97. data/vendor/libgit2/include/git2/commit.h +23 -1
  98. data/vendor/libgit2/include/git2/common.h +15 -6
  99. data/vendor/libgit2/include/git2/config.h +12 -12
  100. data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
  101. data/vendor/libgit2/include/git2/credential.h +314 -0
  102. data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
  103. data/vendor/libgit2/include/git2/deprecated.h +314 -3
  104. data/vendor/libgit2/include/git2/describe.h +4 -4
  105. data/vendor/libgit2/include/git2/diff.h +16 -14
  106. data/vendor/libgit2/include/git2/errors.h +4 -2
  107. data/vendor/libgit2/include/git2/filter.h +8 -0
  108. data/vendor/libgit2/include/git2/index.h +2 -1
  109. data/vendor/libgit2/include/git2/indexer.h +48 -4
  110. data/vendor/libgit2/include/git2/merge.h +6 -10
  111. data/vendor/libgit2/include/git2/net.h +0 -5
  112. data/vendor/libgit2/include/git2/object.h +2 -14
  113. data/vendor/libgit2/include/git2/odb.h +3 -2
  114. data/vendor/libgit2/include/git2/odb_backend.h +5 -4
  115. data/vendor/libgit2/include/git2/oid.h +11 -6
  116. data/vendor/libgit2/include/git2/pack.h +12 -1
  117. data/vendor/libgit2/include/git2/proxy.h +6 -4
  118. data/vendor/libgit2/include/git2/rebase.h +46 -2
  119. data/vendor/libgit2/include/git2/refs.h +19 -0
  120. data/vendor/libgit2/include/git2/remote.h +40 -15
  121. data/vendor/libgit2/include/git2/repository.h +24 -2
  122. data/vendor/libgit2/include/git2/revert.h +1 -1
  123. data/vendor/libgit2/include/git2/revwalk.h +7 -3
  124. data/vendor/libgit2/include/git2/stash.h +4 -4
  125. data/vendor/libgit2/include/git2/status.h +25 -16
  126. data/vendor/libgit2/include/git2/submodule.h +20 -3
  127. data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
  128. data/vendor/libgit2/include/git2/sys/cred.h +15 -0
  129. data/vendor/libgit2/include/git2/sys/credential.h +90 -0
  130. data/vendor/libgit2/include/git2/sys/index.h +4 -2
  131. data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
  132. data/vendor/libgit2/include/git2/sys/merge.h +1 -1
  133. data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
  134. data/vendor/libgit2/include/git2/sys/refdb_backend.h +57 -21
  135. data/vendor/libgit2/include/git2/sys/repository.h +17 -6
  136. data/vendor/libgit2/include/git2/sys/transport.h +4 -4
  137. data/vendor/libgit2/include/git2/tag.h +11 -2
  138. data/vendor/libgit2/include/git2/trace.h +2 -2
  139. data/vendor/libgit2/include/git2/transport.h +11 -340
  140. data/vendor/libgit2/include/git2/tree.h +5 -3
  141. data/vendor/libgit2/include/git2/types.h +4 -89
  142. data/vendor/libgit2/include/git2/version.h +4 -4
  143. data/vendor/libgit2/include/git2/worktree.h +5 -5
  144. data/vendor/libgit2/src/CMakeLists.txt +89 -224
  145. data/vendor/libgit2/src/alloc.c +2 -14
  146. data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
  147. data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
  148. data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
  149. data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
  150. data/vendor/libgit2/src/apply.c +31 -15
  151. data/vendor/libgit2/src/attr.c +70 -64
  152. data/vendor/libgit2/src/attr_file.c +189 -96
  153. data/vendor/libgit2/src/attr_file.h +9 -9
  154. data/vendor/libgit2/src/attrcache.c +47 -47
  155. data/vendor/libgit2/src/attrcache.h +2 -1
  156. data/vendor/libgit2/src/blame.c +17 -5
  157. data/vendor/libgit2/src/blame.h +1 -1
  158. data/vendor/libgit2/src/blame_git.c +21 -7
  159. data/vendor/libgit2/src/blob.c +81 -17
  160. data/vendor/libgit2/src/blob.h +2 -2
  161. data/vendor/libgit2/src/branch.c +60 -32
  162. data/vendor/libgit2/src/buffer.c +5 -0
  163. data/vendor/libgit2/src/buffer.h +1 -0
  164. data/vendor/libgit2/src/cache.c +26 -33
  165. data/vendor/libgit2/src/cache.h +1 -1
  166. data/vendor/libgit2/src/cc-compat.h +5 -0
  167. data/vendor/libgit2/src/checkout.c +26 -16
  168. data/vendor/libgit2/src/cherrypick.c +7 -1
  169. data/vendor/libgit2/src/clone.c +29 -7
  170. data/vendor/libgit2/src/clone.h +4 -0
  171. data/vendor/libgit2/src/commit.c +70 -22
  172. data/vendor/libgit2/src/commit.h +6 -0
  173. data/vendor/libgit2/src/commit_list.c +28 -76
  174. data/vendor/libgit2/src/commit_list.h +2 -2
  175. data/vendor/libgit2/src/common.h +3 -75
  176. data/vendor/libgit2/src/config.c +31 -40
  177. data/vendor/libgit2/src/config.h +7 -6
  178. data/vendor/libgit2/src/config_backend.h +12 -0
  179. data/vendor/libgit2/src/config_cache.c +39 -39
  180. data/vendor/libgit2/src/config_entries.c +69 -99
  181. data/vendor/libgit2/src/config_entries.h +1 -0
  182. data/vendor/libgit2/src/config_file.c +337 -380
  183. data/vendor/libgit2/src/config_mem.c +12 -16
  184. data/vendor/libgit2/src/config_parse.c +49 -29
  185. data/vendor/libgit2/src/config_parse.h +13 -12
  186. data/vendor/libgit2/src/config_snapshot.c +206 -0
  187. data/vendor/libgit2/src/crlf.c +14 -14
  188. data/vendor/libgit2/src/describe.c +21 -20
  189. data/vendor/libgit2/src/diff.c +43 -66
  190. data/vendor/libgit2/src/diff.h +4 -3
  191. data/vendor/libgit2/src/diff_driver.c +37 -38
  192. data/vendor/libgit2/src/diff_file.c +12 -10
  193. data/vendor/libgit2/src/diff_file.h +2 -2
  194. data/vendor/libgit2/src/diff_generate.c +26 -26
  195. data/vendor/libgit2/src/diff_generate.h +2 -2
  196. data/vendor/libgit2/src/diff_parse.c +1 -1
  197. data/vendor/libgit2/src/diff_print.c +25 -13
  198. data/vendor/libgit2/src/diff_stats.c +1 -1
  199. data/vendor/libgit2/src/diff_tform.c +11 -11
  200. data/vendor/libgit2/src/errors.c +21 -25
  201. data/vendor/libgit2/src/errors.h +81 -0
  202. data/vendor/libgit2/src/features.h.in +9 -2
  203. data/vendor/libgit2/src/fetch.c +7 -2
  204. data/vendor/libgit2/src/fetchhead.c +9 -9
  205. data/vendor/libgit2/src/filebuf.c +1 -1
  206. data/vendor/libgit2/src/filebuf.h +1 -1
  207. data/vendor/libgit2/src/filter.c +16 -8
  208. data/vendor/libgit2/src/{fileops.c → futils.c} +20 -17
  209. data/vendor/libgit2/src/{fileops.h → futils.h} +5 -5
  210. data/vendor/libgit2/src/hash.c +61 -0
  211. data/vendor/libgit2/src/hash.h +19 -21
  212. data/vendor/libgit2/src/hash/sha1.h +38 -0
  213. data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
  214. data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
  215. data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
  216. data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
  217. data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
  218. data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
  219. data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
  220. data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
  221. data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
  222. data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
  223. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
  224. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
  225. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
  226. data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
  227. data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
  228. data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
  229. data/vendor/libgit2/src/hashsig.c +1 -1
  230. data/vendor/libgit2/src/idxmap.c +91 -65
  231. data/vendor/libgit2/src/idxmap.h +151 -15
  232. data/vendor/libgit2/src/ignore.c +26 -35
  233. data/vendor/libgit2/src/index.c +103 -81
  234. data/vendor/libgit2/src/index.h +1 -1
  235. data/vendor/libgit2/src/indexer.c +69 -70
  236. data/vendor/libgit2/src/integer.h +11 -4
  237. data/vendor/libgit2/src/iterator.c +32 -28
  238. data/vendor/libgit2/src/iterator.h +8 -8
  239. data/vendor/libgit2/src/map.h +1 -1
  240. data/vendor/libgit2/src/merge.c +55 -41
  241. data/vendor/libgit2/src/merge.h +2 -2
  242. data/vendor/libgit2/src/merge_driver.c +5 -5
  243. data/vendor/libgit2/src/merge_file.c +1 -1
  244. data/vendor/libgit2/src/mwindow.c +18 -23
  245. data/vendor/libgit2/src/mwindow.h +4 -4
  246. data/vendor/libgit2/src/net.c +411 -0
  247. data/vendor/libgit2/src/net.h +57 -0
  248. data/vendor/libgit2/src/netops.c +6 -222
  249. data/vendor/libgit2/src/netops.h +1 -37
  250. data/vendor/libgit2/src/notes.c +2 -2
  251. data/vendor/libgit2/src/object.c +3 -3
  252. data/vendor/libgit2/src/object.h +2 -0
  253. data/vendor/libgit2/src/odb.c +41 -23
  254. data/vendor/libgit2/src/odb.h +3 -2
  255. data/vendor/libgit2/src/odb_loose.c +17 -10
  256. data/vendor/libgit2/src/odb_mempack.c +13 -24
  257. data/vendor/libgit2/src/odb_pack.c +4 -4
  258. data/vendor/libgit2/src/offmap.c +43 -55
  259. data/vendor/libgit2/src/offmap.h +102 -24
  260. data/vendor/libgit2/src/oid.c +19 -8
  261. data/vendor/libgit2/src/oidmap.c +39 -57
  262. data/vendor/libgit2/src/oidmap.h +99 -19
  263. data/vendor/libgit2/src/pack-objects.c +25 -32
  264. data/vendor/libgit2/src/pack-objects.h +1 -1
  265. data/vendor/libgit2/src/pack.c +97 -129
  266. data/vendor/libgit2/src/pack.h +15 -18
  267. data/vendor/libgit2/src/parse.c +10 -0
  268. data/vendor/libgit2/src/parse.h +3 -3
  269. data/vendor/libgit2/src/patch.c +1 -1
  270. data/vendor/libgit2/src/patch_generate.c +1 -1
  271. data/vendor/libgit2/src/patch_parse.c +30 -9
  272. data/vendor/libgit2/src/path.c +43 -6
  273. data/vendor/libgit2/src/path.h +2 -0
  274. data/vendor/libgit2/src/pathspec.c +14 -14
  275. data/vendor/libgit2/src/pool.c +26 -22
  276. data/vendor/libgit2/src/pool.h +7 -7
  277. data/vendor/libgit2/src/posix.c +7 -7
  278. data/vendor/libgit2/src/posix.h +12 -1
  279. data/vendor/libgit2/src/proxy.c +7 -2
  280. data/vendor/libgit2/src/push.c +10 -5
  281. data/vendor/libgit2/src/reader.c +2 -2
  282. data/vendor/libgit2/src/rebase.c +87 -28
  283. data/vendor/libgit2/src/refdb.c +12 -0
  284. data/vendor/libgit2/src/refdb_fs.c +215 -169
  285. data/vendor/libgit2/src/reflog.c +11 -13
  286. data/vendor/libgit2/src/refs.c +34 -23
  287. data/vendor/libgit2/src/refs.h +8 -1
  288. data/vendor/libgit2/src/refspec.c +9 -16
  289. data/vendor/libgit2/src/regexp.c +221 -0
  290. data/vendor/libgit2/src/regexp.h +97 -0
  291. data/vendor/libgit2/src/remote.c +57 -55
  292. data/vendor/libgit2/src/remote.h +2 -2
  293. data/vendor/libgit2/src/repository.c +120 -103
  294. data/vendor/libgit2/src/repository.h +49 -40
  295. data/vendor/libgit2/src/revert.c +6 -1
  296. data/vendor/libgit2/src/revparse.c +18 -19
  297. data/vendor/libgit2/src/revwalk.c +71 -33
  298. data/vendor/libgit2/src/revwalk.h +20 -0
  299. data/vendor/libgit2/src/settings.c +13 -1
  300. data/vendor/libgit2/src/sortedcache.c +12 -26
  301. data/vendor/libgit2/src/sortedcache.h +1 -1
  302. data/vendor/libgit2/src/stash.c +45 -65
  303. data/vendor/libgit2/src/status.c +17 -11
  304. data/vendor/libgit2/src/streams/openssl.c +53 -1
  305. data/vendor/libgit2/src/streams/socket.c +2 -2
  306. data/vendor/libgit2/src/strmap.c +37 -84
  307. data/vendor/libgit2/src/strmap.h +105 -33
  308. data/vendor/libgit2/src/submodule.c +151 -126
  309. data/vendor/libgit2/src/submodule.h +1 -1
  310. data/vendor/libgit2/src/tag.c +10 -2
  311. data/vendor/libgit2/src/trace.c +1 -1
  312. data/vendor/libgit2/src/trace.h +3 -3
  313. data/vendor/libgit2/src/trailer.c +46 -32
  314. data/vendor/libgit2/src/transaction.c +3 -8
  315. data/vendor/libgit2/src/transports/auth.c +16 -15
  316. data/vendor/libgit2/src/transports/auth.h +18 -11
  317. data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
  318. data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
  319. data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
  320. data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
  321. data/vendor/libgit2/src/transports/credential.c +476 -0
  322. data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +21 -8
  323. data/vendor/libgit2/src/transports/git.c +11 -16
  324. data/vendor/libgit2/src/transports/http.c +488 -1248
  325. data/vendor/libgit2/src/transports/http.h +4 -1
  326. data/vendor/libgit2/src/transports/httpclient.c +1526 -0
  327. data/vendor/libgit2/src/transports/httpclient.h +190 -0
  328. data/vendor/libgit2/src/transports/local.c +10 -10
  329. data/vendor/libgit2/src/transports/smart.c +19 -19
  330. data/vendor/libgit2/src/transports/smart.h +3 -3
  331. data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
  332. data/vendor/libgit2/src/transports/ssh.c +77 -59
  333. data/vendor/libgit2/src/transports/winhttp.c +266 -241
  334. data/vendor/libgit2/src/tree-cache.c +14 -7
  335. data/vendor/libgit2/src/tree.c +16 -26
  336. data/vendor/libgit2/src/unix/map.c +1 -1
  337. data/vendor/libgit2/src/unix/posix.h +2 -12
  338. data/vendor/libgit2/src/userdiff.h +3 -1
  339. data/vendor/libgit2/src/util.c +51 -53
  340. data/vendor/libgit2/src/util.h +16 -21
  341. data/vendor/libgit2/src/wildmatch.c +320 -0
  342. data/vendor/libgit2/src/wildmatch.h +23 -0
  343. data/vendor/libgit2/src/win32/map.c +3 -5
  344. data/vendor/libgit2/src/win32/path_w32.c +12 -2
  345. data/vendor/libgit2/src/win32/path_w32.h +0 -29
  346. data/vendor/libgit2/src/win32/posix.h +1 -4
  347. data/vendor/libgit2/src/win32/posix_w32.c +48 -5
  348. data/vendor/libgit2/src/win32/precompiled.h +0 -2
  349. data/vendor/libgit2/src/win32/thread.c +5 -5
  350. data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
  351. data/vendor/libgit2/src/win32/w32_common.h +39 -0
  352. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
  353. data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
  354. data/vendor/libgit2/src/win32/w32_stack.c +4 -9
  355. data/vendor/libgit2/src/win32/w32_stack.h +3 -3
  356. data/vendor/libgit2/src/win32/w32_util.c +31 -0
  357. data/vendor/libgit2/src/win32/w32_util.h +6 -32
  358. data/vendor/libgit2/src/worktree.c +36 -22
  359. data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
  360. data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
  361. data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
  362. data/vendor/libgit2/src/zstream.c +5 -0
  363. data/vendor/libgit2/src/zstream.h +1 -0
  364. metadata +108 -38
  365. data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
  366. data/vendor/libgit2/deps/regex/COPYING +0 -502
  367. data/vendor/libgit2/deps/regex/config.h +0 -7
  368. data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
  369. data/vendor/libgit2/deps/regex/regex.c +0 -92
  370. data/vendor/libgit2/deps/regex/regex.h +0 -582
  371. data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
  372. data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
  373. data/vendor/libgit2/deps/regex/regexec.c +0 -4369
  374. data/vendor/libgit2/include/git2/inttypes.h +0 -309
  375. data/vendor/libgit2/include/git2/sys/time.h +0 -31
  376. data/vendor/libgit2/libgit2.pc.in +0 -13
  377. data/vendor/libgit2/src/fnmatch.c +0 -248
  378. data/vendor/libgit2/src/fnmatch.h +0 -48
  379. data/vendor/libgit2/src/transports/cred.c +0 -390
@@ -11,7 +11,7 @@ FIND_PATH(SECURITY_INCLUDE_DIR NAMES Security/Security.h)
11
11
  FIND_LIBRARY(SECURITY_LIBRARIES NAMES Security)
12
12
  IF (SECURITY_INCLUDE_DIR AND SECURITY_LIBRARIES)
13
13
  IF (NOT Security_FIND_QUIETLY)
14
- MESSAGE("-- Found Security ${SECURITY_LIBRARIES}")
14
+ MESSAGE(STATUS "Found Security ${SECURITY_LIBRARIES}")
15
15
  ENDIF()
16
16
  SET(SECURITY_FOUND TRUE)
17
17
  SET(SECURITY_LDFLAGS "-framework Security")
@@ -19,7 +19,7 @@ IF (SECURITY_INCLUDE_DIR AND SECURITY_LIBRARIES)
19
19
  ENDIF ()
20
20
 
21
21
  IF (Security_FIND_REQUIRED AND NOT SECURITY_FOUND)
22
- MESSAGE(FATAL "-- Security not found")
22
+ MESSAGE(FATAL_ERROR "Security not found")
23
23
  ENDIF()
24
24
 
25
25
  MARK_AS_ADVANCED(
@@ -1,3 +1,5 @@
1
+ INCLUDE(FeatureSummary)
2
+
1
3
  CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h"
2
4
  HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
3
5
  CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtimespec "sys/types.h;sys/stat.h"
@@ -17,4 +19,8 @@ ENDIF()
17
19
 
18
20
  IF (HAVE_STRUCT_STAT_NSEC OR WIN32)
19
21
  OPTION( USE_NSEC "Care about sub-second file mtimes and ctimes" ON )
22
+ ELSE()
23
+ SET(USE_NSEC OFF)
20
24
  ENDIF()
25
+
26
+ ADD_FEATURE_INFO(nanoseconds USE_NSEC "whether to use sub-second file mtimes and ctimes")
@@ -0,0 +1,110 @@
1
+ # pkg-config file generation
2
+ #
3
+ # Uses the following globals:
4
+ # - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX
5
+ # - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib.
6
+ # - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include.
7
+ #
8
+
9
+ function(pkg_build_config)
10
+ set(options)
11
+ set(oneValueArgs NAME DESCRIPTION VERSION FILENAME LIBS_SELF)
12
+ set(multiValueArgs LIBS PRIVATE_LIBS REQUIRES CFLAGS)
13
+
14
+ cmake_parse_arguments(PKGCONFIG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
15
+
16
+ if (NOT DEFINED PKGCONFIG_FILENAME AND DEFINED PKGCONFIG_NAME)
17
+ set(PKGCONFIG_FILENAME ${PKGCONFIG_NAME})
18
+ endif()
19
+ if (NOT DEFINED PKGCONFIG_FILENAME)
20
+ message(FATAL_ERROR "Missing FILENAME argument")
21
+ endif()
22
+ set(PKGCONFIG_FILE "${PROJECT_BINARY_DIR}/${PKGCONFIG_FILENAME}.pc")
23
+
24
+ if (NOT DEFINED PKGCONFIG_DESCRIPTION)
25
+ message(FATAL_ERROR "Missing DESCRIPTION argument")
26
+ endif()
27
+
28
+ if (NOT DEFINED PKGCONFIG_VERSION)
29
+ message(FATAL_ERROR "Missing VERSION argument")
30
+ endif()
31
+
32
+ if (DEFINED PKG_BUILD_PREFIX)
33
+ set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}")
34
+ else()
35
+ set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
36
+ endif()
37
+
38
+ if(DEFINED PKG_BUILD_LIBDIR)
39
+ if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR})
40
+ set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR})
41
+ else()
42
+ set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}")
43
+ endif()
44
+ else()
45
+ set(PKGCONFIG_LIBDIR "\${prefix}/lib")
46
+ endif()
47
+
48
+ if(DEFINED PKG_BUILD_INCLUDEDIR)
49
+ if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR})
50
+ set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR})
51
+ else()
52
+ set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}")
53
+ endif()
54
+ else()
55
+ set(PKGCONFIG_INCLUDEDIR "\${prefix}/include")
56
+ endif()
57
+
58
+ # Write .pc "header"
59
+ file(WRITE "${PKGCONFIG_FILE}"
60
+ "prefix=\"${PKGCONFIG_PREFIX}\"\n"
61
+ "libdir=\"${PKGCONFIG_LIBDIR}\"\n"
62
+ "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n"
63
+ "\n"
64
+ "Name: ${PKGCONFIG_NAME}\n"
65
+ "Description: ${PKGCONFIG_DESCRIPTION}\n"
66
+ "Version: ${PKGCONFIG_VERSION}\n"
67
+ )
68
+
69
+ # Prepare Libs
70
+ if(NOT DEFINED PKGCONFIG_LIBS_SELF)
71
+ set(PKGCONFIG_LIBS_SELF "${PKGCONFIG_FILE}")
72
+ endif()
73
+
74
+ if(NOT DEFINED PKGCONFIG_LIBS)
75
+ set(PKGCONFIG_LIBS "-l${PKGCONFIG_LIBS_SELF}")
76
+ else()
77
+ list(INSERT PKGCONFIG_LIBS 0 "-l${PKGCONFIG_LIBS_SELF}")
78
+ endif()
79
+
80
+ list(REMOVE_DUPLICATES PKGCONFIG_LIBS)
81
+ string(REPLACE ";" " " PKGCONFIG_LIBS "${PKGCONFIG_LIBS}")
82
+ file(APPEND "${PKGCONFIG_FILE}" "Libs: -L\${libdir} ${PKGCONFIG_LIBS}\n")
83
+
84
+ # Prepare Libs.private
85
+ if(DEFINED PKGCONFIG_PRIVATE_LIBS)
86
+ list(REMOVE_DUPLICATES PKGCONFIG_PRIVATE_LIBS)
87
+ string(REPLACE ";" " " PKGCONFIG_PRIVATE_LIBS "${PKGCONFIG_PRIVATE_LIBS}")
88
+ file(APPEND "${PKGCONFIG_FILE}" "Libs.private: ${PKGCONFIG_PRIVATE_LIBS}\n")
89
+ endif()
90
+
91
+ # Prepare Requires.private
92
+ if(DEFINED PKGCONFIG_REQUIRES)
93
+ list(REMOVE_DUPLICATES PKGCONFIG_REQUIRES)
94
+ string(REPLACE ";" " " PKGCONFIG_REQUIRES "${PKGCONFIG_REQUIRES}")
95
+ file(APPEND "${PKGCONFIG_FILE}" "Requires.private: ${PKGCONFIG_REQUIRES}\n")
96
+ endif()
97
+
98
+ # Prepare Cflags
99
+ if(DEFINED PKGCONFIG_CFLAGS)
100
+ string(REPLACE ";" " " PKGCONFIG_CFLAGS "${PKGCONFIG_CFLAGS}")
101
+ else()
102
+ set(PKGCONFIG_CFLAGS "")
103
+ endif()
104
+ file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n")
105
+
106
+ # Install .pc file
107
+ install(FILES "${PKGCONFIG_FILE}"
108
+ DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
109
+ )
110
+ endfunction()
@@ -0,0 +1,53 @@
1
+ # Select the backend to use
2
+
3
+ # We try to find any packages our backends might use
4
+
5
+ FIND_PACKAGE(GSSAPI)
6
+ IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
7
+ INCLUDE(FindGSSFramework)
8
+ ENDIF()
9
+
10
+ # Auto-select GSS backend
11
+ IF (USE_GSSAPI STREQUAL ON)
12
+ IF (GSSFRAMEWORK_FOUND)
13
+ SET(GSS_BACKEND "GSS.framework")
14
+ ELSEIF(GSSAPI_FOUND)
15
+ SET(GSS_BACKEND "gssapi")
16
+ ELSE()
17
+ MESSAGE(FATAL_ERROR "Unable to autodetect a usable GSS backend."
18
+ "Please pass the backend name explicitly (-DUSE_GSS=backend)")
19
+ ENDIF()
20
+ ELSEIF(USE_GSSAPI)
21
+ # Backend was explicitly set
22
+ SET(GSS_BACKEND ${USE_GSSAPI})
23
+ ELSE()
24
+ SET(GSS_BACKEND NO)
25
+ ENDIF()
26
+
27
+ IF(GSS_BACKEND)
28
+ # Check that we can find what's required for the selected backend
29
+ IF (GSS_BACKEND STREQUAL "GSS.framework")
30
+ IF (NOT GSSFRAMEWORK_FOUND)
31
+ MESSAGE(FATAL_ERROR "Asked for GSS.framework backend, but it wasn't found")
32
+ ENDIF()
33
+
34
+ LIST(APPEND LIBGIT2_LIBS ${GSSFRAMEWORK_LIBRARIES})
35
+
36
+ SET(GIT_GSSFRAMEWORK 1)
37
+ ADD_FEATURE_INFO(SPNEGO GIT_GSSFRAMEWORK "SPNEGO authentication support (${GSS_BACKEND})")
38
+ ELSEIF (GSS_BACKEND STREQUAL "gssapi")
39
+ IF (NOT GSSAPI_FOUND)
40
+ MESSAGE(FATAL_ERROR "Asked for gssapi GSS backend, but it wasn't found")
41
+ ENDIF()
42
+
43
+ LIST(APPEND LIBGIT2_LIBS ${GSSAPI_LIBRARIES})
44
+
45
+ SET(GIT_GSSAPI 1)
46
+ ADD_FEATURE_INFO(SPNEGO GIT_GSSAPI "SPNEGO authentication support (${GSS_BACKEND})")
47
+ ELSE()
48
+ MESSAGE(FATAL_ERROR "Asked for backend ${GSS_BACKEND} but it wasn't found")
49
+ ENDIF()
50
+ ELSE()
51
+ SET(GIT_GSSAPI 0)
52
+ ADD_FEATURE_INFO(SPNEGO NO "SPNEGO authentication support")
53
+ ENDIF()
@@ -0,0 +1,124 @@
1
+ # Select the backend to use
2
+
3
+ # We try to find any packages our backends might use
4
+ FIND_PACKAGE(OpenSSL)
5
+ FIND_PACKAGE(mbedTLS)
6
+ IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
7
+ FIND_PACKAGE(Security)
8
+ FIND_PACKAGE(CoreFoundation)
9
+ ENDIF()
10
+
11
+ # Auto-select TLS backend
12
+ IF (USE_HTTPS STREQUAL ON)
13
+ IF (SECURITY_FOUND)
14
+ IF (SECURITY_HAS_SSLCREATECONTEXT)
15
+ SET(HTTPS_BACKEND "SecureTransport")
16
+ ELSE()
17
+ MESSAGE(STATUS "Security framework is too old, falling back to OpenSSL")
18
+ SET(HTTPS_BACKEND "OpenSSL")
19
+ ENDIF()
20
+ ELSEIF (WINHTTP)
21
+ SET(HTTPS_BACKEND "WinHTTP")
22
+ ELSEIF(OPENSSL_FOUND)
23
+ SET(HTTPS_BACKEND "OpenSSL")
24
+ ELSEIF(MBEDTLS_FOUND)
25
+ SET(HTTPS_BACKEND "mbedTLS")
26
+ ELSE()
27
+ MESSAGE(FATAL_ERROR "Unable to autodetect a usable HTTPS backend."
28
+ "Please pass the backend name explicitly (-DUSE_HTTPS=backend)")
29
+ ENDIF()
30
+ ELSEIF(USE_HTTPS)
31
+ # HTTPS backend was explicitly set
32
+ SET(HTTPS_BACKEND ${USE_HTTPS})
33
+ ELSE()
34
+ SET(HTTPS_BACKEND NO)
35
+ ENDIF()
36
+
37
+ IF(HTTPS_BACKEND)
38
+ # Check that we can find what's required for the selected backend
39
+ IF (HTTPS_BACKEND STREQUAL "SecureTransport")
40
+ IF (NOT COREFOUNDATION_FOUND)
41
+ MESSAGE(FATAL_ERROR "Cannot use SecureTransport backend, CoreFoundation.framework not found")
42
+ ENDIF()
43
+ IF (NOT SECURITY_FOUND)
44
+ MESSAGE(FATAL_ERROR "Cannot use SecureTransport backend, Security.framework not found")
45
+ ENDIF()
46
+ IF (NOT SECURITY_HAS_SSLCREATECONTEXT)
47
+ MESSAGE(FATAL_ERROR "Cannot use SecureTransport backend, SSLCreateContext not supported")
48
+ ENDIF()
49
+
50
+ SET(GIT_SECURE_TRANSPORT 1)
51
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${SECURITY_INCLUDE_DIR})
52
+ LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
53
+ LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
54
+ ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
55
+ IF (NOT OPENSSL_FOUND)
56
+ MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
57
+ ENDIF()
58
+
59
+ SET(GIT_OPENSSL 1)
60
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${OPENSSL_INCLUDE_DIR})
61
+ LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES})
62
+ LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
63
+ LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
64
+ ELSEIF(HTTPS_BACKEND STREQUAL "mbedTLS")
65
+ IF (NOT MBEDTLS_FOUND)
66
+ MESSAGE(FATAL_ERROR "Asked for mbedTLS backend, but it wasn't found")
67
+ ENDIF()
68
+
69
+ IF(NOT CERT_LOCATION)
70
+ MESSAGE(STATUS "Auto-detecting default certificates location")
71
+ IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
72
+ # Check for an Homebrew installation
73
+ SET(OPENSSL_CMD "/usr/local/opt/openssl/bin/openssl")
74
+ ELSE()
75
+ SET(OPENSSL_CMD "openssl")
76
+ ENDIF()
77
+ EXECUTE_PROCESS(COMMAND ${OPENSSL_CMD} version -d OUTPUT_VARIABLE OPENSSL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
78
+ IF(OPENSSL_DIR)
79
+ STRING(REGEX REPLACE "^OPENSSLDIR: \"(.*)\"$" "\\1/" OPENSSL_DIR ${OPENSSL_DIR})
80
+
81
+ SET(OPENSSL_CA_LOCATIONS
82
+ "ca-bundle.pem" # OpenSUSE Leap 42.1
83
+ "cert.pem" # Ubuntu 14.04, FreeBSD
84
+ "certs/ca-certificates.crt" # Ubuntu 16.04
85
+ "certs/ca.pem" # Debian 7
86
+ )
87
+ FOREACH(SUFFIX IN LISTS OPENSSL_CA_LOCATIONS)
88
+ SET(LOC "${OPENSSL_DIR}${SUFFIX}")
89
+ IF(NOT CERT_LOCATION AND EXISTS "${OPENSSL_DIR}${SUFFIX}")
90
+ SET(CERT_LOCATION ${LOC})
91
+ ENDIF()
92
+ ENDFOREACH()
93
+ ELSE()
94
+ MESSAGE(FATAL_ERROR "Unable to find OpenSSL executable. Please provide default certificate location via CERT_LOCATION")
95
+ ENDIF()
96
+ ENDIF()
97
+
98
+ IF(CERT_LOCATION)
99
+ IF(NOT EXISTS ${CERT_LOCATION})
100
+ MESSAGE(FATAL_ERROR "Cannot use CERT_LOCATION=${CERT_LOCATION} as it doesn't exist")
101
+ ENDIF()
102
+ ADD_FEATURE_INFO(CERT_LOCATION ON "using certificates from ${CERT_LOCATION}")
103
+ ADD_DEFINITIONS(-DGIT_DEFAULT_CERT_LOCATION="${CERT_LOCATION}")
104
+ ENDIF()
105
+
106
+ SET(GIT_MBEDTLS 1)
107
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR})
108
+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
109
+ # mbedTLS has no pkgconfig file, hence we can't require it
110
+ # https://github.com/ARMmbed/mbedtls/issues/228
111
+ # For now, pass its link flags as our own
112
+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
113
+ ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP")
114
+ # WinHTTP setup was handled in the WinHTTP-specific block above
115
+ ELSE()
116
+ MESSAGE(FATAL_ERROR "Asked for backend ${HTTPS_BACKEND} but it wasn't found")
117
+ ENDIF()
118
+
119
+ SET(GIT_HTTPS 1)
120
+ ADD_FEATURE_INFO(HTTPS GIT_HTTPS "using ${HTTPS_BACKEND}")
121
+ ELSE()
122
+ SET(GIT_HTTPS 0)
123
+ ADD_FEATURE_INFO(HTTPS NO "")
124
+ ENDIF()
@@ -0,0 +1,66 @@
1
+ # Select a hash backend
2
+
3
+ # USE_SHA1=CollisionDetection(ON)/HTTPS/Generic/OFF
4
+
5
+ IF(USE_SHA1 STREQUAL ON OR USE_SHA1 STREQUAL "CollisionDetection")
6
+ SET(SHA1_BACKEND "CollisionDetection")
7
+ ELSEIF(USE_SHA1 STREQUAL "HTTPS")
8
+ message(STATUS "Checking HTTPS backend… ${HTTPS_BACKEND}")
9
+ IF(HTTPS_BACKEND STREQUAL "SecureTransport")
10
+ SET(SHA1_BACKEND "CommonCrypto")
11
+ ELSEIF(HTTPS_BACKEND STREQUAL "WinHTTP")
12
+ SET(SHA1_BACKEND "Win32")
13
+ ELSEIF(HTTPS_BACKEND)
14
+ SET(SHA1_BACKEND ${HTTPS_BACKEND})
15
+ ELSE()
16
+ ENDIF()
17
+ IF(NOT HTTPS_BACKEND)
18
+ SET(SHA1_BACKEND "CollisionDetection")
19
+ ENDIF()
20
+ message(STATUS "Using SHA1 backend ${SHA1_BACKEND}")
21
+ ELSEIF(USE_SHA1 STREQUAL "Generic")
22
+ SET(SHA1_BACKEND "Generic")
23
+ # ELSEIF(NOT USE_SHA1)
24
+ ELSE()
25
+ MESSAGE(FATAL_ERROR "Invalid value for USE_SHA1: ${USE_SHA1}")
26
+ ENDIF()
27
+
28
+ IF(SHA1_BACKEND STREQUAL "CollisionDetection")
29
+ SET(GIT_SHA1_COLLISIONDETECT 1)
30
+ ADD_DEFINITIONS(-DSHA1DC_NO_STANDARD_INCLUDES=1)
31
+ ADD_DEFINITIONS(-DSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"common.h\")
32
+ ADD_DEFINITIONS(-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C=\"common.h\")
33
+ FILE(GLOB SRC_SHA1 hash/sha1/collisiondetect.* hash/sha1/sha1dc/*)
34
+ ELSEIF(SHA1_BACKEND STREQUAL "OpenSSL")
35
+ # OPENSSL_FOUND should already be set, we're checking HTTPS_BACKEND
36
+
37
+ SET(GIT_SHA1_OPENSSL 1)
38
+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
39
+ LIST(APPEND LIBGIT2_PC_LIBS "-lssl")
40
+ ELSE()
41
+ LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
42
+ ENDIF()
43
+ FILE(GLOB SRC_SHA1 hash/sha1/openssl.*)
44
+ ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
45
+ SET(GIT_SHA1_COMMON_CRYPTO 1)
46
+ FILE(GLOB SRC_SHA1 hash/sha1/common_crypto.*)
47
+ ELSEIF(SHA1_BACKEND STREQUAL "mbedTLS")
48
+ SET(GIT_SHA1_MBEDTLS 1)
49
+ FILE(GLOB SRC_SHA1 hash/sha1/mbedtls.*)
50
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR})
51
+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
52
+ # mbedTLS has no pkgconfig file, hence we can't require it
53
+ # https://github.com/ARMmbed/mbedtls/issues/228
54
+ # For now, pass its link flags as our own
55
+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
56
+ ELSEIF(SHA1_BACKEND STREQUAL "Win32")
57
+ SET(GIT_SHA1_WIN32 1)
58
+ FILE(GLOB SRC_SHA1 hash/sha1/win32.*)
59
+ ELSEIF(SHA1_BACKEND STREQUAL "Generic")
60
+ FILE(GLOB SRC_SHA1 hash/sha1/generic.*)
61
+ # ELSEIF(NOT USE_SHA1)
62
+ ELSE()
63
+ MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend: ${SHA1_BACKEND}")
64
+ ENDIF()
65
+
66
+ ADD_FEATURE_INFO(SHA ON "using ${SHA1_BACKEND}")
@@ -1992,6 +1992,9 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
1992
1992
  const char *p;
1993
1993
  size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
1994
1994
 
1995
+ if (buflen > UINT16_MAX)
1996
+ return 1;
1997
+
1995
1998
  u->field_data[UF_HOST].len = 0;
1996
1999
 
1997
2000
  s = found_at ? s_http_userinfo_start : s_http_host_start;
@@ -2006,21 +2009,21 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
2006
2009
  switch(new_s) {
2007
2010
  case s_http_host:
2008
2011
  if (s != s_http_host) {
2009
- u->field_data[UF_HOST].off = p - buf;
2012
+ u->field_data[UF_HOST].off = (uint16_t)(p - buf);
2010
2013
  }
2011
2014
  u->field_data[UF_HOST].len++;
2012
2015
  break;
2013
2016
 
2014
2017
  case s_http_host_v6:
2015
2018
  if (s != s_http_host_v6) {
2016
- u->field_data[UF_HOST].off = p - buf;
2019
+ u->field_data[UF_HOST].off = (uint16_t)(p - buf);
2017
2020
  }
2018
2021
  u->field_data[UF_HOST].len++;
2019
2022
  break;
2020
2023
 
2021
2024
  case s_http_host_port:
2022
2025
  if (s != s_http_host_port) {
2023
- u->field_data[UF_PORT].off = p - buf;
2026
+ u->field_data[UF_PORT].off = (uint16_t)(p - buf);
2024
2027
  u->field_data[UF_PORT].len = 0;
2025
2028
  u->field_set |= (1 << UF_PORT);
2026
2029
  }
@@ -2029,7 +2032,7 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
2029
2032
 
2030
2033
  case s_http_userinfo:
2031
2034
  if (s != s_http_userinfo) {
2032
- u->field_data[UF_USERINFO].off = p - buf ;
2035
+ u->field_data[UF_USERINFO].off = (uint16_t)(p - buf);
2033
2036
  u->field_data[UF_USERINFO].len = 0;
2034
2037
  u->field_set |= (1 << UF_USERINFO);
2035
2038
  }
@@ -2047,7 +2050,6 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
2047
2050
  case s_http_host_start:
2048
2051
  case s_http_host_v6_start:
2049
2052
  case s_http_host_v6:
2050
- case s_http_host_port_start:
2051
2053
  case s_http_userinfo:
2052
2054
  case s_http_userinfo_start:
2053
2055
  return 1;
@@ -2067,6 +2069,9 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
2067
2069
  enum http_parser_url_fields uf, old_uf;
2068
2070
  int found_at = 0;
2069
2071
 
2072
+ if (buflen > UINT16_MAX)
2073
+ return 1;
2074
+
2070
2075
  u->port = u->field_set = 0;
2071
2076
  s = is_connect ? s_req_server_start : s_req_spaces_before_url;
2072
2077
  uf = old_uf = UF_MAX;
@@ -2122,7 +2127,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
2122
2127
  continue;
2123
2128
  }
2124
2129
 
2125
- u->field_data[uf].off = p - buf;
2130
+ u->field_data[uf].off = (uint16_t)(p - buf);
2126
2131
  u->field_data[uf].len = 1;
2127
2132
 
2128
2133
  u->field_set |= (1 << uf);