rugged 0.24.5 → 0.24.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rugged/version.rb +1 -1
  3. data/vendor/libgit2/include/git2/version.h +2 -2
  4. data/vendor/libgit2/src/transports/http.c +1 -2
  5. data/vendor/libgit2/src/transports/smart_pkt.c +13 -5
  6. data/vendor/libgit2/src/transports/smart_protocol.c +0 -11
  7. metadata +76 -76
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 73d29b4faaac41e9ef1e93c0192e1c8827eaa745
4
- data.tar.gz: dbe2d750a922c46a144b0e17f93d6ee18d451c32
3
+ metadata.gz: e4b1489ad0847a3a4701d7f5f9ea3e6e78a9d556
4
+ data.tar.gz: be07145f99c3be07bf0c970c70932e2ef4b7a94c
5
5
  SHA512:
6
- metadata.gz: fd5ebf3e609e2b749fc98938184a59eebaaeb6b6791763083d97e0044f1dec29e50835c4a448a52ad1349fa71b73ffd01e7af6042e3fe0cc5bf3a4dff8e99650
7
- data.tar.gz: c52fb2d126fccd0cb438bf07e1c3c0729d6fa9b323949383d04a4dd57f1733582b4a104d66029e410350fd9182506310e14964798832be3734c4b37aa744e021
6
+ metadata.gz: 2ff1cce3c75a0027c9003ce19021cd589a3fdffeaf2c69ccd5dd6614c77e80964256580a230c7e61fa1fd9dbe871fd79029c17d3f027f7f2d3eb6a7346f3633d
7
+ data.tar.gz: c63797d882cf388ad42a9d83c054dfe4b1bd5091654c89433fe2fa43481d9b7122d659a3ed53de95241e74125f030c8e06f375216b8618e57effe5f19de1ef08
data/lib/rugged/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rugged
2
- Version = VERSION = '0.24.5'
2
+ Version = VERSION = '0.24.6.1'
3
3
  end
data/vendor/libgit2/include/git2/version.h CHANGED
@@ -7,10 +7,10 @@
7
7
  #ifndef INCLUDE_git_version_h__
8
8
  #define INCLUDE_git_version_h__
9
9
 
10
- #define LIBGIT2_VERSION "0.24.5"
10
+ #define LIBGIT2_VERSION "0.24.6"
11
11
  #define LIBGIT2_VER_MAJOR 0
12
12
  #define LIBGIT2_VER_MINOR 24
13
- #define LIBGIT2_VER_REVISION 5
13
+ #define LIBGIT2_VER_REVISION 6
14
14
  #define LIBGIT2_VER_PATCH 0
15
15
 
16
16
  #define LIBGIT2_SOVERSION 24
data/vendor/libgit2/src/transports/http.c CHANGED
@@ -602,13 +602,12 @@ static int http_connect(http_subtransport *t)
602
602
  if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
603
603
  git_stream_is_encrypted(t->io)) {
604
604
  git_cert *cert;
605
- int is_valid;
605
+ int is_valid = (error == GIT_OK);
606
606
 
607
607
  if ((error = git_stream_certificate(&cert, t->io)) < 0)
608
608
  return error;
609
609
 
610
610
  giterr_clear();
611
- is_valid = error != GIT_ECERTIFICATE;
612
611
  error = t->owner->certificate_check_cb(cert, is_valid, t->connection_data.host, t->owner->message_cb_payload);
613
612
 
614
613
  if (error < 0) {
data/vendor/libgit2/src/transports/smart_pkt.c CHANGED
@@ -427,15 +427,23 @@ int git_pkt_parse_line(
427
427
  if (bufflen > 0 && bufflen < (size_t)len)
428
428
  return GIT_EBUFS;
429
429
 
430
+ /*
431
+ * The length has to be exactly 0 in case of a flush
432
+ * packet or greater than PKT_LEN_SIZE, as the decoded
433
+ * length includes its own encoded length of four bytes.
434
+ */
435
+ if (len != 0 && len < PKT_LEN_SIZE)
436
+ return GIT_ERROR;
437
+
430
438
  line += PKT_LEN_SIZE;
431
439
  /*
432
- * TODO: How do we deal with empty lines? Try again? with the next
433
- * line?
440
+ * The Git protocol does not specify empty lines as part
441
+ * of the protocol. Not knowing what to do with an empty
442
+ * line, we should return an error upon hitting one.
434
443
  */
435
444
  if (len == PKT_LEN_SIZE) {
436
- *head = NULL;
437
- *out = line;
438
- return 0;
445
+ giterr_set_str(GITERR_NET, "Invalid empty packet");
446
+ return GIT_ERROR;
439
447
  }
440
448
 
441
449
  if (len == 0) { /* Flush pkt */
data/vendor/libgit2/src/transports/smart_protocol.c CHANGED
@@ -759,14 +759,6 @@ static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt,
759
759
  line_len -= (line_end - line);
760
760
  line = line_end;
761
761
 
762
- /* When a valid packet with no content has been
763
- * read, git_pkt_parse_line does not report an
764
- * error, but the pkt pointer has not been set.
765
- * Handle this by skipping over empty packets.
766
- */
767
- if (pkt == NULL)
768
- continue;
769
-
770
762
  error = add_push_report_pkt(push, pkt);
771
763
 
772
764
  git_pkt_free(pkt);
@@ -821,9 +813,6 @@ static int parse_report(transport_smart *transport, git_push *push)
821
813
 
822
814
  error = 0;
823
815
 
824
- if (pkt == NULL)
825
- continue;
826
-
827
816
  switch (pkt->type) {
828
817
  case GIT_PKT_DATA:
829
818
  /* This is a sideband packet which contains other packets */
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rugged
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.24.5
4
+ version: 0.24.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
@@ -9,48 +9,48 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-01-06 00:00:00.000000000 Z
12
+ date: 2017-01-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake-compiler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: 0.9.0
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - '>='
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
27
  version: 0.9.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: pry
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - '>='
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: '0'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - '>='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: minitest
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '3.0'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: '3.0'
56
56
  description: |
@@ -62,30 +62,9 @@ extensions:
62
62
  - ext/rugged/extconf.rb
63
63
  extra_rdoc_files: []
64
64
  files:
65
- - README.md
66
65
  - LICENSE
67
- - lib/rugged/attributes.rb
68
- - lib/rugged/blob.rb
69
- - lib/rugged/branch.rb
70
- - lib/rugged/commit.rb
71
- - lib/rugged/console.rb
72
- - lib/rugged/credentials.rb
73
- - lib/rugged/diff/delta.rb
74
- - lib/rugged/diff/hunk.rb
75
- - lib/rugged/diff/line.rb
76
- - lib/rugged/diff.rb
77
- - lib/rugged/index.rb
78
- - lib/rugged/object.rb
79
- - lib/rugged/patch.rb
80
- - lib/rugged/reference.rb
81
- - lib/rugged/remote.rb
82
- - lib/rugged/repository.rb
83
- - lib/rugged/submodule_collection.rb
84
- - lib/rugged/tag.rb
85
- - lib/rugged/tree.rb
86
- - lib/rugged/version.rb
87
- - lib/rugged/walker.rb
88
- - lib/rugged.rb
66
+ - README.md
67
+ - ext/rugged/extconf.rb
89
68
  - ext/rugged/rugged.c
90
69
  - ext/rugged/rugged.h
91
70
  - ext/rugged/rugged_backend.c
@@ -118,12 +97,72 @@ files:
118
97
  - ext/rugged/rugged_tag.c
119
98
  - ext/rugged/rugged_tag_collection.c
120
99
  - ext/rugged/rugged_tree.c
100
+ - lib/rugged.rb
101
+ - lib/rugged/attributes.rb
102
+ - lib/rugged/blob.rb
103
+ - lib/rugged/branch.rb
104
+ - lib/rugged/commit.rb
105
+ - lib/rugged/console.rb
106
+ - lib/rugged/credentials.rb
107
+ - lib/rugged/diff.rb
108
+ - lib/rugged/diff/delta.rb
109
+ - lib/rugged/diff/hunk.rb
110
+ - lib/rugged/diff/line.rb
111
+ - lib/rugged/index.rb
112
+ - lib/rugged/object.rb
113
+ - lib/rugged/patch.rb
114
+ - lib/rugged/reference.rb
115
+ - lib/rugged/remote.rb
116
+ - lib/rugged/repository.rb
117
+ - lib/rugged/submodule_collection.rb
118
+ - lib/rugged/tag.rb
119
+ - lib/rugged/tree.rb
120
+ - lib/rugged/version.rb
121
+ - lib/rugged/walker.rb
122
+ - vendor/libgit2/AUTHORS
123
+ - vendor/libgit2/CMakeLists.txt
124
+ - vendor/libgit2/COPYING
125
+ - vendor/libgit2/Makefile.embed
121
126
  - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
122
127
  - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
123
128
  - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
124
129
  - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
125
130
  - vendor/libgit2/cmake/Modules/FindIconv.cmake
126
131
  - vendor/libgit2/cmake/Modules/FindSecurity.cmake
132
+ - vendor/libgit2/deps/http-parser/LICENSE-MIT
133
+ - vendor/libgit2/deps/http-parser/http_parser.c
134
+ - vendor/libgit2/deps/http-parser/http_parser.h
135
+ - vendor/libgit2/deps/regex/config.h
136
+ - vendor/libgit2/deps/regex/regcomp.c
137
+ - vendor/libgit2/deps/regex/regex.c
138
+ - vendor/libgit2/deps/regex/regex.h
139
+ - vendor/libgit2/deps/regex/regex_internal.c
140
+ - vendor/libgit2/deps/regex/regex_internal.h
141
+ - vendor/libgit2/deps/regex/regexec.c
142
+ - vendor/libgit2/deps/winhttp/urlmon.h
143
+ - vendor/libgit2/deps/winhttp/winhttp.def
144
+ - vendor/libgit2/deps/winhttp/winhttp.h
145
+ - vendor/libgit2/deps/winhttp/winhttp64.def
146
+ - vendor/libgit2/deps/zlib/adler32.c
147
+ - vendor/libgit2/deps/zlib/crc32.c
148
+ - vendor/libgit2/deps/zlib/crc32.h
149
+ - vendor/libgit2/deps/zlib/deflate.c
150
+ - vendor/libgit2/deps/zlib/deflate.h
151
+ - vendor/libgit2/deps/zlib/infback.c
152
+ - vendor/libgit2/deps/zlib/inffast.c
153
+ - vendor/libgit2/deps/zlib/inffast.h
154
+ - vendor/libgit2/deps/zlib/inffixed.h
155
+ - vendor/libgit2/deps/zlib/inflate.c
156
+ - vendor/libgit2/deps/zlib/inflate.h
157
+ - vendor/libgit2/deps/zlib/inftrees.c
158
+ - vendor/libgit2/deps/zlib/inftrees.h
159
+ - vendor/libgit2/deps/zlib/trees.c
160
+ - vendor/libgit2/deps/zlib/trees.h
161
+ - vendor/libgit2/deps/zlib/zconf.h
162
+ - vendor/libgit2/deps/zlib/zlib.h
163
+ - vendor/libgit2/deps/zlib/zutil.c
164
+ - vendor/libgit2/deps/zlib/zutil.h
165
+ - vendor/libgit2/include/git2.h
127
166
  - vendor/libgit2/include/git2/annotated_commit.h
128
167
  - vendor/libgit2/include/git2/attr.h
129
168
  - vendor/libgit2/include/git2/blame.h
@@ -198,7 +237,7 @@ files:
198
237
  - vendor/libgit2/include/git2/tree.h
199
238
  - vendor/libgit2/include/git2/types.h
200
239
  - vendor/libgit2/include/git2/version.h
201
- - vendor/libgit2/include/git2.h
240
+ - vendor/libgit2/libgit2.pc.in
202
241
  - vendor/libgit2/src/annotated_commit.c
203
242
  - vendor/libgit2/src/annotated_commit.h
204
243
  - vendor/libgit2/src/array.h
@@ -277,14 +316,14 @@ files:
277
316
  - vendor/libgit2/src/global.c
278
317
  - vendor/libgit2/src/global.h
279
318
  - vendor/libgit2/src/graph.c
319
+ - vendor/libgit2/src/hash.c
320
+ - vendor/libgit2/src/hash.h
280
321
  - vendor/libgit2/src/hash/hash_common_crypto.h
281
322
  - vendor/libgit2/src/hash/hash_generic.c
282
323
  - vendor/libgit2/src/hash/hash_generic.h
283
324
  - vendor/libgit2/src/hash/hash_openssl.h
284
325
  - vendor/libgit2/src/hash/hash_win32.c
285
326
  - vendor/libgit2/src/hash/hash_win32.h
286
- - vendor/libgit2/src/hash.c
287
- - vendor/libgit2/src/hash.h
288
327
  - vendor/libgit2/src/hashsig.c
289
328
  - vendor/libgit2/src/ident.c
290
329
  - vendor/libgit2/src/idxmap.h
@@ -474,45 +513,6 @@ files:
474
513
  - vendor/libgit2/src/xdiff/xutils.h
475
514
  - vendor/libgit2/src/zstream.c
476
515
  - vendor/libgit2/src/zstream.h
477
- - vendor/libgit2/deps/http-parser/http_parser.c
478
- - vendor/libgit2/deps/http-parser/http_parser.h
479
- - vendor/libgit2/deps/http-parser/LICENSE-MIT
480
- - vendor/libgit2/deps/regex/config.h
481
- - vendor/libgit2/deps/regex/regcomp.c
482
- - vendor/libgit2/deps/regex/regex.c
483
- - vendor/libgit2/deps/regex/regex.h
484
- - vendor/libgit2/deps/regex/regex_internal.c
485
- - vendor/libgit2/deps/regex/regex_internal.h
486
- - vendor/libgit2/deps/regex/regexec.c
487
- - vendor/libgit2/deps/winhttp/urlmon.h
488
- - vendor/libgit2/deps/winhttp/winhttp.def
489
- - vendor/libgit2/deps/winhttp/winhttp.h
490
- - vendor/libgit2/deps/winhttp/winhttp64.def
491
- - vendor/libgit2/deps/zlib/adler32.c
492
- - vendor/libgit2/deps/zlib/crc32.c
493
- - vendor/libgit2/deps/zlib/crc32.h
494
- - vendor/libgit2/deps/zlib/deflate.c
495
- - vendor/libgit2/deps/zlib/deflate.h
496
- - vendor/libgit2/deps/zlib/infback.c
497
- - vendor/libgit2/deps/zlib/inffast.c
498
- - vendor/libgit2/deps/zlib/inffast.h
499
- - vendor/libgit2/deps/zlib/inffixed.h
500
- - vendor/libgit2/deps/zlib/inflate.c
501
- - vendor/libgit2/deps/zlib/inflate.h
502
- - vendor/libgit2/deps/zlib/inftrees.c
503
- - vendor/libgit2/deps/zlib/inftrees.h
504
- - vendor/libgit2/deps/zlib/trees.c
505
- - vendor/libgit2/deps/zlib/trees.h
506
- - vendor/libgit2/deps/zlib/zconf.h
507
- - vendor/libgit2/deps/zlib/zlib.h
508
- - vendor/libgit2/deps/zlib/zutil.c
509
- - vendor/libgit2/deps/zlib/zutil.h
510
- - vendor/libgit2/CMakeLists.txt
511
- - vendor/libgit2/Makefile.embed
512
- - vendor/libgit2/AUTHORS
513
- - vendor/libgit2/COPYING
514
- - vendor/libgit2/libgit2.pc.in
515
- - ext/rugged/extconf.rb
516
516
  homepage: https://github.com/libgit2/rugged
517
517
  licenses:
518
518
  - MIT
@@ -523,17 +523,17 @@ require_paths:
523
523
  - lib
524
524
  required_ruby_version: !ruby/object:Gem::Requirement
525
525
  requirements:
526
- - - '>='
526
+ - - ">="
527
527
  - !ruby/object:Gem::Version
528
528
  version: 1.9.3
529
529
  required_rubygems_version: !ruby/object:Gem::Requirement
530
530
  requirements:
531
- - - '>='
531
+ - - ">="
532
532
  - !ruby/object:Gem::Version
533
533
  version: '0'
534
534
  requirements: []
535
535
  rubyforge_project:
536
- rubygems_version: 2.0.14.1
536
+ rubygems_version: 2.6.8
537
537
  signing_key:
538
538
  specification_version: 4
539
539
  summary: Rugged is a Ruby binding to the libgit2 linkable library